From 1748984be0ca2037008a7b10bd6f87186b17507c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Dec 2021 17:31:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1-7.vue       |  7 +--
 .../pages/creatProcess/xmpg/step3.vue         | 22 ++++-----
 .../pages/creatProcess/xmpg/step4.vue         |  6 ---
 .../pages/creatProcess/xmpg/step5.vue         | 47 -------------------
 .../pages/creatProcess/xmpg/step6.vue         | 47 -------------------
 .../pages/creatProcess/xmpg/step7.vue         | 47 -------------------
 6 files changed, 9 insertions(+), 167 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index eac4e6234..2ddf02f50 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -6,6 +6,7 @@
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
@@ -198,18 +199,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/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 3288047f5..4c3779ccb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -191,20 +191,14 @@
             label="基于上一版本差异">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
+            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
-            prop="zCCSSRQ"
+            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
             label="落实人"
@@ -532,11 +526,11 @@ export default {
         this.listForm.breakdownList = [];
         for (let i = 0; i < item.pepdtos.length; i++) {
           for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
-            if (item.pepdtos[i].xCXSSRQ === null) {
-              item.pepdtos[i].xCXSSRQ = "";
+            if (item.pepdtos[i].xcxssrq === null) {
+              item.pepdtos[i].xcxssrq = "";
             }
-            if (item.pepdtos[i].zCCSSRQ === null) {
-              item.pepdtos[i].zCCSSRQ = "";
+            if (item.pepdtos[i].zccssrq === null) {
+              item.pepdtos[i].zccssrq = "";
             }
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -558,8 +552,8 @@ export default {
               standNumber: item.pepdtos[i].standNumber,
               standName: item.pepdtos[i].standName,
               id: item.pepdtos[0].id,
-              xCXSSRQ: item.pepdtos[i].XCXSSRQ,
-              zCCSSRQ: item.pepdtos[i].ZCCSSRQ
+              xcxssrq: item.pepdtos[i].XCXSSRQ,
+              zccssrq: item.pepdtos[i].ZCCSSRQ
             });
           }
         }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 0df3cde58..994a8e6a4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -203,18 +203,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="researchCompliance"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index ee33c608a..9c784772c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -198,23 +198,13 @@
             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"
@@ -248,43 +238,6 @@
                 </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="170"-->
-<!--                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="120"-->
-<!--                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"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 15f2f78e7..2fea7067f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -198,23 +198,13 @@
             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"
@@ -248,43 +238,6 @@
                 </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="170"-->
-<!--                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="120"-->
-<!--                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"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 53bcde0de..8c069a740 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -198,23 +198,13 @@
             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"
@@ -248,43 +238,6 @@
                 </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="170"-->
-<!--                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="120"-->
-<!--                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"

From 52137869a89b6a3643ee3485cc8a73314cc45fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Dec 2021 17:44:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step3.vue    | 122 +++++++++---------
 1 file changed, 60 insertions(+), 62 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index de246c9d1..d7a8db90f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -163,70 +163,68 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+       <el-table
+        height="100%"
+        ref="selection"
+        :data="detailData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :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
-            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>
+        </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