From 7aac6bbc3cb1207aa758b0657357e1614e6a5aa4 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Fri, 14 Jun 2024 13:48:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?= =?UTF-8?q?=E5=87=86=20=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=A8=BF=E4=BB=B6=20=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E5=B1=95=E7=A4=BA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formEditList.vue | 6 ++++++ src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 1 + 10 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 9faffbf01..07c79688b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -245,6 +245,7 @@
- - + -->
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 5347f57d6..54f5c8cde 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -265,7 +265,7 @@
- - + -->
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 67376d31f..bd309f105 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -20,6 +20,7 @@ >
Date: Fri, 14 Jun 2024 14:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=80=89=E4=B8=AD=E5=AF=BC=E5=87=BA=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E6=B8=85=E5=8D=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index c765742f9..fc4b3b39e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -950,7 +950,7 @@ export default { if (this.saveExportType === "apart") { if (this.selectedList != null && this.selectedList != "") { const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 + - "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName; + "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName + "&id=" + this.pageId; window.open(exportURL); this.$message.success("导出信息成功"); } From 23d7fc7dcb93580cc6866d01c1a6f37e37874b6c Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:02:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=20=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E8=8A=82=E7=82=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=90=BA=E5=B8=A6=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/qbrk-product/step10.vue | 2 +- src/pages/processCenter/pages/phone/qbrk-product/step12.vue | 2 +- src/pages/processCenter/pages/phone/qbrk-product/step4.vue | 2 +- src/pages/processCenter/pages/phone/qbrk-product/step7.vue | 2 +- src/pages/processCenter/pages/phone/qbrk-product/step8.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue index 4bda6b10b..0362061fe 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -1920,7 +1920,7 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); + const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue index ca4793cee..e5a02c2a2 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue @@ -1920,7 +1920,7 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); + const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue index 7f7b76ee1..1264740a1 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -1918,7 +1918,7 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); + const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue index c5bf5a6da..9134431a0 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue @@ -2014,7 +2014,7 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); + const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue index b92a20bc7..0eea2f8b9 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue @@ -1920,7 +1920,7 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify(this.form); + const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId,