From 37e98768ed15d73f92b06c979ab43fad48a85673 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 15 Jul 2024 17:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                |  5 +++
 pages/management/alloc-maintenance.vue |  8 ++---
 pages/management/in-storage.vue        |  2 ++
 pages/management/receive-confirm.vue   | 44 ++++++++++++++++++++++----
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index da0cfd2..2196518 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -551,6 +551,11 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	border: 1px solid #21D0F2;
 	border-radius: 12px
 }
+.pop_label {
+	font-size: 14px;
+	line-height: 14px;
+	color: #fff;
+}
 /** 日历 */
 .uni-calendar__header {
 	height: 40px !important;
diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue
index 3c6d3cc..143352b 100644
--- a/pages/management/alloc-maintenance.vue
+++ b/pages/management/alloc-maintenance.vue
@@ -6,10 +6,10 @@
 				<view class="zd-col-24 zd-row jcflexstart">
 					<view class="zd-col-7"><search-box v-model="val1" /></view>
 					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+						<zxz-uni-data-select placeholder="请选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
 					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
+						<zxz-uni-data-select placeholder="请选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
 				</view>
 				<button class="confirm-button" @tap="toSearch">查询</button>
@@ -22,8 +22,8 @@
 					<view class="zd-col-1 zd-th"><text>序号</text></view>
 					<view class="zd-col-2 zd-th"><text class="fontcol1">单据编号</text></view>
 					<view class="zd-col-2 zd-th"><text>业务日期</text></view>
-					<view class="zd-col-2 zd-th"><text>调入组织</text></view>
 					<view class="zd-col-2 zd-th"><text>调出组织</text></view>
+					<view class="zd-col-2 zd-th"><text>调入组织</text></view>
 					<view class="zd-col-2 zd-th"><text>调入仓库</text></view>
 					<view class="zd-col-2 zd-th"><text>调出仓库</text></view>
 					<view class="zd-col-2 zd-th"><text>状态</text></view>
@@ -36,8 +36,8 @@
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
 						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.drckmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.dcckmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index f8c88c9..4c38935 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -68,6 +68,7 @@
 										<th>单位</th>
 										<th>库位</th>
 										<th>数量</th>
+										<th>总数</th>
 										<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
 										<th>剩余数量</th>
 										<th>库存</th>
@@ -91,6 +92,7 @@
 										<td>{{el.jldw}}</td>
 										<td>{{el.kwbm}}</td>
 										<td>{{el.sl}}</td>
+										<td>{{el.wlzs}}</td>
 										<td>{{el.czsl}}</td>
 										<td>{{el.sysl}}</td>
 										<td>{{el.kcsl}}</td>
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index 1e02b24..2ea456e 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -52,6 +52,7 @@
 									<view class="zd-col-7"><search-box v-model="val2" :scanShow="false" /></view>
 								</view>
 								<button class="confirm-button" @tap="toSearch2">查询</button>
+								<button v-if="pkObj.djzt !== '审核后'" class="confirm-button" @tap="checkWarehouse(2, '批量设置收货仓库/库位')">一键设置</button>
 								<button v-if="pkObj.djzt !== '审核后'" class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
 							</view>
 						</view>
@@ -70,9 +71,11 @@
 										<th>物料名称</th>
 										<th>单位</th>
 										<th>订单量</th>
+										<th>总数</th>
 										<th>本次送货数量</th>
 										<th>收货组织</th>
 										<th>件数</th>
+										<th>是否质检</th>
 										<th>收货数量</th>
 										<th>收货仓库编码</th>
 										<th>收货仓库名称</th>
@@ -93,11 +96,13 @@
 										<td>{{el.wlmc}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
+										<td>{{el.wlzs}}</td>
 										<td>{{el.bcshsl}}</td>
 										<td>{{el.zzmc}}</td>
 										<td>{{el.num}}</td>
+										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
 										<td><input class="td_input" type="number" v-model="el.shsl"  @blur="_receiptBillUpdate(el)" /></td>
-										<td @tap.stop="checkWarehouse(1, '收货仓库', el)">
+										<td @tap.stop="checkWarehouse(1, '修改收货仓库', el)">
 											<view class="zd-row td_change">
 												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
 												<view class="mgl10">{{el.ckbm}}</view>
@@ -120,9 +125,11 @@
 										<td>{{el.wlmc}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
+										<td>{{el.wlzs}}</td>
 										<td>{{el.bcshsl}}</td>
 										<td>{{el.zzmc}}</td>
 										<td>{{el.num}}</td>
+										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
 										<td>{{el.shsl}}</td>
 										<td>{{el.ckbm}}</td>
 										<td>{{el.ckmc}}</td>
@@ -143,12 +150,26 @@
 		<view class="footer"></view>
 		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
 		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view class="allwidth pop-title">修改{{modalObj.title}}</view>
-			<view class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-12 select_wraper">
+			<view class="allwidth pop-title">{{modalObj.title}}</view>
+			<view v-if="modalObj.type === 1" class="zd-row jcenter kwcode_wraper">
+				<view class="zd-col-10 select_wraper">
 					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
 				</view>
 			</view>
+			<view v-if="modalObj.type === 2" class="kwcode_wraper">
+				<view class="zd-row jcenter">
+					<view class="zd-col-3 pop_label">收货仓库</view>
+					<view class="zd-col-10 select_wraper">
+						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row jcenter mgt20">
+					<view class="zd-col-3 pop_label">收货库位</view>
+					<view class="zd-col-10 select_wraper">
+						<scan-input v-model="val3" />
+					</view>
+				</view>
+			</view>
 			<view class="mgb20 zd-row jcenter">
 				<view class="zd-col-10 zd-row">
 					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
@@ -205,7 +226,8 @@
 				disabled: false,
 				value1: '',
 				range1: [],
-				val2: ''
+				val2: '',
+				val3: ''
 			};
 		},
 		onLoad () {
@@ -353,9 +375,12 @@
 			},
 			// 修改调出仓库弹窗
 			checkWarehouse (type, title, e) {
-				this.modalObj = {type: type, title: title, id: e.flid}
+				
 				if (type === 1) {
+					this.modalObj = {type: type, title: title, id: e.flid}
 					this.value = e.ckbm
+				} else if (type === 2) {
+					this.modalObj = {type: type, title: title}
 				}
 				this.show = true
 			},
@@ -376,6 +401,13 @@
 							obj = e
 						}
 					})
+				} else if (this.modalObj.type === 2) {
+					this.dataList2.map(e => {
+						e.ckbm = this.value
+						e.ckmc = mc
+						e.kwmc = this.val3
+						obj = e
+					})
 				}
 				this.show = false
 				this._receiptBillUpdate(obj)