From d1b37660ff3b05fa751d4cb86e23eacfb25bef16 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 27 Jul 2021 21:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B-=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step10.vue       | 249 ++---
 .../pages/creatProcess/xmpg2/step11.vue       | 250 ++---
 .../pages/creatProcess/xmpg2/step12.vue       | 251 ++---
 .../pages/creatProcess/xmpg2/step6.vue        |  65 +-
 .../pages/creatProcess/xmpg2/step7.vue        | 940 +++++++++---------
 .../pages/creatProcess/xmpg2/step8.vue        | 249 ++---
 .../pages/creatProcess/xmpg2/step9.vue        | 247 ++---
 7 files changed, 1132 insertions(+), 1119 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index b9053c236..517a91b42 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        bzFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.bzFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.bzFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 5831d1333..f560b2da8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        bzFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,43 +358,52 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
+      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.bzFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
+      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.bzFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
+    },
   },
+
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index f3aa290cc..800bc166b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        dlFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {
@@ -404,7 +411,7 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-  }
+  },
 };
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 05e761fd8..632d439fa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -72,7 +72,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
+            prop="itemsNum"
             align="center"
             width="200"
             label="条款号">
@@ -84,21 +84,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
+            prop="xcxssrqgj"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
+            prop="zccssrqgj"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -112,7 +112,7 @@
               label="合规">
               <template slot-scope="scope">
                 <el-input
-                  v-model="dataList[scope.$index].complianceReasons"
+                        v-model="scope.row.complianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -130,7 +130,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].noCompliance"
+                          v-model="scope.row.noCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -143,7 +143,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].countermeasures"
+                          v-model="scope.row.countermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -156,7 +156,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                    v-model="dataList[scope.$index].completionTime"
+                          v-model="scope.row.completionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -174,7 +174,7 @@
               label="合规(具体情况)">
               <template slot-scope="scope">
                 <el-input
-                  v-model="dataList[scope.$index].zcComplianceReasons"
+                        v-model="scope.row.zcComplianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -191,7 +191,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].zcNoCompliance"
+                          v-model="scope.row.zcNoCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -204,7 +204,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].zcCountermeasures"
+                          v-model="scope.row.zcCountermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -217,7 +217,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                    v-model="dataList[scope.$index].zcCompletionTime"
+                          v-model="scope.row.zcCompletionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -396,6 +396,7 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
+            console.log(res.mesg)
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -407,37 +408,13 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        console.log(this.listForm)
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
-        let children = [];
-        item.breakdownList.forEach(
-          item => {
-            let aa = {
-              key: item.standId,
-              id: item.id,
-              standId: item.itemsNum,
-              itemsNum: item.itemsNum,
-              itemsName: item.itemsName,
-              workPeople: "请选择责任人"
-            };
-            children.push(aa);
-          }
-        );
-        this.dataList.forEach(key => {
-          key["children"] = [];
-          children.forEach(breakDown => {
-            if (key.standId === breakDown.key) {
-              key["children"].push(breakDown);
-            }
-          });
-          if (key["children"].length === 0) {
-            delete key["children"];
-          }
-        });
-        this.listForm.children = children;
+        // this.listForm.dataList = item.dataList;
+        this.dataList = this.listForm.dataList;
+        console.log(this.dataList)
       });
     },
     //保存事件
@@ -446,8 +423,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.dataList.forEach(item => {
-        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
             }
           }, e => {
           });
-        } else {
-          this.$message.warning("请选择分发负责人");
-        }
-      });
     },
     //标准表格选择框改变
     selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 3f238b82b..ac7e9a61e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -1,485 +1,491 @@
 <template>
-  <div class="xmpg2-step7">
-    <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程-项目</template>
-      <template slot="proNode">分发责任人审批</template>
-    </ProcessHeader>
-    <div class="headerTabs">
-      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
-    <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
-        <process-title>
-          <template slot="title">基础信息</template>
-        </process-title>
-        <el-form
-          :model="listForm"
-          class="label-input-form prc-content-border"
-          label-width="150px"
-        >
-          <el-row :gutter="24">
-            <el-col :span="24">
-              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
-                <el-input
-                  v-model="listForm.projectNumber"
-                  placeholder="请输入项目编号"
-                  clearable
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
-                <el-input
-                  v-model="listForm.projectName"
-                  placeholder="请输入项目名称"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <process-title style="margin-top:5px; margin-bottom: 5px">
-          <template slot="title">填写信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
-          </el-table-column>
-          <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                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>
-          <el-table-column
-            align="center"
-            label="在产产品">
-            <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
-              <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
-        </el-table>
-      </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="意见填写">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
+    <div class="xmpg2-step7">
+        <ProcessHeader toggle>
+            <template slot="proName">项目合规评估流程-项目</template>
+            <template slot="proNode">分发责任人审批</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto">
+                <process-title>
+                    <template slot="title">基础信息</template>
+                </process-title>
+                <el-form
+                        :model="listForm"
+                        class="label-input-form prc-content-border"
+                        label-width="150px"
+                >
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                                <el-input
+                                        v-model="listForm.projectNumber"
+                                        placeholder="请输入项目编号"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                                <el-input
+                                        v-model="listForm.projectName"
+                                        placeholder="请输入项目名称"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+                <process-title style="margin-top:5px; margin-bottom: 5px">
+                    <template slot="title">填写信息</template>
+                </process-title>
+                <el-table
+                        :data="dataList"
+                        style="width: 100%; border: 1px solid #cccccc"
+                        row-key="standId"
+                        height="70%"
+                        border
+                        @selection-change="selectStandChange"
+                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+                >
+                    <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="standEnName"
+                            label="标准编号"
+                            width="180"
+                            fixed="left"
+                            align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="standName"
+                            fixed="left"
+                            width="180"
+                            align="center"
+                            label="标准名称"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="itemsNum"
+                            align="center"
+                            width="200"
+                            label="条款号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="itemsName"
+                            width="200"
+                            align="center"
+                            label="条款名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="xcxssrqgj"
+                            width="200"
+                            align="center"
+                            label="新车型实施日期">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="zccssrqgj"
+                            width="200"
+                            align="center"
+                            label="在产车实施日期">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="productType"
+                            align="center"
+                            label="在研产品">
+                        <el-table-column
+                                prop="complianceReasons"
+                                align="center"
+                                width="160"
+                                label="合规">
+                        </el-table-column>
+                        <el-table-column
+                                align="center"
+                                width="160"
+                                prop="researchNonCompliance"
+                                label="不合规">
+                            <el-table-column
+                                    prop="noCompliance"
+                                    align="center"
+                                    width="160"
+                                    label="不合规项目">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="countermeasures"
+                                    align="center"
+                                    width="160"
+                                    label="应对措施">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="completionTime"
+                                    align="center"
+                                    width="160"
+                                    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>
+                    <el-table-column
+                            align="center"
+                            label="在产产品">
+                        <el-table-column
+                                prop="zcComplianceReasons"
+                                align="center"
+                                width="160"
+                                label="合规(具体情况)">
+                        </el-table-column>
+                        <el-table-column
+                                align="center"
+                                width="160"
+                                label="不合规">
+                            <el-table-column
+                                    prop="zcNoCompliance"
+                                    align="center"
+                                    width="160"
+                                    label="不合规项目">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zcCountermeasures"
+                                    align="center"
+                                    width="160"
+                                    label="应对措施">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zcCompletionTime"
+                                    align="center"
+                                    width="160"
+                                    label="完成时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                                </template>
+                            </el-table-column>
+                        </el-table-column>
+                    </el-table-column>
+                </el-table>
             </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-    </div>
-    <div class="content" v-show="active === '3'">
-      <div class="flow-list" style="height: 100%">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :no-data-text="listNoDataText"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+            <div>
+                <el-collapse accordion>
+                    <el-collapse-item title="意见填写">
+                        <div style="margin: 10px 0;">
+                            <el-input
+                                    type="textarea"
+                                    :rows="3"
+                                    resize="none"
+                                    placeholder="请输入意见"
+                                    v-model="commentText">
+                            </el-input>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
+        </div>
+        <div class="content" v-show="active === '3'">
+            <div class="flow-list" style="height: 100%">
+                <el-table
+                        height="100%"
+                        ref="selection"
+                        :data="detailData"
+                        tooltip-effect="dark"
+                        style="width: 100%"
+                        border
+                        row-key="id"
+                        :no-data-text="listNoDataText"
+                        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                >
+                    <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="任务步骤"
+                            align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="assignee"
+                            label="任务受理人"
+                            align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="createTime"
+                            label="创建时间"
+                            sortable="custom"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="endTime"
+                            label="完成时间"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="comment"
+                            label="审批意见"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.commentText }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="completeFlag"
+                            label="状态"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <loading :loading="loading">流程列表加载中</loading>
+            </div>
+        </div>
+        <ProcessFooter
+                show-back
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                :approval="true"
+                @back="beforeBack"
+                @submit="handleSubmit"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="comment"
-            label="审批意见"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.commentText }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <loading :loading="loading">流程列表加载中</loading>
-      </div>
+        </ProcessFooter>
     </div>
-    <ProcessFooter
-      show-back
-      show-submit
-      :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
-      @submit="handleSubmit"
-    >
-    </ProcessFooter>
-  </div>
 </template>
 
 <script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+    import ProcessHeader from "../../components/ProcessHeader";
+    import ProcessFooter from "../../components/ProcessFooter";
+    import ProcessTitle from "../../components/ProcessTitle";
+    import {inboundLiaisonDetail, queryDetail} from "api/process";
 
-export default {
-  name: "xmpg2Step7",
-  components: {
-    ProcessTitle,
-    ProcessHeader,
-    ProcessFooter
-  },
-  data() {
-    return {
-      active: "1",
-      loading: false,
-      // 当前流程类型(1待办/2已办)
-      processType: 1,
-      isSubmit: false,
-      saveLoading: false,
-      //表单的数据
-      listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
-        projectNumber: "",  //项目编号
-        projectName: "",  //项目名称
-        dataList: [], //项目下的标准数据
-        breakdownList: [] //标准下的分解单数据
-      },
-      dataList: [], //展示的标准数据
-      commentText: "", //审批意见
-      detailData: [],//流程历史数据
-      userId: this.$store.getters.userInfo.userId,
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId
+    export default {
+        name: "xmpg2Step7",
+        components: {
+            ProcessTitle,
+            ProcessHeader,
+            ProcessFooter
+        },
+        data() {
+            return {
+                active: "1",
+                loading: false,
+                // 当前流程类型(1待办/2已办)
+                processType: 1,
+                isSubmit: false,
+                saveLoading: false,
+                //表单的数据
+                listForm: {
+                    ffFlag: " ", //1审批通过 其他为驳回
+                    projectNumber: "",  //项目编号
+                    projectName: "",  //项目名称
+                    dataList: [], //项目下的标准数据
+                    breakdownList: [] //标准下的分解单数据
+                },
+                dataList: [], //展示的标准数据
+                commentText: "", //审批意见
+                detailData: [],//流程历史数据
+                userId: this.$store.getters.userInfo.userId,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId
+            };
+        },
+        methods: {
+            processTable() {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res;
+                }, e => {
+                });
+            },
+            //tab改变
+            handleTabs(type) {
+                this.active = type;
+            },
+            //获取数据
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        if (res) {
+                            const processForm = JSON.parse(res.mesg);
+                            this.getFormFieldList(processForm);
+                        }
+                    }).catch(e => {
+                    });
+                });
+            },
+            //动态表单读取
+            getFormFieldList(item) {
+                this.$nextTick(() => {
+                    this.listForm = JSON.parse(JSON.stringify(item));
+                    this.listForm.prcNum = this.prcNum;
+                    this.listForm.prcName = this.prcName;
+                    this.listForm["id"] = item.id;
+                    this.listForm.dataList = item.dataList;
+                    this.dataList = item.dataList;
+                    this.dataList.distributePerson = item.dataList[0].distributePerson;
+                    this.listForm.breakdownList = item.breakdownList;
+                });
+            },
+            //驳回事件
+            beforeBack() {
+                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+                    this.$message.warning('请填写审批意见')
+                } else {
+                    this.listForm.ffFlag = "2";
+                    this.listForm.commentText = this.commentText;
+                    const json = JSON.stringify(this.listForm);
+                    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");
+                        }
+                    }, e => {
+                    });
+                }
+            },
+            //提交事件
+            handleSubmit() {
+                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+                    this.$message.warning('请填写审批意见')
+                } else {
+                    this.listForm.ffFlag = "1";
+                    this.listForm.commentText = this.commentText;
+                    const json = JSON.stringify(this.listForm);
+                    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");
+                        }
+                    });
+                }
+            },
+        },
+        computed: {
+            listNoDataText() {
+                return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+            }
+        },
+        mounted() {
+            this.processTable();
+            this.getData();
+        },
     };
-  },
-  methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
-    //tab改变
-    handleTabs(type) {
-      this.active = type;
-    },
-    //获取数据
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
-      });
-    },
-    //动态表单读取
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
-        this.listForm.prcName = this.prcName;
-        this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
-        this.listForm.breakdownList = item.breakdownList;
-      });
-    },
-    //驳回事件
-    beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    },
-    //提交事件
-    handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
-  },
-  computed: {
-    listNoDataText() {
-      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-    }
-  },
-  mounted() {
-    this.processTable();
-    this.getData();
-  }
-};
 </script>
 
 <style lang="less" scoped>
-@import '~@/assets/styles/style';
+    @import '~@/assets/styles/style';
 
-.xmpg2-step7 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
+    .xmpg2-step7 {
+        /deep/ .el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
 
-  .choiceBtn {
-    .el-button--primary {
-      width: 150px;
-    }
-  }
+        .choiceBtn {
+            .el-button--primary {
+                width: 150px;
+            }
+        }
 
-  position: relative;
-  height: 100%;
-
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 0;
-    right: 10px;
-
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
-
-  .content {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    height: calc(~'100% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-
-      .accessStandardsAndRegulations {
+        position: relative;
         height: 100%;
-      }
-    }
-  }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+
+                .accessStandardsAndRegulations {
+                    height: 100%;
+                }
+            }
+        }
+
+        .demo-drawer-content {
+            margin-top: 10px;
+        }
+    }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 19eb851ea..7b02fb449 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        jgFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.jgFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.jgFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 19cfdb36d..5ab76b5c5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.gcFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      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");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.gcFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        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");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {