From b8da0f7deee9dad8bcb2050fe007100333eaeebc Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Tue, 1 Jan 2019 16:55:28 +0800
Subject: [PATCH] lx

---
 src/api/Inventory/PartOut.js                  | 12 +++++
 src/views/Inventory/InboundCard/index.vue     | 28 ++++++----
 src/views/Inventory/InventoryCheck/index.vue  |  4 +-
 src/views/Inventory/OfflinePurchase/index.vue |  1 +
 src/views/Inventory/PartOut/index.vue         | 51 ++++++++++++++++++-
 5 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index aa7a250f..12adc983 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -97,3 +97,15 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8,
     }
   })
 }
+// 交换出库
+export function ExchangePartOut(data1, data2, data3, data4, data5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_交换件出库_修改数据',
+      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+    }
+  })
+}
diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue
index 603936c1..b812aef5 100644
--- a/src/views/Inventory/InboundCard/index.vue
+++ b/src/views/Inventory/InboundCard/index.vue
@@ -794,6 +794,7 @@ export default {
         }
       })
     },
+    // 选中采购部入库记录
     handleSelectionChange(val) {
       this.nameGroup = []
       this.modelGroup = []
@@ -810,6 +811,7 @@ export default {
         this.priceGroup.push(val[i].单价)
       }
     },
+    // 选中车间采购入库记录
     handleSelectionChange2(val) {
       this.nameGroup = []
       this.modelGroup = []
@@ -827,17 +829,21 @@ export default {
       }
     },
     InboundCardDetail() {
-      addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-          this.dialogVisible1 = false
-          searchInboundCardDetail(this.DetailNumber).then(response => {
-            this.tableData4 = response.data
-          })
-        } else {
-          this.$message.error('增加失败')
-        }
-      })
+      if (this.DetailNumber === '') {
+        this.$message.error('请选择入库单')
+      } else {
+        addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.dialogVisible1 = false
+            searchInboundCardDetail(this.DetailNumber).then(response => {
+              this.tableData4 = response.data
+            })
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      }
     },
     // 修改入库单
     editInboundCardInfor(row) {
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 22da3392..31511db2 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -325,10 +325,10 @@
       <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
         <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
           <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
-            <el-input v-model="form2.Number" size="small" placeholder="出库数量" style="width: 200px"/>
+            <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
           </el-form-item>
           <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
-            <el-input v-model="form2.AlterReason" size="small" placeholder="请输入备注" style="width: 200px"/>
+            <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index 74d44954..20874713 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -351,6 +351,7 @@ export default {
       disable2: true,
       disable3: true,
       disable4: true,
+      purchasecardnumber: '', // 请购单流水号
       disable: false, // 其他的禁用
       House: [],
       HouseNumber: '',
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 1b3b789b..f7fb9a76 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -116,11 +116,41 @@
             {{ scope.row.交换件名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="项目名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="被交换件名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.被交换件名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="被交换件项目名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.被交换件项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="被交换件机床图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.被交换件机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="被交换件组号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.被交换件组号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="交换数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.交换数量 }}
@@ -146,6 +176,11 @@
             {{ scope.row.审批状态 }}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" min-width="100">
+          <template slot-scope="scope">
+            <el-button :disabled="scope.row.审批通过" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="execExchangePartOut(scope.row)">出库</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <!--异常出库对话框-->
@@ -167,7 +202,7 @@
 </template>
 
 <script>
-import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut, ExchangeOut } from '@/api/Inventory/PartOut'
+import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -255,6 +290,9 @@ export default {
     searchExchange() {
       ExchangeOut(this.pickingListNumberx).then(response => {
         const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].审批通过 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+        }
         this.tableDataExchange = data
       })
     },
@@ -324,6 +362,17 @@ export default {
       this.form = []
       this.dialogFormVisible = false
     },
+    execExchangePartOut(row) {
+      ExchangePartOut(row.采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('出库成功')
+          this.dialogFormVisible = false
+          this.form = []
+        } else {
+          this.$message.error('出库失败')
+        }
+      })
+    },
     submitEdit() {
       ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.partName, this.picikingPeople, this.purchaseDeatileNumber, this.askPurchaseNumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason, this.partType).then(response => {
         if (response.data[0].result === '1') {