From 270cf138fc1e62ed6c3cd2c6d32ffd3d022f8c7a Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 18 Jun 2019 17:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assembly/AssemblyExecution/index.vue      | 20 +++++++++++++++----
 .../Inventory/CreatePickingList/index.vue     |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 951c39cb..1d6d3e95 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -94,8 +94,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
-            <el-button v-else-if="scope.row.组件是否完成===1" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
+            <el-button v-else-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
             <el-button v-else type="info" size="small" >装配完成</el-button>
           </template>
         </el-table-column>
@@ -163,6 +163,16 @@ export default {
       searchTable2(this.machineNumberValue, this.check2).then(response => {
         console.log(response.data, 222)
         this.tableData2 = response.data
+        this.tableData2.map(v => {
+          if (v.组件是否完成 === null || v.组件是否完成 === 0) {
+            this.$set(v, 'buttonStatus', 1)
+          } else if (v.组件是否完成 === 1) {
+            this.$set(v, 'buttonStatus', 2)
+          } else {
+            this.$set(v, 'buttonStatus', 3)
+          }
+          return v
+        })
       })
     },
     // 总装开始装配
@@ -207,7 +217,8 @@ export default {
       ComponentStateUpdate(row.组件流水号, 1).then(response => {
         console.log(response.data)
         this.searchTable1()
-        this.searchTable2()
+        row.buttonStatus = 2
+        // this.searchTable2()
       })
     },
     // 部装结束装配
@@ -216,7 +227,8 @@ export default {
       ComponentStateUpdate(row.组件流水号, 2).then(response => {
         console.log(response.data)
         this.searchTable1()
-        this.searchTable2()
+        row.buttonStatus = 3
+        // this.searchTable2()
       })
     }
   }
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 86196498..aa822434 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -233,7 +233,7 @@
             <el-tag v-else type="success">已确认</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px">
+        <el-table-column label="操作" align="center" width="220px">
           <template slot-scope="scope" align="center">
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button>
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>