From fe267477f1def3fdde7f95dd022d9ae990f6ca93 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 25 Jan 2024 10:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9itemQy=20=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/item/itemQty.vue                        |  4 ++--
 mycomponents/record/recordComDetailCard.vue          |  4 ++--
 pages/container/coms/comPalletRecord.vue             |  2 +-
 pages/count/coms/comCountDetailCard.vue              |  4 ++--
 pages/customerReturn/coms/comReturnRecord.vue        |  2 +-
 .../request/customerReturnRequestCreate.vue          |  7 ++++---
 pages/inventoryMove/coms/comMoveRecordCard.vue       |  2 +-
 pages/productionReturn/coms/comReturnRecord.vue      |  2 +-
 .../productionReturn/coms/comReturnRequestPopup.vue  | 12 ++++++++++--
 pages/unPlanned/coms/comReceiptRecord.vue            |  2 +-
 10 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index 4a6904fa..ed980091 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -6,7 +6,7 @@
 		<view>
 
 			<!-- showBalanceQty -->
-			<balanceQty v-if="showItemQty" :dataContent="dataContent"></balanceQty>
+			<balanceQty v-if="isShowBalanceQty" :dataContent="dataContent"></balanceQty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack">
 			</compare-qty>
@@ -45,7 +45,7 @@
 				type: Number,
 				default: 0
 			},
-			showItemQty: {
+			isShowBalanceQty: {
 				type: Boolean,
 				default: true
 			},
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 9631545a..62883887 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -6,7 +6,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
 							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-								:isShowBalance="true" :showBalanceQty="isShowItemQty"></item-qty>
+								:isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
@@ -86,7 +86,7 @@
 				default: true
 			},
 
-			isShowItemQty: {
+			isShowBalanceQty: {
 				type: Boolean,
 				default: false
 			},
diff --git a/pages/container/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue
index f41af4d6..ad07a2b9 100644
--- a/pages/container/coms/comPalletRecord.vue
+++ b/pages/container/coms/comPalletRecord.vue
@@ -5,7 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							<item-qty :dataContent="dataContent" 
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
diff --git a/pages/count/coms/comCountDetailCard.vue b/pages/count/coms/comCountDetailCard.vue
index 5ce487ef..b3c070a8 100644
--- a/pages/count/coms/comCountDetailCard.vue
+++ b/pages/count/coms/comCountDetailCard.vue
@@ -6,10 +6,10 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
 							<item-qty v-if="settingParam.isOpenCount=='TRUE'" :dataContent="dataContent"
-								:handleQty="dataContent.handleQty" :showBalanceQty="true">
+								:handleQty="dataContent.handleQty" :isShowBalanceQty="true">
 							</item-qty>
 							<item-qty v-else :dataContent="dataContent" :handleQty="dataContent.handleQty"
-								:showBalanceQty="false" :showRecommendQty="false" :showStdPack="true">
+								:isShowBalanceQty="false" :showRecommendQty="false" :showStdPack="true">
 							</item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
diff --git a/pages/customerReturn/coms/comReturnRecord.vue b/pages/customerReturn/coms/comReturnRecord.vue
index fbbb3f30..c834449b 100644
--- a/pages/customerReturn/coms/comReturnRecord.vue
+++ b/pages/customerReturn/coms/comReturnRecord.vue
@@ -5,7 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							<item-qty :dataContent="dataContent" 
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
index 01f1c890..656f5e88 100644
--- a/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -4,10 +4,10 @@
 			<com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class="uni-flex uni-row padding title u-col-center" @click="showSelect">
-				<text>客户 : </text>
+			<view class="uni-flex uni-row padding title u-col-center" @click="showSelect" style="font-size: 35rpx;">
+				<text style="font-size: 32rpx;">客户 : </text>
 				<view class="uni-flex u-col-center uni-row" @click="showSelect">
-					<view class="" style="margin-left: 20rpx;">
+					<view class="" style="margin-left: 20rpx;font-size: 32rpx;">
 						{{customerName}}
 					</view>
 					<u-select v-model="showCustomer" mode="single-column" :list="customerList" @confirm="confirmSelect">
@@ -22,6 +22,7 @@
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								:isShowBalanceQty ="false"
 								:isShowToLocation="false" @removeItem="removeItem(index,item)" @updateData="updateData"
 								@removePack="removePack">
 							</record-com-detail-card>
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
index 7410aa18..38339e15 100644
--- a/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -6,7 +6,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
 							<item-qty :dataContent="dataContent" 
-								:showBalanceQty="false"
+								:isShowBalanceQty="false"
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
diff --git a/pages/productionReturn/coms/comReturnRecord.vue b/pages/productionReturn/coms/comReturnRecord.vue
index 093d9a17..0f1dadb5 100644
--- a/pages/productionReturn/coms/comReturnRecord.vue
+++ b/pages/productionReturn/coms/comReturnRecord.vue
@@ -5,7 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :showBalanceQty="false" :isShowBalance="true"></item-qty>
+							<item-qty :dataContent="dataContent" :isShowBalanceQty="false" :isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
index 344432cd..8035a832 100644
--- a/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -117,7 +117,7 @@
 				requestInfo: null,
 				itemCodeList: [],
 				isCheckItemCode: false,
-				counQty: 0,
+				counQty: undefined,
 				editPosition: true,
 				numberFocus: false,
 				uom: "",
@@ -230,7 +230,9 @@
 				} else {
 					this.itemCode = "";
 					this.uom = ""
-					this.qty = 0
+					this.qty = 0;
+					this.counQty = undefined
+					this.numberFocus = false
 					this.itemCodeGetFocus();
 				}
 
@@ -263,6 +265,12 @@
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
+				
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
 				if (this.qty == 0) {
 					this.showErrorMessage("数量必须大于0")
 					return
diff --git a/pages/unPlanned/coms/comReceiptRecord.vue b/pages/unPlanned/coms/comReceiptRecord.vue
index e5c1e852..f1566dd7 100644
--- a/pages/unPlanned/coms/comReceiptRecord.vue
+++ b/pages/unPlanned/coms/comReceiptRecord.vue
@@ -5,7 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :showBalanceQty="false"
+							<item-qty :dataContent="dataContent" :isShowBalanceQty="false"
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>