From 8ee070f967835d39338ed68391fd28ba2457db97 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, 29 Mar 2022 17:28:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHy-ch/step1.vue | 10 +++++----- .../processCenter/pages/creatProcess/bzjd/step1-6.vue | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index fabbb545f..84853cf1f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -3,11 +3,11 @@
- +
基础信息
-
流程信息
+
人员信息
@@ -190,13 +190,13 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - + -

流程发起人

+

标准法规工程师

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 33408f729..b44cc1a2f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -268,6 +268,7 @@ From 95ae21646091af6ee4852d248ccd0f06e7e1535f 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, 29 Mar 2022 17:58:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 491634fc6..927965d67 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -935,37 +935,40 @@ export default { }) } break - //未符合项整改流程 + //未符合项整改流程 case '8' : - if(row.taskInfo === '下发至标准法规工程师'){ + if(row.taskInfo === '审核'){ this.$router.push({ name: 'wfhxzgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } }) - } else if (row.taskInfo === '确认+选择责任人') { + } else if (row.taskInfo === '合规排查(上传合规举证材料)') { this.$router.push({ name: 'wfhxzgStep3', query: { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } }) - }else if (row.taskInfo === '上传佐证材料填写信息') { + }else if (row.taskInfo === '审定') { this.$router.push({ name: 'wfhxzgStep4', query: { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -989,6 +992,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } From aab819fbaa126037f114652418dc2a636abad91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 30 Mar 2022 09:41:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 1 + src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 77d27dd58..f96bd01c6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -780,6 +780,7 @@ } } } + this.$refs.filterTable.clearSelection() this.PLmodalshowflag = false }, cancleUserInfo2 () { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 6ed7eec7b..e4b81cf05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -431,7 +431,7 @@ } } this.modalshowflag = false - this.$refs.selections.clearSelection() + this.$refs.filterTable.clearSelection() }, handleTabs(name) { this.active = name From 296aec5c7021e3b4d6feeef53ec7cb5b8e02fcfd Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Wed, 30 Mar 2022 09:43:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052197=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=9A=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7=E8=BF=9B=E5=8E=BB?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=9B=9E=E6=89=A7=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index 5c8951a5a..456f2430c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -126,11 +126,12 @@ label="在产车实施日期"> -
+
Date: Wed, 30 Mar 2022 10:30:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052213=20=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95?= =?UTF-8?q?--=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=9B=9E=E6=98=BE=E7=9A=84=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listTracking.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index dee4141ba..f9c6e5e90 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -94,7 +94,8 @@ + align="center" + :formatter="reImplRequire"> + align="center" + :formatter="reImplRequire"> - +