From a8d17d7cf390fe5e8f16ed94c182480884c5bfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 12 Apr 2022 15:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=E6=89=8B=E6=9C=BA=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/phone/xmpg/step4.vue  | 76 +++++++------------
 .../processCenter/pages/phone/xmpg/step5.vue  | 76 +++++++------------
 2 files changed, 54 insertions(+), 98 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/xmpg/step4.vue b/src/pages/processCenter/pages/phone/xmpg/step4.vue
index 56c614139..e12836d5f 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/phone/xmpg/step4.vue
@@ -22,22 +22,8 @@
             <div class="prc-content-border" v-if="foldFormFlag === false">
               <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="请输入项目编号"
-                      disabled
-                      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="请输入项目名称"
-                      disabled
-                      clearable
-                    ></el-input>
-                  </el-form-item>
+                  <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
+                  <van-field label="项目名称" v-model="listForm.projectName" readonly />
                 </el-col>
               </el-row>
             </div>
@@ -47,22 +33,8 @@
           <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
             <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="请输入项目编号"
-                    disabled
-                    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="请输入项目名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
+                <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
+                <van-field label="项目名称" v-model="listForm.projectName" readonly />
               </el-col>
             </el-row>
           </div>
@@ -72,14 +44,19 @@
         <template slot="title">填写信息</template>
       </ProcessTitle>
       <el-table
-        ref="multipleTable"
-        :data="dataList"
-        tooltip-effect="dark"
-        style="width: 100%"
+        :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+        style="width: 100%; border: 1px solid #cccccc;height: 400px"
+        height="70%"
         border
-        height="55%"
+        highlight-current-row
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+          fontWeight: 'bold'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
         <el-table-column
           prop="standEnName"
           label="标准编号"
@@ -117,22 +94,22 @@
           label="条款名称">
         </el-table-column>
         <el-table-column
-          prop="xCXSSRQ"
+          prop="ssrq"
+          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"
+          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"
@@ -163,7 +140,8 @@
             width="120"
             label="完成时间">
             <template slot-scope="scope">
-              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -174,9 +152,9 @@
           label="不涉及理由">
         </el-table-column>
         <el-table-column
+          prop="workPeople"
           align="center"
-          width="150"
-          prop="distributePerson"
+          width="200"
           label="责任人">
         </el-table-column>
       </el-table>
diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue
index 70c02c2e0..b980d70f3 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue
@@ -22,22 +22,8 @@
             <div class="prc-content-border" v-if="foldFormFlag === false">
               <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="请输入项目编号"
-                      disabled
-                      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="请输入项目名称"
-                      disabled
-                      clearable
-                    ></el-input>
-                  </el-form-item>
+                  <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
+                  <van-field label="项目名称" v-model="listForm.projectName" readonly />
                 </el-col>
               </el-row>
             </div>
@@ -47,22 +33,8 @@
           <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
             <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="请输入项目编号"
-                    disabled
-                    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="请输入项目名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
+                <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
+                <van-field label="项目名称" v-model="listForm.projectName" readonly />
               </el-col>
             </el-row>
           </div>
@@ -72,14 +44,19 @@
         <template slot="title">填写信息</template>
       </ProcessTitle>
       <el-table
-        ref="multipleTable"
-        :data="dataList"
-        tooltip-effect="dark"
-        style="width: 100%"
+        :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+        style="width: 100%; border: 1px solid #cccccc;height: 400px"
+        height="70%"
         border
-        height="55%"
+        highlight-current-row
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+          fontWeight: 'bold'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
         <el-table-column
           prop="standEnName"
           label="标准编号"
@@ -117,22 +94,22 @@
           label="条款名称">
         </el-table-column>
         <el-table-column
-          prop="xCXSSRQ"
+          prop="ssrq"
+          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"
+          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"
@@ -163,7 +140,8 @@
             width="120"
             label="完成时间">
             <template slot-scope="scope">
-              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -174,9 +152,9 @@
           label="不涉及理由">
         </el-table-column>
         <el-table-column
+          prop="workPeople"
           align="center"
-          width="150"
-          prop="distributePerson"
+          width="200"
           label="责任人">
         </el-table-column>
       </el-table>