From 3f2981ac9b90f2d6709445b2290ea458811a9353 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 12 Dec 2023 15:00:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/common/formEditList.vue | 2 +- .../pages/creatProcess/qbrk/common/formEditList.vue | 2 +- .../pages/creatProcess/qbrk/common/formEditListFb.vue | 2 +- .../processCenter/pages/creatProcess/qbrk/common/formList.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index f627d4d69..7e3b31a42 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -298,7 +298,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 834ca9339..7c9cf5745 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -318,7 +318,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 0569fe85e..2ea04b203 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -328,7 +328,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index c856e689a..78d5c7c3d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -225,7 +225,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 78d694b02..913aec804 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -342,7 +342,7 @@ - From 91c093a30b8723dcb04af6c827b5907595977743 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 12 Dec 2023 15:25:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 8db85996a..ea324b675 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -51,6 +51,7 @@ - + Date: Tue, 12 Dec 2023 16:12:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=9E=E6=98=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 9c25712c1..4c91ab74a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -53,6 +53,7 @@ border default-expand-all> diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 10db63d59..b325744f4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2154,7 +2154,7 @@ this.QTWJBUSSFileList = this.assemble(this.form.QTWJBUSS, this.form.QTWJBUSSName); this.GLWJBUSSFileList = this.assemble(this.form.GLWJBUSS, this.form.GLWJBUSSName); this.roleForm = mes.roleForm - this.commentText = mes.commentText + this.commentText = mes.commentText2 || '' this.ccc = false }) } else { @@ -3268,7 +3268,7 @@ taskInfo: '技术标准起草', form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText2: this.commentText })) updateBusProcessNew(_formData).then(res => { this.saveLoading = false @@ -3560,7 +3560,7 @@ }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) - this.commentText = processForm.commentText + this.commentText = processForm.commentText2||'' if(processForm.form){ processForm = processForm.form } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index ccfeabb08..6f1346c92 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -57,12 +57,10 @@ border default-expand-all> - Date: Tue, 12 Dec 2023 18:04:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index fd337710c..bd9b5e923 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -27,12 +27,6 @@ show-summary :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" style="width: 100%"> - -