From ea6f1a49ced187c4cb671fa1581a6528281dd3a8 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 22 Jan 2024 15:20:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/coms/comIssueRequestPopup.vue     | 26 ++++++--------
 .../coms/comRepleinshRequestPopup.vue         | 35 ++++++++++++++++---
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index 4f9c3693..ef52b381 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -43,20 +43,13 @@
 								<view class="uni-flex uni-row uni-center"
 									style="display: flex; align-items: center;margin-left: 20rpx;justify-content: center;">
 									
-									<input style="text-align: center;" class="qty_input" v-model="counQty" :focus="true" type="number"
-										@confirm="confirm()"  @input="checkNum" :maxlength="maxlength" />
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
 									
-									<!-- <uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box> -->
-
-									<view class="std_pack" v-if="itemCode!='请扫描物料信息'">
-										<text>
-											/{{stdQty}}
-											<!-- {{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.uom)}} -->
-										</text>
-									</view>
 									<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>
 							<u-line />
@@ -88,6 +81,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'
@@ -98,7 +92,8 @@
 			uom,
 			balanceStatus,
 			comMessage,
-			winScanItem
+			winScanItem,
+			stdPackQty
 		},
 		data() {
 			return {
@@ -127,7 +122,8 @@
 				isModifiedPosition: true,
 				positionList: [],
 				stdQty: 0, //标包
-				maxlength:10
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -318,7 +314,7 @@
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
-				this.stdQty = scanResult.package.stdPackQty;
+				this.stdPackInfo = scanResult.package;
 			}
 		}
 	}
diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index aa1ca50d..2585a16f 100644
--- a/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -44,10 +44,14 @@
 								<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>
 							<u-line />
@@ -60,7 +64,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 
 		<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
@@ -89,14 +93,17 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 
 	export default {
 		components: {
 			uom,
+			stdPackQty,
 			balanceStatus,
 			comMessage,
 			winScanItem,
 			winScanLocation
+			
 		},
 		data() {
 			return {
@@ -117,6 +124,8 @@
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -133,6 +142,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) {
 				// this.editPosition = editPosition;
 				// if (this.isModifiedPosition) {
@@ -237,13 +261,14 @@
 				this.closeRequestPopup();
 			},
 
-			getScanCode(code) {
+			getScanCode(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
+				this.stdPackInfo = scanResult.package;
 			},
 
 			getLocationCode(location, code) {