From d1679d8cbc06e71210e7f35624a1bcafbf482748 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 24 Jul 2024 13:24:41 +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

---
 pages/management/in-storage.vue      | 25 +++++++++++++++++--------
 pages/management/receive-confirm.vue | 26 +++++++++++++++++---------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index d001ca7..d7d8cfe 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -113,7 +113,7 @@
 								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
 							</view>
 							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
-							<button v-if="crType === 'IN'" class="confirm-button" @tap="onekeyUpdate">一键设置</button>
+							<button v-if="crType === 'IN'" :class="{'confirm-button_disabled': checkArr2.length === 0}" class="confirm-button" @tap="onekeyUpdate">一键设置</button>
 							<view class="zd-col-10">
 								<!-- <view class="zd-col-12 zd-row jcflexend">
 									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
@@ -572,9 +572,11 @@
 			},
 			// 一键设置
 			onekeyUpdate () {
-				this.type = '3'
-				this.val3 = ''
-				this.show = true
+				if (this.checkArr2.length > 0) {
+					this.type = '3'
+					this.val3 = ''
+					this.show = true
+				}
 			},
 			async _updateBillDetail (e) {
 				try {
@@ -584,6 +586,11 @@
 							title: res.desc,
 							icon: 'none'
 						})
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
 					}
 					this.disabled2 = false
 				} catch (e) {
@@ -604,10 +611,12 @@
 				}
 				let arr = []
 				this.dataList2.map(e => {
-					e.kwbm = this.val3
-					let {djid, flid, kwbm} = {...e}
-					let obj = {djid, flid, kwbm}
-					arr.push(obj)
+					if (e.checked) {
+						e.kwbm = this.val3
+						let {djid, flid, kwbm} = {...e}
+						let obj = {djid, flid, kwbm}
+						arr.push(obj)
+					}
 				})
 				this.show = false
 				this._updateBillDetail(arr)
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index 3bd55e0..e2db218 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -52,7 +52,7 @@
 									<view class="zd-col-9"><search-box v-model="val2" :scanShow="false" placeholder="请输入物料信息" /></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}" @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>
@@ -368,6 +368,11 @@
 							title: res.desc,
 							icon: 'none'
 						})
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
 					}
 				} catch (e) {
 					console.log(e)
@@ -386,10 +391,11 @@
 				if (type === 1) {
 					this.modalObj = {type: type, title: title, id: e.flid}
 					this.value = e.ckbm
-				} else if (type === 2) {
+					this.show = true
+				} else if (type === 2 && this.checkArr.length > 0) {
 					this.modalObj = {type: type, title: title}
+					this.show = true
 				}
-				this.show = true
 			},
 			// 修改调出仓库确定
 			modalConfirm () {
@@ -426,12 +432,14 @@
 					})
 				} else if (this.modalObj.type === 2) {
 					this.dataList2.map(e => {
-						e.ckbm = this.value
-						e.ckmc = mc
-						e.kwmc = this.val3
-						let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
-						let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
-						arr.push(obj)
+						if (e.checked) {
+							e.ckbm = this.value
+							e.ckmc = mc
+							e.kwmc = this.val3
+							let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
+							let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
+							arr.push(obj)
+						}
 					})
 				}
 				this.show = false