From 321a8a61f3cbc8c0c507d7339e1d46f59ec535c2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 15:21:24 +0800
Subject: [PATCH] #

---
 pages/order/orderPakin.vue |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index bda94f7..e698924 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.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">
 			鍟嗗搧鍒楄〃
@@ -40,7 +51,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>
@@ -52,6 +63,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
+					<!-- <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 class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -86,10 +103,14 @@
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
 					</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 class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
@@ -150,6 +171,7 @@
 				matnr: '',
 				matnr1: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -158,7 +180,10 @@
 				barcodeFocus: true,
 				matFocus: false,
 				matData: '',
-				removeNum: 0
+				removeNum: 0,
+				ck1: true,
+				ck2: false,
+				isFull: true
 			}
 		},
 		onShow() {
@@ -276,6 +301,9 @@
 				this.content = '鏄惁鐜板湪鍏ュ簱!'
 				this.$refs.combConfirm.open()
 			},
+			isFrozen() {
+				this.isFull = !this.isFull
+			},
 			comb() {
 				uni.vibrateShort();
 				let that = this;
@@ -300,6 +328,7 @@
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						barcode: that.barcode,
+						isFull: that.isFull,
 						combMats: that.dataList
 					}),
 					method: 'POST',
@@ -351,6 +380,7 @@
 				this.matnr1 = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -375,6 +405,7 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
 				this.$refs.revise.close()
@@ -391,6 +422,13 @@
 				this.dataList = []
 				this.barcode = ''
 				this.barcodeFocuss()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
 			},
 		}
 	}
@@ -422,7 +460,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
+		height: 70rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}

--
Gitblit v1.9.1