From f890a5dfdb41e31dd117a3f6b8e845f1635213bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 11:08:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?52699=20=E6=B8=85=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=9B=AE=E5=AF=BC=E5=85=A5=EF=BC=9A=E9=80=82=E7=94=A8=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=89=8D=E7=AB=AF=E6=B2=A1=E6=98=BE=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5523daf8c..2afd0140a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1103,6 +1103,7 @@ export default { } } // 适用车型转换 + console.log(item.sycx); if (item.sycx !== null) { let k = (item.sycx || "").split(","); for (let i in this.energyKindOptions) { @@ -1110,7 +1111,7 @@ export default { if (this.energyKindOptions[i].value === k[m]) { k[m] = this.energyKindOptions[i].label; } - item.sycx = k.join(","); + item.typeApplicable = k.join(","); } } } From ec2b7e5ecf143efe60aff96645615b47eb031a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 11:21:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?52699=20=E6=B8=85=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=9B=AE=E5=AF=BC=E5=85=A5=EF=BC=9A=E9=80=82=E7=94=A8=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=89=8D=E7=AB=AF=E6=B2=A1=E6=98=BE=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 2afd0140a..bb9928e1e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1103,7 +1103,6 @@ export default { } } // 适用车型转换 - console.log(item.sycx); if (item.sycx !== null) { let k = (item.sycx || "").split(","); for (let i in this.energyKindOptions) { From ebacbf636af4c15062e19a338ce39dbfd4a8dd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 15:21:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?52729=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=9B=BD=E5=86=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A9=B3=E5=9B=9E=20=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=20PC=E7=AB=AF=E6=8F=90=E4=BA=A4=20=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E8=B5=B0=E5=88=B0=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 1 + .../pages/creatProcess/bzrk/step4.vue | 15 ++- .../processCenter/pages/phone/bzrk/step2.vue | 91 ++++++++++++------- 3 files changed, 68 insertions(+), 39 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 0de1caa95..f2fe8347b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1127,6 +1127,7 @@ export default { pId: this.pId }).then(res => { if (res) { + console.log(res); const processForm = JSON.parse(res.mesg) this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index f03c28bed..e1705e739 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2628,6 +2628,12 @@ export default { console.log(item); this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) + // 遍历对象 + for (const p in this.form) { + if (typeof (this.form[p]) != "function") { + this.initializeFileList(p, this.form[p]); + } + } this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; @@ -2639,14 +2645,6 @@ export default { this.form.prcName = this.prcName this.form['id'] = item.id this.form.country = item.country.split(',') - - // 遍历对象 - for (const p in this.form) { - if (typeof (this.form[p]) != "function") { - this.initializeFileList(p, this.form[p]); - } - } - this.$forceUpdate() }) }, @@ -2668,6 +2666,7 @@ export default { // }) // }, initializeFileList(property, value) { + console.log('执行文件方法'); switch (property) { case 'xgd': this.getFileList(value, this.xgdFileList); diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index ab8f1e6dd..ba636badf 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -857,46 +857,75 @@ export default { this.handleSubmit() }, handleSubmit() { - this.getRule() const val = this.form.country; - if (val !== '' && val !== null && typeof (val) !== 'undefined') { + if (val !== "" && val !== null && typeof (val) !== "undefined") { if (val instanceof Array) { this.form.country = val.join(","); } else { - this.form.country = val + this.form.country = val; } - } else if (val === '') { - this.form.country = [] + } else if (val === "") { + this.form.country = []; } - this.$refs['formTongGuo'].validate((valid) => { - if (valid) { - this.isSubmit = true - this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion); - if (this.formTongGuo.approvalOpinion == '1') { - console.log("shibai"); - this.$message.warning("驳回成功") - this.isSubmit = false - // 流程提交之后，应该流转至待办任务页面 - this.$router.push("/processCenter"); - } else { - console.log("hello"); - this.processCreateStand(json) - } + this.isSubmit = true; + this.form.commentText = this.commentText; + this.form.approvalOpinion = this.formTongGuo.approvalOpinion; + if (this.form.syrz.length === 0) { + this.form.syrz = ""; + } + if (this.form.nylx.length === 0) { + this.form.nylx = ""; + } + if (this.form.zrbm.length === 0) { + this.form.zrbm = ""; + } + if (this.form.qcdw.length === 0) { + this.form.qcdw = ""; + } + if (this.form.cllx.length === 0) { + this.form.cllx = ""; + } + if (this.form.sycpx.length === 0) { + this.form.sycpx = ""; + } + if (this.form.zrgcs.length === 0) { + this.form.zrgcs = ""; + } + let qcdwName = [] + if(this.form.qcdw && this.form.qcdw.length > 0){ + this.form.qcdw.map(item => { + this.qcdwOptions.forEach(items => { + if(item === items.value){ + qcdwName.push(items.label) } }) + }) + } + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.menuIds = this.form.treeListId; + this.form.BBFDTBZ = this.form.bfbdtbzh + this.form.qcdw = qcdwName + this.form.qcdw = qcdwName.splice(',') + const json = JSON.stringify(this.form); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + if (this.formTongGuo.approvalOpinion == "1") { + this.$message.warning("驳回成功"); + this.isSubmit = false; + this.formTongGuo.commentText = ""; + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } else { + this.processCreateStand(json); + } } - }) + }); }, /** From df6dae42a641bcc4c4ab163b6f2bafb5f0990c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 15:28:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?52725=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B5=B7=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f2fe8347b..4165f147d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -43,8 +43,7 @@ > - - +