From 7a9f05a163b060232925604602447578b0428b27 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 23 Jan 2024 09:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coms/comReturnRequestPopup.vue            | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
index b5f64d18..344432cd 100644
--- a/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -28,7 +28,7 @@
 
 
 							<view class="title padding" style="display: flex;">
-								<text style=" flex-shrink: 0;">箱码：</text>
+								<text style=" flex-shrink: 0;">物料：</text>
 								<view class="" style="width: 100% ;">
 									{{itemCode}}
 								</view>
@@ -46,10 +46,13 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center"
 									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
 
 								</view>
 							</view>
@@ -63,7 +66,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -82,6 +85,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -90,6 +94,7 @@
 	export default {
 		components: {
 			uom,
+			stdPackQty,
 			balanceStatus,
 			comMessage,
 			winScanItem
@@ -120,6 +125,8 @@
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined,
 				list: [{
 						value: 1,
 						label: '车间1',
@@ -193,6 +200,21 @@
 			},
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				if (this.positionList.length == 0) {
 					getWorkShopLineStation().then(res => {
@@ -352,13 +374,14 @@
 				}
 			},
 
-			getScanCode(code) {
+			getScanCode(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
+				this.stdPackInfo = scanResult.package;
 			},
 
 		}