From d1a65d206315dd669ce3d2b76c5715d42123dcd4 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 10:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/StatusQuery/index.vue | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 797a164b..5d221b14 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -24,7 +24,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
-        <el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
+        <el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=30;total=0;searchData()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -60,14 +60,14 @@
             {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" width="650px">
+        <el-table-column align="center" label="零件状态" width="550px">
           <template slot-scope="scope">
             <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
               <el-step title="工艺" />
-              <el-step title="定额" />
-              <el-step title="平衡" />
-              <el-step title="完成" />
+              <!--<el-step title="定额" />-->
+              <!--<el-step title="平衡" />-->
+              <el-step title="制造" />
               <el-step title="入库" />
               <el-step title="出库" />
             </el-steps>
@@ -77,7 +77,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
+          :page-sizes="[30, 50, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -108,7 +108,7 @@ export default {
       partTypeValue: null, // 零件类型
       num: null,
       pageCurrent: 1,
-      pageSize: 20,
+      pageSize: 30,
       tableData7: [],
       tableData6: [],
       tableData: [],
@@ -173,9 +173,18 @@ export default {
       this.loading0 = true
       searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.result.length; i++) {
-          response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
-          if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
-            response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
+          if (response.data.result[i].考核状态 === 3) {
+            response.data.result[i].考核状态 = 1
+          } else if (response.data.result[i].考核状态 === 4) {
+            response.data.result[i].考核状态 = 2
+          } else if (response.data.result[i].考核状态 === 5) {
+            response.data.result[i].考核状态 = 2
+          } else if (response.data.result[i].考核状态 === 6) {
+            response.data.result[i].考核状态 = 3
+          } else if (response.data.result[i].考核状态 === 7) {
+            response.data.result[i].考核状态 = 4
+          } else if (response.data.result[i].考核状态 === 8) {
+            response.data.result[i].考核状态 = 5
           }
         }
         this.loading0 = false