Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/Inventory/PartOut/index.vue

@@ -45,6 +45,11 @@
           align="center"
           type="index"
           width="50"/>
+        <el-table-column label="零件图号" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -87,8 +92,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
+            <el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
-            <el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
+            <el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -286,15 +291,13 @@ export default {
         this.listLoading = false
       })
     },
-    // 查询交换单
+    // 选择领料单
-    searchExchange() {
+    chooseListinfor(row) {
-      ExchangeOut(this.pickingListNumberx).then(response => {
+      this.pickingListNumberx = row.领料单流水号
-        const data = response.data
+      this.getpicikingPeople = row.领料人流水号
-        for (let i = 0; i < data.length; i++) {
+      console.log(this.pickingListNumberx, 223344)
-          data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
+      this.searchListDetailt()
-        }
+      this.searchExchange()
-        this.tableDataExchange = data
-      })
     },
     // 查询领料单明细
     searchListDetailt() {
@@ -309,13 +312,15 @@ export default {
         this.listLoading1 = false
       })
     },
-    // 选择领料单
+    // 查询交换单
-    chooseListinfor(row) {
+    searchExchange() {
-      this.pickingListNumberx = row.领料单流水号
+      ExchangeOut(this.pickingListNumberx).then(response => {
-      this.getpicikingPeople = row.领料人流水号
+        const data = response.data
-      console.log(this.pickingListNumberx, 223344)
+        for (let i = 0; i < data.length; i++) {
-      this.searchListDetailt()
+          data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
-      this.searchExchange()
+        }
+        this.tableDataExchange = data
+      })
     },
     // 出库
     partOut(row) {