From cbd1976e6f93b6bc69bad75239042429a5b9944d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 10:48:45 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 456e187..8f4b308 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -15,6 +15,17 @@
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
+			<!-- <view class="item">
+				<view class="code-decs">婊℃墭:</view>
+				<radio-group @change="isFrozen">
+					<label>
+						<radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+					</label>
+					<label>
+						<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+					</label>
+				</radio-group>
+			</view> -->
 		</view>
 		<view class="mat-list-title">
 			鍟嗗搧鍒楄〃
@@ -34,7 +45,7 @@
 					</view>
 					<view class="list-left-item">
 						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
+						<view class="left-item" style="word-break: break-all;">{{item.maktx}}</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">瑙勬牸锛�</view>
@@ -46,12 +57,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
-					</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -82,14 +93,14 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</view>
 					</view>
-					<!-- <view class="popup-item">
+					<view class="popup-item">
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
-					</view> -->
-					<view class="popup-item">
+					</view>
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
 						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view>
+					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -156,6 +167,9 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				ck1: true,
+				ck2: false,
+				isFull: true
 			}
 		},
 		onLoad() {
@@ -166,6 +180,10 @@
 			this.token = uni.getStorageSync('token');
 		},
 		methods: {
+			isFrozen() {
+				this.isFull = !this.isFull
+				console.log(this.isFull);
+			},
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
@@ -175,7 +193,7 @@
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
-					if (len != 8) {
+					if (len >= 9 && len <=8) {
 						uni.showToast({
 							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
 							icon: "none",
@@ -206,11 +224,14 @@
 			},
 			// 鎼滅储鐗╂枡
 			findMat() {
-				let that = this
+				let that = this				
+				let m = that.matnr.split(";")	
+				let matnr1 = m[0].slice(3)
+				let batch1 = m[1].slice(3)
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
 					data: {
-						matnr: that.matnr
+						matnr: matnr1
 					},
 					header: {
 						'token': uni.getStorageSync('token')
@@ -221,12 +242,13 @@
 							that.matData = result.data
 							that.matnr = ''
 							that.matData['batch'] = ''
+							result.data['batch'] = batch1
 							uni.navigateTo({
 								url: "../mat/matSelected",
 								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
 								success: function(res) {
 									res.eventChannel.emit('mat', {
-										data: result.data
+										data: result.data,										
 									})
 								},
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
@@ -237,9 +259,9 @@
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -250,7 +272,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -391,7 +413,7 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
-						barcode: that.barcode,
+						barcode: that.barcode,						
 						combMats: that.dataList
 					}),
 					method: 'POST',
@@ -404,6 +426,9 @@
 							that.resst();
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
@@ -497,4 +522,7 @@
 		text-align: center;
 		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
 	}
+	.list:first-child {
+		margin-top: 350rpx;
+	}
 </style>

--
Gitblit v1.9.1