From 4fd9d9638b779cb88936cccc7efa5533861a6bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 26 Apr 2024 08:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=9B=B4=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                       |  4 ++--
 pages/outWarehouse/outWarehouse.vue | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 948e2f0..2fa3baf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "干巷仓库APP",
     "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "2.1.3",
-    "versionCode" : 213,
+    "versionName" : "2.1.4",
+    "versionCode" : 214,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index 16d73b3..7838f28 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -40,8 +40,10 @@
 				<u-popup :customStyle="{padding:'10px'}" mode="center" round closeable safeAreaInsetTop
 					:show="showPopup" @close="popupClose" @open="popupOpen">
 					<view>
+						
 						<u-list width="300px" height="240px">
-							<u-list-item v-for="(item, index) in outOrderPlanList" :key="index">
+							<u-empty mode="data" v-if="outOrderPlanList.length === 0 && !loading" text="出库计划未生成,请先生成出库计划" textSize="36"></u-empty>
+							<u-list-item v-else v-for="(item, index) in outOrderPlanList" :key="index">
 								<u-cell>
 									<view slot="title">
 										<u-row>
@@ -58,8 +60,10 @@
 									</view>
 									<view slot="label">
 										<u--text size="30" :text="'物料号:'+item.partnumber"></u--text>
+										<u--text size="30" :text="'仓库编号:'+item.warehouseCode"></u--text>
 										<u--text size="30" type="info" :text="'描述:'+item.description"></u--text>
-										<u--text size="30" type="primary" :text="'需求零件数:' + item.requireNum"></u--text>
+										<u--text size="30" type="primary"
+											:text="'计划需求零件数:' + item.requireNum"></u--text>
 										<u--text size="30" type="info"
 											:text="'库存现有箱数:' + item.packageNum + '  库存现有零件数:' + item.partnumberNum"></u--text>
 										<u--text size="30" type="warning"
@@ -514,6 +518,10 @@
 			},
 			// 获取计划
 			getPlan() {
+				this.loading = true;
+				setTimeout(() => {
+					this.loading = false;
+				}, 30000)
 				this.outOrderPlanList = [];
 				const data = {
 					shipment_num: this.outInfo.shipmentNum,
@@ -522,6 +530,9 @@
 				WarehoseApi.getOutOrderPlanAndOutProductionNum(data).then(res => {
 					if (res.code === 200) {
 						this.outOrderPlanList = res.data;
+						this.loading = false;
+					}else{
+						this.loading = false;
 					}
 				})
 			}