From 48a9d49376f54aee8dbdbbe87e834cdb23b746e8 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 29 Mar 2019 19:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=85=88=E4=B8=8D=E8=AE=A9=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/PickingList.js                        | 4 ++--
 src/views/Inventory/PickingList/index.vue               | 8 +++++---
 src/views/PurchasingCenter/CreateInquirySheet/index.vue | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js
index d9516691..9b14ce87 100644
--- a/src/api/Inventory/PickingList.js
+++ b/src/api/Inventory/PickingList.js
@@ -125,14 +125,14 @@ export function dropList(PickingListNumberx) {
   })
 }
 // 删除领料单明细
-export function dropListDetail(DetailNumberx) {
+export function dropListDetail(DetailNumberx, isBacklog) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间装配管理_领料单_领料单明细删除',
-      param: '领料单明细流水号=' + DetailNumberx
+      param: '领料单明细流水号=' + DetailNumberx + '&是否滞货=' + isBacklog
     }
   })
 }
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 0839966c..13cc5a7a 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -93,7 +93,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column v-if="false" label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
           </template>
@@ -325,7 +325,7 @@
         </el-table-column>
         <el-table-column label="货位存量" align="center" width="120">
           <template slot-scope="scope">
-            {{ scope.row.关联数量 }}
+            {{ scope.row.货位余量 }}
           </template>
         </el-table-column>
         <el-table-column label="待出库数量" align="center" width="120">
@@ -692,12 +692,14 @@ export default {
     },
     // 删除领料单明细
     dropListdetail(row) {
+      let isBacklog
+      console.log(row)
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        dropListDetail(row.领料单明细流水号).then(response => {
+        dropListDetail(row.领料单明细流水号, isBacklog).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchListDetailt()
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index c43519e3..dfa660cf 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -983,7 +983,7 @@ export default {
       this.allNum = []
       for (let i = 0; i < val.length; i++) {
         this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
-        this.allNum[i] = val[i].数量
+        this.allNum[i] = val[i].零件数量
       }
     },
     addInquirySheet() { // 追加物料