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 |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index f3ac0d3..8f4b308 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -15,7 +15,7 @@
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
-			<view class="item">
+			<!-- <view class="item">
 				<view class="code-decs">婊℃墭:</view>
 				<radio-group @change="isFrozen">
 					<label>
@@ -25,7 +25,7 @@
 						<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
 					</label>
 				</radio-group>
-			</view>
+			</view> -->
 		</view>
 		<view class="mat-list-title">
 			鍟嗗搧鍒楄〃
@@ -45,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>
@@ -193,7 +193,7 @@
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
-					if (len != 8) {
+					if (len >= 9 && len <=8) {
 						uni.showToast({
 							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
 							icon: "none",
@@ -224,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')
@@ -239,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,										
 									})
 								},
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
@@ -409,8 +413,7 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
-						barcode: that.barcode,
-						isFull: that.isFull,
+						barcode: that.barcode,						
 						combMats: that.dataList
 					}),
 					method: 'POST',
@@ -481,7 +484,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 70rpx;
+		height: 100rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
@@ -517,6 +520,9 @@
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
-		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+	}
+	.list:first-child {
+		margin-top: 350rpx;
 	}
 </style>

--
Gitblit v1.9.1