@@ -1712,12 +1712,24 @@
-
+
+ 责任工程师
+
+
+
+
+
+
+
+
+
+
@@ -1791,12 +1803,29 @@
-
+
+ 责任部门
+
+
+
+
+
+
+
+
+
+
@@ -5521,7 +5550,7 @@ export default {
})
},
choiceZRRS (type, title, id) {
- console.log('2077',title)
+ console.log('2077',type, title, id)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
@@ -5529,7 +5558,7 @@ export default {
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
- console.log('1712',this.drawerTitle)
+ console.log('1712',data)
let idList = ''
let nameList = ''
data.forEach( item => {
@@ -5544,6 +5573,8 @@ export default {
this.sarStandardsInfoEO['WSSMR'] = nameList
}else if (this.drawerTitle === '选择责任工程师'){
this.sarStandardsInfoEO['ZRGCS'] = nameList
+ }else if (this.drawerTitle === '查询责任工程师'){
+ this.advanceSearchMapping['ZRGCS'] = nameList
}
},
@@ -5577,7 +5608,7 @@ export default {
},
drawerCheckZRBM(data) {
- console.log("5389", data);
+ console.log("5389", this.drawerTitle);
let idList = ''
let nameList = ''
data.forEach(item => {
@@ -5590,9 +5621,12 @@ export default {
nameList += item.name
// }
})
-
- this.sarStandardsInfoEO.ZRBMId = idList;
- this.sarStandardsInfoEO['ZRBM'] = nameList;
+ if (this.drawerTitle === '责任部门'){
+ this.sarStandardsInfoEO.ZRBMId = idList;
+ this.sarStandardsInfoEO['ZRBM'] = nameList;
+ }else if (this.drawerTitle === '查询责任部门'){
+ this.advanceSearchMapping['ZRBM'] = nameList
+ }
},
},
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e52e9660e..c10eeb8fe 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1139,29 +1139,52 @@
-
-
-
+
+ 起草部门
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
@@ -1170,40 +1193,66 @@
-
-
-
+
+ 起草人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2047,29 +2096,53 @@ export default {
stahndinfoList: [],
tableFlag: '',
// sycpxOptions: [], // 适用产品线
- syzrOptions: [], // 适用认证
+ syzrOptions: {
+ attrName: '适用认证',
+ options:[]
+ }, // 适用认证
// zrgcsOptions: [], // 责任工程师
countryOptions: [],
regionOptions: [], // 区域
standSortOptions: [], // 标准类别下拉框
standSystemOptions: [], // 标准体系下拉框
- sycpxOptions: [], // 适用产品线下拉框
+ sycpxOptions: {
+ attrName: '适用产品线',
+ options:[]
+ }, // 适用产品线下拉框
zrbmOptions: [], // 责任部门下拉框
zrgcsOptions: [], // 责任工程师下拉框
txlbOptions: [], // 体系类别下拉框
standSortConfigOptions: [], // 标准类别下拉框
- applyArcticOptions: [], // 适用车型下拉框
+ applyArcticOptions: {
+ attrName: '适用车型',
+ options:[]
+ }, // 适用车型下拉框
standStateOptions: [], // 标准状态下拉框
standNatureOptions: [], // 标准性质下拉框
adoptExtentOptions: [], // 采标程度下拉框
- emergyKindOptions: [], // 能源种类下拉框
- applyAuthOptions: [], // 适用认证下拉框
- categoryOptions: [], // 所属类别下拉框
+ emergyKindOptions: {
+ attrName: '能源类型',
+ options:[]
+ }, // 能源种类下拉框
+ applyAuthOptions: {
+ attrName: '适用认证',
+ options:[]
+ }, // 适用认证下拉框
+ categoryOptions: {
+ attrName: '能源类型',
+ options:[]
+ }, // 所属类别下拉框
categoryConfigOptions: [], // 所属类别下拉框
assemClassOptions: [], // 总成分类下拉框
- qcdwOptions:[],//起草单位下拉框
- qcrOptions:[],//起草人下拉框
+ qcdwOptions:{
+ attrName: '起草单位',
+ options:[]
+ },//起草单位下拉框
+ qcrOptions:{
+ attrName: '起草人',
+ options:[]
+ },//起草人下拉框
cysdOptions:[], //我司参与深度下拉框
nylxOptions:[],//能源类型下拉框
syrzOptions:[],//适用认证下拉框
@@ -3104,6 +3177,7 @@ export default {
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
+ console.log('1712',data)
let idList = ''
let nameList = ''
data.forEach( item => {
@@ -3114,6 +3188,9 @@ export default {
idList += item.id
nameList += item.name
})
+ if (this.drawerTitle === '查询起草人'){
+ this.sarBussionessSearch['QCRBUSS'] = nameList
+ }
this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
if(this.sarBussionessStandEO.QCRBUSS){
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
@@ -3143,6 +3220,9 @@ export default {
nameList += item.name
// }
})
+ if (this.drawerTitle === '查询起草部门'){
+ this.sarBussionessSearch.QCDW = nameList
+ }
this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
if(this.sarBussionessStandEO.QCRBUSS){
@@ -4500,17 +4580,17 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
- this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
- this.categoryOptions = res.data.NYLXCLASS // 能源类型
- this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+ this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
+ this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
+ this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
- this.qcdwOptions = res.data.QCDW // 起草单位
- this.qcrOptions = res.data.QCRBUSS // 起草人
- this.nylxOptions = res.data.NYLXCLASS // 能源类型
- this.syrzOptions = res.data.SYRZCLASS // 适用认证
- this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.qcdwOptions.options = res.data.QCDW // 起草单位
+ this.qcrOptions.options = res.data.QCRBUSS // 起草人
+ this.nylxOptions.options = res.data.NYLXCLASS // 能源类型
+ this.syrzOptions.options = res.data.SYRZCLASS // 适用认证
+ this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 35a233385..73c5d4fa5 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -458,7 +458,7 @@
@@ -659,12 +659,24 @@
-
+
+ 责任工程师
+
+
+
+
+
+
+
+
+
+
@@ -722,12 +734,29 @@
-
+
+ 责任部门
+
+
+
+
+
+
+
+
+
+
@@ -2574,6 +2603,8 @@ export default {
this.sarStandardsInfoEO['WSSMR'] = nameList
}else if (this.drawerTitle === '选择责任工程师'){
this.sarStandardsInfoEO['ZRGCS'] = nameList
+ }else if (this.drawerTitle === '查询责任工程师'){
+ this.advanceSearchMapping['ZRGCS'] = nameList
}
},
@@ -4981,8 +5012,12 @@ export default {
nameList += item.name
// }
})
- this.sarStandardsInfoEO.ZRBMId = idList;
- this.sarStandardsInfoEO['ZRBM'] = nameList;
+ if (this.drawerTitle === '责任部门'){
+ this.sarStandardsInfoEO.ZRBMId = idList;
+ this.sarStandardsInfoEO['ZRBM'] = nameList;
+ }else if (this.drawerTitle === '查询责任部门'){
+ this.advanceSearchMapping['ZRBM'] = nameList
+ }
},
},
computed: {