From 354ed85de4b36d10d5f42dcccee3f6ccf826c0d0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 17:09:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 44be17e03..8df7d3788 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2735,7 +2735,6 @@ }, handleSubmit() { - debugger // this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { From 2bb2c98152128b79ba5ecbfe87ad30cfde55e17d Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 18:28:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=91=E5=8F=B8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E4=BA=BA=20=E5=92=8C=20=E8=B4=A3=E4=BB=BB=E4=BA=BA=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=B1=A1=E6=9F=93=20=E6=88=91=E5=8F=B8=E7=BD=B2?= =?UTF-8?q?=E5=90=8D=E4=BA=BA=20=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E6=88=91=E5=8F=B8=E7=BD=B2=E5=90=8D=E4=BA=BA=E5=B8=A6?= =?UTF-8?q?=E5=85=A5=E4=B8=8B=E4=B8=80=E6=B5=81=E7=A8=8B=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 26 ++++++++++++++----- .../pages/creatProcess/bzrk/step2.vue | 21 ++++++++------- .../pages/creatProcess/bzrk/step3.vue | 19 +++++++------- .../pages/creatProcess/bzrk/step4.vue | 3 +++ 4 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 8df7d3788..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.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 @@ -2752,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) { From 3f6a7a533166c1b691b4262108758fdd1e941f97 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 18:55:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ssrq=20xcxssrq=20zccssrq=20=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 38 +++++++++++++------ .../domesticStandardsAndRegulations/index.vue | 35 +++++++++++------ 2 files changed, 49 insertions(+), 24 deletions(-) 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/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