From 88fbde8b51b09cb84eb46c26130860eb03f2a180 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 14:09:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3bug=20#45290?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 18 ++-- .../pages/creatProcess/bzrk/step2.vue | 28 +++++-- .../pages/creatProcess/bzrk/step3.vue | 28 +++++-- .../pages/creatProcess/bzrk/step4.vue | 27 ++++-- .../domesticStandardsAndRegulations/index.vue | 9 +- .../foreignStandardsAndRegulations/index.vue | 83 ++++++++++--------- 6 files changed, 120 insertions(+), 73 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 72064daeb..73d8c3e67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -532,11 +532,15 @@ > - + + + @@ -1331,6 +1335,8 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -2011,6 +2017,8 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 我司署名人 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 78391027b..9d3675641 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -361,12 +361,15 @@ > - + + + @@ -437,8 +440,13 @@ - - + @@ -811,6 +819,8 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -1006,6 +1016,8 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 6c87cb661..29007b56f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -354,12 +354,15 @@ > - + + + @@ -430,8 +433,13 @@ - - + @@ -803,6 +811,8 @@ export default { categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -994,6 +1004,8 @@ export default { this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 7dd189237..7b4087fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -519,11 +519,15 @@ > - + + + @@ -594,8 +598,13 @@ - - + @@ -1173,6 +1182,8 @@ export default { categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -1602,6 +1613,8 @@ export default { this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 9b46f8ae4..38a043c73 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3713,11 +3713,12 @@ export default { this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { if(item.attrField === 'WSSMR'){ - const options = [ - {label:"署名人1",value:"1"},{label:"署名人2",value:"2"} - ] return Object.assign({}, item, { - options: options + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] }) }else if(item.attrField === 'CYSD'){ return Object.assign({}, item, { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 12f3fabf4..96ec1a812 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3591,50 +3591,51 @@ export default { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - if(item.attrField === 'WSSMR'){ - const options = [ - {label:"署名人1",value:"1"},{label:"署名人2",value:"2"} - ] - return Object.assign({}, item, { - options: options - }) - }else if(item.attrField === 'CYSD'){ + if(item.attrField === 'WSSMR'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + }else if(item.attrField === 'CYSD'){ return Object.assign({}, item, { options: this.allSelectOptions["WSCYSD"] }) - }else if(item.attrField === 'CLLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ENERGYTYPES"] - }) - }else if(item.attrField === 'NYLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["NYLXCLASS"] - }) - }else if(item.attrField === 'SYCPX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYCPXCLASS"] - }) - }else if(item.attrField === 'SYRZ'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYRZCLASS"] - }) - }else if(item.attrField === 'ZRBM'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRBMCLASS"] - }) - }else if(item.attrField === 'ZRGCS'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRGCSCLASS"] - }) - }else if(item.attrField === 'TXLB'){ - return Object.assign({}, item, { - options: this.allSelectOptions["TXLBCLASS"] - }) - }else { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) - } + }else if(item.attrField === 'CLLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } } else { return item }