From db8be367bf35c24a95d4711c48786a610c930141 Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Thu, 20 Apr 2023 13:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=20=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=20=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/mycomponents/common/comMessage.vue   |  1 +
 fe/PDA/mycomponents/common/comNumberBox.vue |  3 +++
 fe/PDA/pages/index/index.vue                |  2 +-
 fe/PDA/pages/task/issue_detail.vue          | 27 +++++++++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/fe/PDA/mycomponents/common/comMessage.vue b/fe/PDA/mycomponents/common/comMessage.vue
index 4400afb69..e83f5cb27 100644
--- a/fe/PDA/mycomponents/common/comMessage.vue
+++ b/fe/PDA/mycomponents/common/comMessage.vue
@@ -103,6 +103,7 @@
 			},
 
 			closeMessage() {
+				this.confirmResult = false;
 				clearInterval(this.timer) //清空timer
 				this.$refs['popupMessage'].close();
 				this.afterClose();
diff --git a/fe/PDA/mycomponents/common/comNumberBox.vue b/fe/PDA/mycomponents/common/comNumberBox.vue
index 519427fc4..10e729e60 100644
--- a/fe/PDA/mycomponents/common/comNumberBox.vue
+++ b/fe/PDA/mycomponents/common/comNumberBox.vue
@@ -138,6 +138,9 @@
 			},
 			_onFocus(event) {
 				this.$emit('focus', event)
+			},
+			setValue(value){
+				this.inputValue =value;
 			}
 		}
 	};
diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue
index 4a5ddd3bb..51a8cadf1 100644
--- a/fe/PDA/pages/index/index.vue
+++ b/fe/PDA/pages/index/index.vue
@@ -299,7 +299,7 @@
 				that.timer = setInterval(async function() {
 					await that.refreshJobMenu(that.userMenus);
 					console.log('刷新菜单');
-				}, 3000)
+				}, 60000)
 			},
 
 			// test() {
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index 9bf1905a7..ee69fd32f 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -35,9 +35,13 @@
 											<text class="text_black">{{item.recommendQty}}({{item.uom}})</text>
 										</uni-th>
 										<uni-th width="120" align="center">
-											<view v-if="item.scaned">
+											<view v-if="item.scaned" style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
+												
+												<com-number-box  :ref="'comNumberBox_'+index" v-model="item.handledQty" :max="99999" :min="0"
+													style='width: 100px;' @change="qtyChanged($event,item,index)">
+												</com-number-box>
 												<text
-													class="text_black">{{item.handledQty}}({{item.uom}})</text>
+													class="text_black" >({{item.uom}})</text>
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -118,6 +122,7 @@
 	import comBalance from '@/mycomponents/common/comBalance.vue'
 	import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue'
 	import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+	import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
 
 	export default {
 		components: {
@@ -126,7 +131,8 @@
 			winMulitScan,
 			comBalance,
 			comJobScanDetail,
-			winScanByPack
+			winScanByPack,
+			comNumberBox
 		},
 		data() {
 			return {
@@ -413,9 +419,9 @@
 				item.handledPackingCode = balanceItem.packingCode;
 				item.handledBatch = balanceItem.batch;
 				item.handledLot = balanceItem.lot;
-
+				
+				item.defaultHandleQty =balanceItem.qty;
 				item.handledQty = balanceItem.qty;
-
 				item.handledFromLocationCode = balanceItem.locationCode;
 				item.handledFromLocationArea = balanceItem.locationArea;
 				item.handledFromLocationGroup = balanceItem.locationErpCode;
@@ -628,6 +634,17 @@
 				// console.log(e)
 				this.old.scrollTop = e.detail.scrollTop;
 			},
+			qtyChanged(value, item,index) {
+				if (value <= 0) {
+					this.showMessage('发料数量不能小于或等于0')
+					item.handledQty =item.defaultHandleQty
+					this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
+				}else if(value>item.defaultHandleQty){
+					item.handledQty = item.defaultHandleQty
+					this.showMessage('发料数量不能大于库存数量:'+item.handledQty)
+				    this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
+				}
+			},
 		}
 	}
 </script>