From 750f856006af98dffb7918ab80fdc689781ea017 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 一月 2024 16:20:32 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   83 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 15f6b9d..7516a21 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" @confirm="barcodeInput()" placeholder-style="line-height:  85rpx;">
+						:focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
@@ -32,13 +32,25 @@
 					</view>
 				</view>
 			</view>
-			
+			<view class="square-1">
+				<view class="square-title">
+					<view class="title-sign"><view class="sign"></view></view>
+					<view class="title-text"><text>鏄惁鍖呰</text></view>
+					<radio-group @change="isFrozen">
+						<label>
+							<radio :checked="ck1" style="margin-left: 100rpx;"/><text>鏄�</text>
+						</label>
+						<label>
+							<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+						</label>
+					</radio-group>
+				</view>
+			</view>
 			
 			<view class="square-1">
 				<view class="square-title">
 					<view class="title-sign"><view class="sign"></view></view>
 					<view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
-					<!-- <label v-show="matList.length != 0" style="float: right;margin-right: 20px;margin-top: 13px;"><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove()"></uni-icons></label> -->
 				</view>
 			</view>
 			
@@ -49,9 +61,6 @@
 			<checkbox-group @change="checkbox">
 				<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
 					<view class="data-list-left">
-						<!-- <view>
-							<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
-						</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.specs}}</text></view>
@@ -60,9 +69,6 @@
 							<text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
 							<text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
 						</view>
-						<!-- <view>
-							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
-						</view> -->
 					</view>
 					<view class="data-list-right">
 						<label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
@@ -75,12 +81,6 @@
 		
 		<!-- 搴曢儴鎸夐挳 -->
 		<view class="footer flex justify-around">
-			<!-- <label class="label-btn" style="width: 170rpx;">
-				<checkbox :checked="check" @click="allChecked()">{{checkText}}</checkbox>
-			</label>
-			<label class="label-btn" style="width: 100rpx;">
-				<text  @click="reChecked()">鍙嶉��</text>
-			</label> -->
 			
 			<label class="label-btn" style="width: 150rpx;">
 				<button class="cu-btn" @click="resst()">閲嶇疆</button>
@@ -147,6 +147,9 @@
 				checkedData:[],
 				batch:'',
 				memo: '',
+				ck1: true,
+				ck2: false,
+				frozen: 1,
 			}
 		},
 		onShow() {
@@ -165,6 +168,19 @@
 			this.getUrl()
 		},
 		methods: {
+			// 鍖呰
+			isFrozen() {
+				var temp = this.ck1
+				this.ck1 = this.ck2
+				this.ck2 = temp
+				this.frozen = this.ck1
+				if (this.frozen == true) {
+					this.frozen = 1
+				} else {
+					this.frozen = 0
+				}
+				console.log(this.frozen);
+			},
 			// 鑾峰彇url
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
@@ -175,7 +191,7 @@
 				setTimeout(()=>{
 					var len = this.barcode.length
 					if (len != 8) {
-						uni.showToast({title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top'});
+						uni.showToast({title: '鎵樼洏鐮�'+this.barcode+'鏈夎璇烽噸璇�', icon: "none", position: 'top'});
 						this.barcodeFocuss()
 						return;
 					}
@@ -247,6 +263,9 @@
 						return;
 					}
 				}
+				for (var j = 0; j < that.matList.length; j++) {
+					that.matList[j].beBatch = that.frozen
+				}
 				uni.showLoading();
 				uni.request({
 				    url: that.commonUrl + '/mobile/comb/auth',
@@ -305,7 +324,25 @@
 				that.matnr = ''
 			},
 			findMat() {
-				let that = this
+				let that = this 
+				let len = that.matnr.length 
+				let bat = ''
+				let re = /\s+/g
+				that.matnr = that.matnr.replace(/\s+/g,'')
+				if (len == 26 || len == 25 || len == 27 || len == 28) {
+					bat = that.matnr.substring(18,22)
+					that.matnr = that.matnr.substring(3,17)
+				}
+				for (var i = 0; i < that.matList.length; i++) {
+					if (that.matnr == that.matList[i].matnr) {
+						uni.showToast({title: that.matnr + "褰撳墠鐗╂枡鎻愬彇锛岃鍕块噸澶嶆壂鎻�!", icon: "none",position: 'top'})
+						setTimeout(()=>{
+							that.matnr = '';
+							that.focus = true;
+						}, 100);
+						return;
+					}
+				}
 				uni.request({
 				    url: that.commonUrl + '/mat/auth',
 				    data: {
@@ -320,7 +357,7 @@
 						if (res.code === 200 && res.data) {
 							that.matData = res.data
 							that.matnr = ''
-							that.matData['batch'] = ''
+							that.matData['batch'] = bat
 							uni.navigateTo({
 								url: "matQuery",
 								events: {
@@ -343,12 +380,15 @@
 								});
 							}, 1000);
 						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+							// setTimeout(()=>{
+							// 	that.matnr = '';
+							// 	that.focus = true;
+							// }, 100);
+							// uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
 						
 					}
 				});
-				
 			},
 		
 			// 娣诲姞鍟嗗搧
@@ -362,7 +402,8 @@
 				var today = date.getFullYear() + '/' + (date.getMonth()+1) + '/' + date.getDate()
 				for (var i = 0; i < len; i++) {
 					if (mat.matnr == this.matList[i].matnr) {
-						this.matList[i].anfme += mat.anfme 
+						uni.showToast({title: mat.matnr + "褰撳墠鐗╂枡鎻愬彇锛岃鍕块噸澶嶆壂鎻�!", icon: "none",position: 'top'})
+						// this.matList[i].anfme += mat.anfme 
 						this.$forceUpdate() // 寮哄埗鍒锋柊
 						add = false
 					}

--
Gitblit v1.9.1