From 81ab26d52d427f50fad3e2374fbf0c531638bcd1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 8 Nov 2024 10:11:14 +0800
Subject: [PATCH] =?UTF-8?q?YT-668=E5=AF=84=E5=94=AE=E5=BA=93=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=91=E8=B4=A7=E3=80=81=E5=AE=A2=E6=88=B7=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E9=80=80=E8=B4=A7=EF=BC=8C=E5=8F=AA=E6=9C=89=E8=BF=99?=
 =?UTF-8?q?=E4=BF=A9=E4=B8=AA=E7=9B=B4=E6=8E=A5=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E5=B7=A6=E6=BB=91=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=20=20=E7=9B=B4=E6=8E=A5=E5=90=88=E6=A0=BC=E8=BD=AC?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/record/recordComDetailCard.vue     |  9 ++++++---
 src/pages/customerReturn/record/returnRecord.vue    |  9 ++++++++-
 src/pages/deliver/record/deliverRecord.vue          | 12 +++++++-----
 src/pages/inventoryMove/coms/comMoveRecord.vue      |  6 +++---
 src/pages/inventoryMove/coms/okToHoldRecordPack.vue |  5 ++++-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index c712871e..bd6736cf 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -4,7 +4,7 @@
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
 					<uni-swipe-action>
-						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
+						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="scanOptions">
 							<item-qty :dataContent="dataContent" :isShowBalance="true"
 								:isShowBalanceQty="isShowBalanceQty"
 								:isShowRecommendQty="false"
@@ -109,14 +109,17 @@
 				type: Boolean,
 				default: true
 			},
-			
+			isShowHandleQty: {
+				type: Boolean,
+				default: true
+			},
 			isShowModifedLocation: {
 				type: Boolean,
 				default: false
 			},
 			allowModifyQty: {
 				type: Boolean,
-				default: false
+				default: true
 			},
 			allowModifyLocation: {
 				type: Boolean,
diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue
index 3c321a2c..19eec7c8 100644
--- a/src/pages/customerReturn/record/returnRecord.vue
+++ b/src/pages/customerReturn/record/returnRecord.vue
@@ -211,6 +211,7 @@
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
 					newDetail.packingNumber =pack.number
+					newDetail.handleQty =result.label.qty
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -314,7 +315,13 @@
 						if (res.success) {
 							this.managementList = res.list;
 							var params = this.setParams()
-							console.log("提交" + JSON.stringify(params))
+							console.log("提交" ,params)
+							let obj = params.subList.find(item=>item.balanceQty < item.handleQty)
+							if(obj){
+								this.$refs.comMessage.showConfirmWarningModal('批次[' +obj.batch + ']数量[' + obj.handleQty + ']不允许大于库存数量[' +obj.balanceQty + ']')
+								uni.hideLoading()
+								return
+							}
 							customerReturnRecordSubmit(params).then(res => {
 								uni.hideLoading()
 								if (res.data) {
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index 0b10be85..1cf8f54e 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -175,10 +175,6 @@
 				} else {
 					this.setData(result)
 				}
-				
-				
-				
-
 			},
 			
 			setData(result){
@@ -343,7 +339,13 @@
 						if (res.success) {
 							this.managementList = res.list;
 							var params = this.setParams()
-							console.log("提交" + JSON.stringify(params))
+							console.log("提交",params)
+							let obj = params.subList.find(item=>item.balanceQty < item.handleQty)
+							if(obj){
+								this.$refs.comMessage.showConfirmWarningModal('批次[' +obj.batch + ']数量[' + obj.handleQty + ']不允许大于库存数量[' +obj.balanceQty + ']')
+								uni.hideLoading()
+								return
+							}
 								deliverRecordSubmit(params).then(res => {
 									uni.hideLoading()
 									if (res.data) {
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index e256104c..1599bdca 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -160,7 +160,7 @@
 					this.businessType = res.businessType;
 					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
 					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					
+					this.showFromLocationPopup()
 				} else {
 					this.showErrorMessage(res.message)
 				}
@@ -245,13 +245,13 @@
 				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
 			},
 			showFromLocationPopup() {
-				this.$nextTick(() => {
+				setTimeout(()=>{
 					if(this.showOnePop){
 						this.$refs.okToHoldRecordPackRef.showOne = true
 					}else{
 						this.$refs.scanFromLocationCode.openScanPopup();
 					}
-				})
+				},200)
 			},
 			getFromLocation(location) {
 				this.fromLocationCode = location.code;
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
index 2142f178..fae7571e 100644
--- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -9,7 +9,10 @@
 			</view>
 			<view class="item">
 				<view class="label">来源库位：</view>
-				<view class="value"><u-input v-model="fromLocationCode"  @confirm="fromLocationScanMsg" clearable></u-input></view>
+				<view class="value">
+					<u-input v-model="fromLocationCode"  @confirm="fromLocationScanMsg"></u-input>
+					<u-icon name="photo" color="#2979ff" size="28"></u-icon>
+				</view>
 				<view class="searchIcon">
 					<image src="/static/search.svg" mode=""  @click="fromLocationClick"/>
 				</view>