From 83e19750158754ea27c06f96171c22913081a1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 18 Aug 2021 14:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/delivery/apply.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index 7d905e4..54aa7b9 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -136,12 +136,11 @@
 					let warehouse_list = {};
 					list.map(item => {
 						console.log('======',item)
-						console.log('===库存===',item.warehouse.stock)
 						warehouse_list[item.id] = {
 							batch_sn: item?.purchase?.batch_sn || '',
 							brand: item?.material?.brand || '',
 							checked: true,
-							stock: item.warehouse.stock,
+							stock: item?.warehouse?.stock || '',
 							m_sn: item?.material?.m_sn || '',
 							material_id: item?.material?.id || 0,
 							material_name: item?.material?.m_name || '',
@@ -153,7 +152,8 @@
 							supplier_name: item?.purchase?.supplier?.supplier_name || '',
 							delivery_number: item.out_number || 1,
 							unit: item?.material?.unit || {},
-							category: item?.material?.category || {}
+							category: item?.material?.category || {},
+							warehouse_id: item?.warehouse_id || 0
 						};
 					})
 					this.warehouse_list = warehouse_list;
@@ -203,6 +203,7 @@
 					this.button_click = false;
 					return this.$msg('您未选择物资')
 				}
+				console.log("this.contents", this.contents);
 				let is_empty = false;
 				let list = this.contents.map(item => {
 					if(!item.delivery_number.value){
@@ -223,7 +224,7 @@
 										m_spec_id: item.spec_id,
 										purchase_id: item.purchase_id,
 										out_number: Number(item.delivery_number.value),
-										warehouse_id: item.order_id || 0,
+										warehouse_id: item.warehouse_id || item.order_id || 0,
 										tax_price: item.tax_price || '', // TODO 添加物资页面未返回价格，默认空
 										non_tax_price: item.non_tax_price || '',
 										m_unit_id: item.m_unit_id || 0
@@ -236,7 +237,7 @@
 										m_spec_id: item.spec_id,
 										purchase_id: item.purchase_id,
 										out_number: Number(item.delivery_number.value),
-										warehouse_id: item.order_id || 0,
+										warehouse_id: item.warehouse_id || item.order_id || 0,
 										tax_price: item.tax_price || '', // TODO 添加物资页面未返回价格，默认空
 										non_tax_price: item.non_tax_price || '',
 										m_unit_id: item.m_unit_id || 0
@@ -252,7 +253,7 @@
 							m_spec_id: item.spec_id,
 							purchase_id: item.purchase_id,
 							out_number: Number(item.delivery_number.value) || 1,
-							warehouse_id: item.order_id || 0,
+							warehouse_id: item.warehouse_id || item.order_id || 0,
 							tax_price: item.tax_price || '', // TODO 添加物资页面未返回价格，默认空
 							non_tax_price: item.non_tax_price || '',
 							m_unit_id: item.m_unit_id || 0