From 937ecef075dd75f07f2bc2fc949c4f7e1c5fbe29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Mon, 29 Apr 2024 17:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=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 | 57 ++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/manifest.json b/manifest.json
index fc85078..40a3369 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "干巷仓库APP",
     "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "2.1.6",
-    "versionCode" : 216,
+    "versionName" : "2.1.7",
+    "versionCode" : 217,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index 7838f28..d1d5416 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -29,20 +29,28 @@
 				<!-- 选择物料号 -->
 				<u-input :value="'物料号:'+ material_id" color="#2979ff" fontSize="20px" readonly>
 					<template slot="suffix">
-						<u-button type="primary" size="mini" @click="show = true">选择物料号</u-button>
+						<u-button type="primary" size="mini" @click="showChouseMaterial = true">选择物料号</u-button>
 					</template>
 				</u-input>
-
-				<u-picker :show="show" :columns="columns" @cancel="pick_cancel" @confirm="pick_confirm"></u-picker>
+				<u-popup :customStyle="{padding:'20px'}" :show="showChouseMaterial" @close="chouseMaterialClose" mode="center" closeable>
+					<view>
+						<u-list width="300px" height="240px">
+							<u-list-item v-for="(item, index) in columns[0]" :key="index">
+								<u-cell :title="item" isLink :name="item" @click="chouseMaterial">
+								</u-cell>
+							</u-list-item>
+						</u-list>
+					</view>
+				</u-popup>
+				<!-- <u-picker :show="show" :columns="columns" @cancel="pick_cancel" @confirm="pick_confirm"></u-picker> -->
 				<!-- 查看出库计划 -->
-				<u-button type="primary" size="mini" @click="showPopup = true"
-					:disabled="!outInfo.shipmentNum">出库计划查看</u-button>
+				<u-button type="primary" @click="showPopup = true" :disabled="!outInfo.shipmentNum">出库计划查看</u-button>
 				<u-popup :customStyle="{padding:'10px'}" mode="center" round closeable safeAreaInsetTop
 					:show="showPopup" @close="popupClose" @open="popupOpen">
 					<view>
-						
 						<u-list width="300px" height="240px">
-							<u-empty mode="data" v-if="outOrderPlanList.length === 0 && !loading" text="出库计划未生成,请先生成出库计划" textSize="36"></u-empty>
+							<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">
@@ -52,7 +60,7 @@
 													:text="item.outOrder+' 计划批次号:\n'+item.packageCode"></u--text>
 											</u-col>
 											<u-col span="3">
-												<u-tag v-if="item.isError" text="计划异常" size="mini" type="error"></u-tag>
+												<u-tag v-if="item.isError" text="异常" size="mini" type="error"></u-tag>
 												<u-tag v-if="item.isOver" text="已完成" size="mini" type="success"></u-tag>
 												<u-tag v-if="!item.isOver" text="未完成" size="mini" type="info"></u-tag>
 											</u-col>
@@ -90,8 +98,8 @@
 			</view>
 		</view>
 		<!-- 功能切换 -->
-		<u-subsection :list="subsectionList" :current="subsectionCurrent" @change="subsectionChange"
-			fontSize="36"></u-subsection>
+		<!-- <u-subsection :list="subsectionList" :current="subsectionCurrent" @change="subsectionChange"
+			fontSize="36"></u-subsection> -->
 		<!-- 货物列表 -->
 		<view class="scroll-view-box" v-if="subsectionCurrent === 0">
 			<view class="scroll-view-title">出库清单</view>
@@ -104,7 +112,7 @@
 			</view>
 		</view>
 		<view class="scroll-view-box" v-if="subsectionCurrent === 1">
-			<view class="scroll-view-title">多箱出库清单</view>
+			<view class="scroll-view-title">出库清单</view>
 			<view>
 				<u-list height="260px">
 					<u-list-item v-for="(item, index) in newMaterialList" :key="index">
@@ -141,6 +149,7 @@
 			return {
 				loading: false,
 				showPopup: false,
+				showChouseMaterial: false,
 				// 双击判定
 				touchNum: 0,
 				clearData: {},
@@ -176,8 +185,8 @@
 				// 1-仓库扫码 2-货物扫码 3-出货单扫码
 				searchType: 3,
 				subsectionList: ['单箱出库', '多箱出库'],
-				subsectionCurrent: 0,
-				show: false,
+				subsectionCurrent: 1,
+
 				columns: [
 					['无物料号']
 				],
@@ -414,7 +423,7 @@
 									} else {
 										uni.showModal({
 											title: '提示',
-											content: '出库成功！已成功出库' + res.data.item2 + '箱',
+											content: '出库成功！已成功出库' + res.data.item1 + '箱',
 											showCancel: false,
 											confirmText: '确认'
 										});
@@ -423,6 +432,8 @@
 									}
 								}
 							});
+						}else{
+							this.loading = false;
 						}
 					}
 				});
@@ -459,19 +470,31 @@
 									});
 								}
 							});
+						}else{
+							this.loading = false;
 						}
 					}
 				});
 			},
+			//选择物料
+			// 开启
+			chouseMaterialOpen() {
+
+			},
+			chouseMaterialClose() {
+				this.showChouseMaterial = false;
+			},
+			chouseMaterial(item) {
+				this.material_id = item.name;
+				this.chouseMaterialClose();
+			},
 			//取消
 			pick_cancel() {
 				this.show = false;
 			},
 			// 确认
 			pick_confirm(e) {
-				console.log(e.value);
 				this.material_id = e.value[0];
-				console.log(this.material_id);
 				this.show = false;
 			},
 			// 长按弹出删除
@@ -531,7 +554,7 @@
 					if (res.code === 200) {
 						this.outOrderPlanList = res.data;
 						this.loading = false;
-					}else{
+					} else {
 						this.loading = false;
 					}
 				})