From b903cda5ce66c96568e03ebbcf460170b1073f34 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, 26 Jan 2022 11:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step6.vue         | 33 +++++++++++++++----
 .../pages/creatProcess/bzpg/step7.vue         | 12 ++++---
 .../pages/creatProcess/bzpg/step8.vue         | 12 ++++---
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index 080d38a15..86e5cb9a8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -217,7 +217,7 @@
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="researchCompliance"
+          prop="complianceReasons"
           align="center"
           width="160"
           label="合规">
@@ -225,25 +225,27 @@
         <el-table-column
           align="center"
           width="160"
-          prop="researchNonCompliance"
           label="不合规">
           <el-table-column
-            prop="researchNonCompliance"
+            prop="noCompliance"
             align="center"
             width="170"
             label="不合规项目">
           </el-table-column>
           <el-table-column
-            prop="researchCountermeasures"
+            prop="countermeasures"
             align="center"
             width="160"
             label="应对措施">
           </el-table-column>
           <el-table-column
-            prop="researchCompletionTime"
+            prop="completionTime"
             align="center"
             width="140"
             label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
         </el-table-column>
         <el-table-column
@@ -598,11 +600,31 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.listForm.dataList = this.dataList
+        this.listForm.passFlag = '1'
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
       }
     },
     //提交事件
     handleSubmit() {
       this.listForm.dataList = this.dataList
+      this.listForm.passFlag = '0'
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
@@ -620,7 +642,6 @@ export default {
         this.isSubmit = false
       }, e => {
       });
-
     },
     //标准表格选择框改变
     selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
index 31ef4c729..471af52e5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -217,7 +217,7 @@
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="researchCompliance"
+          prop="complianceReasons"
           align="center"
           width="160"
           label="合规">
@@ -225,25 +225,27 @@
         <el-table-column
           align="center"
           width="160"
-          prop="researchNonCompliance"
           label="不合规">
           <el-table-column
-            prop="researchNonCompliance"
+            prop="noCompliance"
             align="center"
             width="170"
             label="不合规项目">
           </el-table-column>
           <el-table-column
-            prop="researchCountermeasures"
+            prop="countermeasures"
             align="center"
             width="160"
             label="应对措施">
           </el-table-column>
           <el-table-column
-            prop="researchCompletionTime"
+            prop="completionTime"
             align="center"
             width="140"
             label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
         </el-table-column>
         <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
index 369406c68..a8264ba86 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -217,7 +217,7 @@
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="researchCompliance"
+          prop="complianceReasons"
           align="center"
           width="160"
           label="合规">
@@ -225,25 +225,27 @@
         <el-table-column
           align="center"
           width="160"
-          prop="researchNonCompliance"
           label="不合规">
           <el-table-column
-            prop="researchNonCompliance"
+            prop="noCompliance"
             align="center"
             width="170"
             label="不合规项目">
           </el-table-column>
           <el-table-column
-            prop="researchCountermeasures"
+            prop="countermeasures"
             align="center"
             width="160"
             label="应对措施">
           </el-table-column>
           <el-table-column
-            prop="researchCompletionTime"
+            prop="completionTime"
             align="center"
             width="140"
             label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
         </el-table-column>
         <el-table-column