feat: There is no way the, 注掉 技术系列 国内逻辑
This commit is contained in:
@@ -3666,6 +3666,8 @@ export default {
|
||||
this.selectSarMenu = treeNode
|
||||
this.standCommonlySearch.menuId = treeNode.id
|
||||
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
|
||||
this.standCommonlySearch.treeType = treeNode.treeType
|
||||
this.sarStandardsSearch.treeType = treeNode.treeType
|
||||
this.sarStandardsSearch.page = 1
|
||||
this.standCommonlySearch.page = 1
|
||||
//搜索后点击属性菜单依然显示搜索条件的数据
|
||||
@@ -3786,7 +3788,7 @@ export default {
|
||||
async getTreeAsync(){
|
||||
|
||||
let tsResource = await this.selectMenu1()
|
||||
let sarMenuStandard = await this.selectMenu2()
|
||||
// let sarMenuStandard = await this.selectMenu2()
|
||||
|
||||
let list1 = []
|
||||
let list2 = []
|
||||
@@ -3794,13 +3796,14 @@ export default {
|
||||
list1 = tsResource.data
|
||||
}
|
||||
|
||||
if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
|
||||
list2 = sarMenuStandard.data
|
||||
}
|
||||
// 国内技术系列 逻辑 注释掉
|
||||
// if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
|
||||
// list2 = sarMenuStandard.data
|
||||
// }
|
||||
|
||||
if(list2.length > 0){
|
||||
list1 = list1.concat(list2)
|
||||
}
|
||||
// if(list2.length > 0){
|
||||
// list1 = list1.concat(list2)
|
||||
// }
|
||||
|
||||
if(list1.length > 0){
|
||||
this.treeList = this.sortByKey(list1,"displaySeq")
|
||||
@@ -4469,8 +4472,10 @@ export default {
|
||||
const formData = {...data}
|
||||
if (!item) {
|
||||
formData.menuId = this.sarStandardsSearch.menuId
|
||||
formData.treeType = this.sarStandardsSearch.treeType
|
||||
} else {
|
||||
formData.menuId = this.selectSarMenu.id
|
||||
formData.treeType = this.selectSarMenu.treeType
|
||||
}
|
||||
|
||||
// 排序
|
||||
@@ -5103,7 +5108,14 @@ export default {
|
||||
})
|
||||
} else {
|
||||
this.configStandFlag = true
|
||||
this.sarConfigStandSearch.menuId = 'nomenu'
|
||||
if(this.selectSarMenu.treeType === 'sarMs'){
|
||||
this.sarConfigStandSearch.menuId = 'nomenu'
|
||||
this.sarConfigStandSearch.sarMsMenuId = menuId
|
||||
this.sarConfigStandSearch.sarMsType = 'filterSarMsMenu'
|
||||
}else {
|
||||
this.sarConfigStandSearch.menuId = 'nomenu'
|
||||
this.sarConfigStandSearch.sarMsType = ''
|
||||
}
|
||||
this.sarConfigStandSearch.page = 1
|
||||
this.sarConfigStandSearch.country = ''
|
||||
this.sarConfigStandSearch.standNumber = ''
|
||||
|
||||
Reference in New Issue
Block a user