From 1d6f9d0a5922f440435fb84a988ace839dacd883 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 18 Jul 2021 17:09:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 4 +- .../pages/creatProcess/bzrk/step1.vue | 4 +- .../pages/creatProcess/bzrk/step2.vue | 4 +- .../pages/creatProcess/bzrk/step3.vue | 4 +- .../pages/creatProcess/bzrk/step4.vue | 4 +- .../domesticStandardsAndRegulations/index.vue | 150 ++++++++++-------- .../foreignStandardsAndRegulations/index.vue | 129 ++++++++------- 7 files changed, 162 insertions(+), 137 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b4cb77b38..c82632dd1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -56,7 +56,7 @@

{{ sarStandardsInfoEO.issueTime || '-' }}

{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}

-

{{ sarStandardsInfoEO.standSystemName || '-' }}

+

{{ sarStandardsInfoEO.standSystemName || '-' }}

@@ -2624,8 +2624,6 @@ export default { // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) { // return // } - console.log("displayLocation"); - console.log(displayLocation); displayLocation.forEach((location) => { location.isShowImp = '0' if (dynamicFormField) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b1b2b5634..72064daeb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -490,7 +490,7 @@ - + - + - + - + - + - + - + - + 1 - - @@ -1376,7 +1332,14 @@ export default { KCCVPPSCN: '', DYBXH: '', DYMC: '', - + CYSD:'', + CLLX:'', + NYLX:'', + SYCPX:'', + SYRZ:'', + ZRBM:'', + ZRGCS:'', + WSSMR:'', }, // 标准新增过程中用到的对象 standClass: [], // 标准类别 sarStandardsInfoEO: { @@ -1495,7 +1458,21 @@ export default { sentScreenFileFeedback: '', approvalFileTime: '', approvalFileFeedback: '', - certPutTimeList: [] + certPutTimeList: [], + CYCVPPSBM: '', + CYCVPPSCN: '', + KCCVPPSBM: '', + KCCVPPSCN: '', + DYBXH: '', + DYMC: '', + CYSD:'', + CLLX:'', + NYLX:'', + SYCPX:'', + SYRZ:'', + ZRBM:'', + ZRGCS:'', + WSSMR:'', }, // 标准新增过程中用到的对象 currentFileList: '', // 当前操作的是哪个FormItem的上传 isList: [ @@ -2019,7 +1996,6 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values const formFieldList = this.formFieldList - console.log(formFieldList) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) if(this.sarStandardsInfoEO.standSystem){ this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; @@ -2057,11 +2033,11 @@ export default { } field['value'] = value // 追加用户名称和部门名称和SVPPS名称 - if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { - let attrFieldName = field.attrField + 'Name' - valueName = dynamicFormField[attrFieldName] - } - field['valueName'] = valueName + // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { + // let attrFieldName = field.attrField + 'Name' + // valueName = dynamicFormField[attrFieldName] + // } + // field['valueName'] = valueName if (field.showRegionId === location.value) { if (!location.child) { location['child'] = [] @@ -2071,6 +2047,7 @@ export default { }) }) this.dynamicFormField = displayLocation + console.log(this.dynamicFormField) this.loading = false }) }) @@ -2790,10 +2767,8 @@ export default { // 验证标准号是否唯一 this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => { if (flag) { - debugger // 时间格式修改 let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO)) - console.log(nowstandinfo) if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') { nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss') } @@ -2823,8 +2798,6 @@ export default { sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - console.log(formFieldList) - console.log(nowstandinfo) this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { _this: this }, res => { @@ -3739,9 +3712,50 @@ export default { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) + 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'){ + 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 { return item } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 135a7ce75..12f3fabf4 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -613,39 +613,6 @@ :disabled="formdisableflag" > -