From f3fd6931f2f1c68b9f51a51de2eeb32f07135a53 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 三月 2025 16:50:54 +0800
Subject: [PATCH] #出入库修改

---
 pages/basics/pakin.vue |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9dd2588..efb9c67 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -9,7 +9,7 @@
 				<view class="square-content">
 					<view class="content-input">
 						<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" 
-						:focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height:  85rpx;">
+						:focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
@@ -29,6 +29,19 @@
 					</view>
 					<view class="content-btn">
 						<button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
+					</view>
+				</view>
+			</view>
+			<view class="square-2">
+				<view class="square-title">
+					<view class="title-sign"><view class="sign"></view></view>
+					<view class="title-text"><text>搴撲綅鐮�</text></view>
+				</view>
+				<view class="square-content">
+					<view class="content-input">
+						<input v-model="locNo" type="text" placeholder="鎵爜 / 杈撳叆" 
+						  placeholder-style="line-height:  85rpx;">
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeLocNo()"></uni-icons>
 					</view>
 				</view>
 			</view>
@@ -54,7 +67,7 @@
 						</view> -->
 						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
 						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
-						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+						<view><text style="width: 400rpx;">鍚堝悓鍙凤細{{item.batch}}</text></view>
 						<view>
 							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
 						</view>
@@ -87,15 +100,20 @@
 		
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
-		<uni-popup ref="revise" background-color="#fff" @change="change">
-			<view class="revise-box">
+		<uni-popup ref="revise" background-color="#fff">
+			<view class="revise-box ">
 				<view class="revise-box-top">
 					<view class="color-block-blue"></view>
-					<text class="title">淇敼鏁伴噺</text>
+					<text class="title">淇敼鎵瑰彿/鏁伴噺</text>
+				</view>
+				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+					<text style="display: inline-block;float: left;width: 60px;">鍚堝悓鍙凤細</text>
+					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
 				</view>
 				<view class="changeBox">
 					<view class="num-box">
-						<uni-number-box :value="count" :max="9999" color="#747474"  @change="changeValue"/>
+						<text style="display: inline-block;float: left;width: 60px;">鏁伴噺锛�</text>
+						<uni-number-box :value="count" :max="99999999" color="#747474"  @change="changeValue"/>
 					</view> 
 				</view>
 				<view class="revise-box-buttom">
@@ -131,6 +149,8 @@
 				check:false,
 				checkText:'鍏ㄩ��',
 				checkedData:[],
+				batch:'',
+				locNo:''
 			}
 		},
 		onShow() {
@@ -163,10 +183,8 @@
 						this.barcodeFocuss()
 						return;
 					}
-					if (len == 8) {
-						this.focuss()
-					}
-				},100)
+					this.focuss()
+				},200)
 			},
 			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
@@ -191,6 +209,7 @@
 			resst() {
 				this.matList = []
 				this.barcode = ''
+				this.locNo = ''
 				this.barcodeFocuss()
 				uni.vibrateShort();
 			},
@@ -201,6 +220,10 @@
 				this.$nextTick(function() {
 					this.barcodeFocus = true;
 				});
+			},
+			removeLocNo() {
+				this.locNo = ''
+				uni.vibrateShort();				
 			},
 			removeMatnr() {
 				this.matnr = ''
@@ -222,6 +245,10 @@
 					uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "none", position: 'top'});
 					return;
 				}
+				if (that.locNo === '') {
+					uni.showToast({title: '璇疯緭鍏ュ簱浣嶇爜', icon: "none", position: 'top'});
+					return;
+				}
 				if (that.matList.length === 0) {
 					uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
 					return;
@@ -237,6 +264,7 @@
 				    url: that.commonUrl + '/mobile/comb/auth',
 				    data: JSON.stringify({
 						barcode: that.barcode,
+						locno: that.locNo,
 						combMats: that.matList
 					}),
 					method: 'POST',
@@ -280,7 +308,7 @@
 					},
 					success: function(res) {
 					    // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-					    res.eventChannel.emit('acceptDataFromOpenerPage', {commonUrl:that.commonUrl })
+					    res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
 					},
 					
 				});
@@ -400,8 +428,8 @@
 				this.count = value
 			},
 			confirm() {
-				console.log(this.count)
 				this.matList[this.rowNum].anfme = this.count
+				this.matList[this.rowNum].batch = this.batch
 				this.$refs.revise.close()
 				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},
@@ -456,8 +484,9 @@
 	/* @import "../../colorui/main.css";
 	@import "../../colorui/icon.css"; */
 	.revise-box {
-		width: 400rpx;
-		height: 300rpx;
+		position: relative;
+		width: 500rpx;
+		height: 400rpx;
 		border-radius: 25px;
 	}
 	.revise-box-top {
@@ -473,7 +502,7 @@
 		margin-left: 100rpx;
 	}
 	.revise-box-buttom{
-		margin-left: 130rpx;
+		margin-left: 190rpx;
 	}
 	.pak-seach-box {
 		background-color: #FFFFFF;

--
Gitblit v1.9.1