From 3d4fca0f8cfa5746ab3193dd6a79972e90956ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Dec 2021 16:08:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=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/xmpg2/step10.vue | 4 +---
 src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue | 4 +---
 src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue | 4 +---
 src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue  | 4 +---
 src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue  | 4 +---
 src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue  | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index d1883c0d7..dda1b628d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -470,9 +470,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 7b78de992..40751681a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -468,9 +468,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 7ac8c68f3..bb7255935 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -470,9 +470,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index dc4358028..186c9655f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -430,9 +430,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-              this.dataList.push(item)
-            }
+            this.dataList.push(item)
             item.children.forEach(items=> {
               if(items.key === item.standId){
                 this.$set(items, "standName", item.standName);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 733c0732e..194001ce1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -468,9 +468,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 0ab2ca55e..c26530b3a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -470,9 +470,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);

From 94c6e32dbe930d64c534fa377b797b348e88f985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Dec 2021 17:01:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step1-12.vue              |  6 ++++++
 .../processCenter/pages/creatProcess/xmpg2/step10.vue  |  9 +++++++++
 .../processCenter/pages/creatProcess/xmpg2/step11.vue  |  9 +++++++++
 .../processCenter/pages/creatProcess/xmpg2/step12.vue  |  9 +++++++++
 .../processCenter/pages/creatProcess/xmpg2/step4.vue   |  1 -
 .../processCenter/pages/creatProcess/xmpg2/step6.vue   |  9 +++++++++
 .../processCenter/pages/creatProcess/xmpg2/step7.vue   | 10 +++++++++-
 .../processCenter/pages/creatProcess/xmpg2/step8.vue   |  9 +++++++++
 .../processCenter/pages/creatProcess/xmpg2/step9.vue   |  9 +++++++++
 9 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index 1b9a77913..cdac9c9ef 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -92,6 +92,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index dda1b628d..4ea1a6af7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -94,6 +94,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -478,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 40751681a..7665ee262 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -94,6 +94,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -476,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index bb7255935..1d20a7bb1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -94,6 +94,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -478,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 674745eb9..9101f2de9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -455,7 +455,6 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index d94e3690c..b388d992c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -103,6 +103,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -807,6 +813,9 @@ export default {
                   this.$set(items, "standYear", item.standYear);
                   this.$set(items, "standSort", item.standSort);
                   this.$set(items, "standNumber", item.standNumber);
+                  this.$set(items, "zccssrq", item.zccssrq);
+                  this.$set(items, "xcxssrq", item.xcxssrq);
+                  this.$set(items, "ssrq", item.ssrq);
                 }
               })
           })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 186c9655f..a3cb98cd0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -94,7 +94,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
-
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -438,6 +443,9 @@ export default {
                 this.$set(items, "standYear", item.standYear);
                 this.$set(items, "standSort", item.standSort);
                 this.$set(items, "standNumber", item.standNumber);
+                this.$set(items, "zccssrq", item.zccssrq);
+                this.$set(items, "xcxssrq", item.xcxssrq);
+                this.$set(items, "ssrq", item.ssrq);
               }
             })
           })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 194001ce1..1d4626568 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -94,6 +94,12 @@
                   align="center"
                   label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
                   prop="xcxssrq"
                   width="200"
@@ -476,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index c26530b3a..720ee308c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -94,6 +94,12 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
@@ -478,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })