diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 65ab8be06..a089f39e4 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2327,24 +2327,38 @@ this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, { _this: this }, res => { - let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + + let SSRQStr = '' - let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') let ZCCSSRQStr = '' - let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') let XCXSSRQStr = '' - for (let i = 0; i < SSRQ.length; i++) { - SSRQStr += SSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){ + let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + for (let i = 0; i < SSRQ.length; i++) { + SSRQStr += SSRQ[i].substring(0,10)+',' + } + SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) } - for (let i = 0; i < ZCCSSRQ.length; i++) { - ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') { + let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') + + for (let i = 0; i < ZCCSSRQ.length; i++) { + ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + } + + ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) + } - for (let i = 0; i < XCXSSRQ.length; i++) { - XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + + if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') { + let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') + for (let i = 0; i < XCXSSRQ.length; i++) { + XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + } + XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) } - SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) - ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) - XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 44be17e03..e3548e6a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -705,7 +705,7 @@ > - + @@ -1068,6 +1068,12 @@ @checkedRole="checkedRole2" :nodeList="nodeList2" > + { if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { - this.fileInfoHandle() this.isSubmit = true this.form.country=this.countryArr; - console.log("this.form",this.form.wssmr); var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -2753,8 +2768,6 @@ json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - - console.log("JSON.stringify(json)",JSON.stringify(json)); this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index df0cba406..d3fefbe8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -443,7 +443,7 @@ - + @@ -526,15 +526,16 @@ > - - - + {{form.wssmr}} + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 0f20fe9d3..221e93cd0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -443,15 +443,16 @@ > - - - + {{form.wssmr}} + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index f4bbac89b..ec2a8b3b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1687,6 +1687,9 @@ export default { } if (this.drawerTitle === '选择我司署名人'){ this.form.wssmr = nameList + + this.roleForm.wssmrId=idList; + this.roleForm.wssmrName=nameList; } }, choiceZRRS (type, title, id) { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index b9f582724..443e2d0d4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3147,24 +3147,35 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, { _this: this }, res => { - let SSRQ = res.data.attrInfoMap.SSRQ.split(',') let SSRQStr = '' - let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') let ZCCSSRQStr = '' - let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') let XCXSSRQStr = '' - for (let i = 0; i < SSRQ.length; i++) { - SSRQStr += SSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){ + let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + for (let i = 0; i < SSRQ.length; i++) { + SSRQStr += SSRQ[i].substring(0,10)+',' + } + SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) } - for (let i = 0; i < ZCCSSRQ.length; i++) { - ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') { + let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') + + for (let i = 0; i < ZCCSSRQ.length; i++) { + ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + } + + ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) + } - for (let i = 0; i < XCXSSRQ.length; i++) { - XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + + if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') { + let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') + for (let i = 0; i < XCXSSRQ.length; i++) { + XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + } + XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) } - SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) - ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) - XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr