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

---
 src/pages/details/complianceDetails/index.vue |  10 ++
 .../pages/creatProcess/bzqdfb/step1-1.vue     |  15 ++-
 .../pages/creatProcess/bzqdfb/step1-3.vue     |  28 +----
 .../pages/creatProcess/bzqdfb/step1-4.vue     |  13 +--
 .../pages/creatProcess/bzqdfb/step1.vue       |  10 +-
 .../pages/creatProcess/bzqdfb/step2.vue       |  13 +--
 .../pages/creatProcess/bzqdfb/step3.vue       |  34 ++----
 .../pages/creatProcess/bzqdfb/step4.vue       |  13 +--
 .../pages/creatProcess/xmpg2/step1-1.vue      |   2 -
 .../pages/creatProcess/xmpg2/step1-12.vue     |  11 +-
 .../pages/creatProcess/xmpg2/step1-2.vue      |   3 -
 .../pages/creatProcess/xmpg2/step1.vue        |   2 -
 .../pages/creatProcess/xmpg2/step10.vue       |   7 --
 .../pages/creatProcess/xmpg2/step11.vue       |  10 +-
 .../pages/creatProcess/xmpg2/step12.vue       |   7 --
 .../pages/creatProcess/xmpg2/step2.vue        |  12 --
 .../pages/creatProcess/xmpg2/step3.vue        |  17 ++-
 .../pages/creatProcess/xmpg2/step4.vue        |  17 ++-
 .../pages/creatProcess/xmpg2/step6.vue        |  11 +-
 .../pages/creatProcess/xmpg2/step7.vue        |   8 +-
 .../pages/creatProcess/xmpg2/step8.vue        |   7 --
 .../pages/creatProcess/xmpg2/step9.vue        |   7 --
 .../pages/details.vue                         |  40 -------
 .../pages/rectificationDatabase.vue           | 103 +++++++++++-------
 24 files changed, 145 insertions(+), 255 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 7fe30ebb5..aea6be615 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -134,7 +134,17 @@ export default {
         }, res => {
           if (res.ok) {
             this.fit = res.data.fit.records
+            this.fit.forEach(item => {
+              if(item.standardItem){
+                  item.standNumber = item.standardItem
+              }
+            })
             this.unfit = res.data.unfit.records
+            this.unfit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 1f4c883f5..c3646474c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -593,7 +593,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -796,7 +796,7 @@ export default {
       ListModel: false, //选择清单抽屉状态
       standModel: false, // 选择标准抽屉状态
       active: "1",
-      signFlag: "1",   //是否会签 1为会签 2为不会签
+      signFlag: "",   //是否会签 1为会签 2为不会签
       listType: "country",  //选择的清单类型
       isSubmit: false,
       saveLoading: false,
@@ -818,7 +818,7 @@ export default {
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
-        signFlag: "1",  //是否会签  1为会签 2为不会签
+        signFlag: "",  //是否会签  1为会签 2为不会签
         inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
@@ -865,6 +865,7 @@ export default {
           this.fileInfoList.push(itemId)
           this.getFileInfo();
         });
+        this.signFlag = mes.form.signFlag
         this.listForm = mes.form;
         this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
@@ -938,9 +939,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1595,5 +1596,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index 903eaaa07..77990f427 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -101,25 +101,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             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
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             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
             show-overflow-tooltip
@@ -181,7 +175,6 @@
           <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>
@@ -319,18 +312,12 @@
                 prop="XCXSSRQ"
                 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
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 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
                 show-overflow-tooltip
@@ -527,13 +514,8 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
         })
         this.totalNo = res.data.count;
       }, e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
index 5b9d7b8bd..945f72d0e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             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
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             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
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 03321c95d..d3a13061a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -563,7 +563,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="90%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -870,9 +870,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1528,5 +1528,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index af29ab7e4..5c6eb9313 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             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
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             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
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 7439a02b5..8cc80d858 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -116,25 +116,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             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
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             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
             show-overflow-tooltip
@@ -196,7 +190,6 @@
           <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>
@@ -293,7 +286,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -338,18 +331,12 @@
                 prop="XCXSSRQ"
                 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
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 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
                 show-overflow-tooltip
@@ -595,13 +582,8 @@ export default {
         this.standardData = res.data.list;
         this.loading = false
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
         })
         this.totalNo = res.data.count;
       }, e => {
@@ -994,6 +976,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index d7d382f97..7314c6f5e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -98,25 +98,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             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
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             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
             show-overflow-tooltip
@@ -178,7 +172,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index db05102b1..2f69511df 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -116,7 +116,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -128,7 +127,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index f48224c89..1b9a77913 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -93,22 +93,16 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             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"
+            prop="zccssrq"
             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="complianceReasons"
@@ -208,7 +202,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index 34c8987e3..39946e082 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -86,7 +86,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
@@ -104,7 +103,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
@@ -169,7 +167,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 969de41de..ce0e2ae44 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -126,7 +126,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -138,7 +137,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 4bc687e09..d1883c0d7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             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"-->
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index ff5c3e3f0..7b78de992 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             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="zccssrqgj"
+            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"-->
@@ -456,7 +449,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 87f80fe44..7ac8c68f3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             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"-->
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index d3ac9ac8d..296b39017 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -86,30 +86,19 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="190px"
             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"
             align="center"
-            sortable
             width="190px"
             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="zrbm"
@@ -169,7 +158,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 4e770b15a..17d28a408 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -98,11 +98,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -161,7 +169,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 102cc4e2e..674745eb9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -96,11 +96,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +177,6 @@
           <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>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 90222f38a..d94e3690c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -52,7 +52,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -109,18 +108,12 @@
             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="zccssrqgj"
+            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"-->
@@ -804,7 +797,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            if(item.workPeopleId === this.$store.getters.userInfo.userId ){
                 this.dataList.push(item)
             }
               item.children.forEach(items=> {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 8f1018e18..dc4358028 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,18 @@
             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="complianceReasons"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index ecd61f622..733c0732e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
                   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"-->
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 96e427c4b..0ab2ca55e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             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"-->
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index bfb015cf8..57b044f8d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -180,12 +180,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.zccssrqgj === null">
-                {{ scope.row.zccssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrqgj"
@@ -193,12 +187,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj === null">
-                {{ scope.row.xcxssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -214,34 +202,6 @@
             align="center"
             label="适用产品线">
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppsbm"
-            width="210px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppscn"
-            width="210px"
-            align="center"
-            label="乘用车VPPS中文名称">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            align="center"
-            width="210px"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            align="center"
-            width="210px"
-            label="卡车VPPS中文名称">
-          </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index c9c27195f..62b37b1a5 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -415,41 +415,6 @@
               <el-col :span="24">
                 <el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
                          ref="addForm">
-                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
-                      <el-option
-                        v-for="item in ProjectDatas"
-                        :key="item.id"
-                        :label="item.projectName"
-                        :value="item"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productId"
-                      placeholder="请输入项目编号"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productType"
-                      placeholder="请输入产品类型"
-                      />
-                  </el-form-item>
-                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productLine"
-                      placeholder="请输入产品线"
-                      />
-                  </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-select
@@ -472,7 +437,7 @@
                       :disabled="true"
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
                                 class="add-form-item add-input">
@@ -489,6 +454,41 @@
                       placeholder="请输入条款名称"
                       :maxlength="500" />
                   </el-form-item>
+                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+<!--                    <el-input-->
+<!--                      :disabled="true"-->
+<!--                      v-model="addForm.productLine"-->
+<!--                      placeholder="请输入产品线"-->
+<!--                    />-->
+                    <el-select v-model="addForm.productLine" filterable  @change="handleChangeLine" placeholder="请选择产品线">
+                      <el-option
+                        v-for="item in productLines"
+                        :key="item.id"
+                        :label="item.productLine"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
+                      <el-option
+                        v-for="item in ProjectDatas"
+                        :key="item.id"
+                        :label="item.projectName"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.productId"
+                      placeholder="请输入项目编号"
+                    />
+                  </el-form-item>
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -593,6 +593,7 @@ export default {
       loading: false,
       nonList: [], //未符合项表格数据
       replaceLoading: false,
+      productLines: [], //产品线数据
       //项目数据
       ProjectDatas: [],
       itemsData: [],
@@ -1006,6 +1007,7 @@ export default {
     },
     //新增事件
     addModel() {
+      alert('222')
       this.dataList = []
       this.serialNumber = true
       this.drawerTitle = "新增";
@@ -1099,6 +1101,11 @@ export default {
       this.pageSizeNo = pageSize;
       this.getTableByPage();
     },
+    //产品线change事件
+    handleChangeLine(val){
+      console.log(val);
+      this.ProjectDatas = val.sarStandProjectLibraries
+    },
 
     /** 项目名称change事件 */
     handleChange(val) {
@@ -1108,12 +1115,11 @@ export default {
       }
       this.addForm.productId = val.id
       this.addForm.productId = val.projectNumber
-      this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor
       this.serialNumber = false
-      let productId = val.id
-      this.getStandData(productId)
+      // let productId = val.id
+      // this.getStandData(productId)
     },
     /** 标准号change事件 */
     standChange(item) {
@@ -1179,11 +1185,30 @@ export default {
       this.addForm.responsibleUnit = nameList;
 
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+        current: 1,
+        PageSize:100,
+      }, {
+        _this: this
+      }, res => {
+        res.data.records.forEach(item => {
+          if(item.productLine){
+            this.productLines.push(item)
+          }
+        })
+      }, e => {
+
+      });
+    },
 
   },
   mounted() {
     //查询已维护的项目
     this.getProjectData();
+    //查询产品线
+    this.getProductData()
     this.getData()
     // 加载所有的部门
     this.getOrgTreeSource();