From 4a5fe7dae6797c6e67e87ce77682df9ea8a32e05 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 31 May 2019 16:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/StatusQuery.js    |  2 +-
 .../ManufacturingCenter/StatusQuery/index.vue | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index 2811ed77..e27efdec 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
+      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
       param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 217c0221..1f6f39b1 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -50,28 +50,28 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
-        style="width: 100%;max-height: 610px"
-        height="610"
+        style="width: 100%;max-height: 600px"
+        height="600"
         size="mini"
         highlight-current-row
         border>
-        <el-table-column align="center" label="序号" type="index" width="50px"/>
-        <el-table-column align="center" label="机床图号" width="100px">
+        <el-table-column align="center" label="序号" type="index" width="60px"/>
+        <el-table-column align="center" label="机床图号" width="170px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" width="60px">
+        <el-table-column align="center" label="组号" width="140px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" width="150px">
+        <el-table-column align="center" label="零件图号" width="200px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" width="100px">
+        <el-table-column align="center" label="零件名称" width="180px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -81,15 +81,14 @@
             {{ scope.row.投产总数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投产时间" width="100px">
+        <el-table-column align="center" label="投产时间" width="130px">
           <template slot-scope="scope">
-            {{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
+            {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" min-width="960px">
+        <el-table-column align="center" label="零件状态" width="750px">
           <template slot-scope="scope">
-            <el-steps id="StatusQuery" :active="scope.row.零件状态码" finish-status="success" simple>
-              <el-step title="分配" />
+            <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
               <el-step title="工艺" />
               <el-step title="定额" />
@@ -352,10 +351,12 @@ export default {
       }
       this.loading0 = true
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        response.data.rows.map(v => {
-          this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
-          v.传递时间 = v.传递时间 ? v.传递时间.split(' ')[0] : ''
-        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
+          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
+            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+          }
+        }
         this.loading0 = false
         this.tableData = response.data.rows
         this.total = parseInt(response.data.total)
@@ -490,8 +491,3 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
-<style>
-  #StatusQuery {
-    padding: 8px 30px;
-  }
-</style>