From 48ce80144f3c7f7f85fd6f76f455d5dddf032f73 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 13 三月 2024 16:19:58 +0800
Subject: [PATCH] #

---
 pages/mat/matSelected.vue |    9 +++++++++
 pages/pakin/pakin.vue     |   18 ++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index cfafb1e..7676ea6 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -26,6 +26,14 @@
 				</view>
 			</view>
 			<view class="form-item">
+				<view class="form-item-desc"><text>绫虫暟</text></view>
+				<view class="form-item-content">
+					<view class="form-input">
+						<input type="text" v-model="mat.meter">
+					</view>
+				</view>
+			</view>
+			<view class="form-item">
 				<view class="form-item-desc"><text>鏁伴噺</text></view>
 				<view class="form-item-content">
 					<uni-number-box :value="mat.anfme" :max="99999999" :step='1' color="#747474" @change="changeValue" />
@@ -49,6 +57,7 @@
 					specs: null,
 					batch: null,
 					anfme: 0,
+					meter: null
 				},
 				baseIP:'',
 				basePORT:'',
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index e83a852..a2361a8 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -50,6 +50,10 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
+					<view class="list-left-item">
+						<view class="desc">绫虫暟锛�</view>
+						<view class="left-item">{{item.meter ? item.meter : '--'}}</view>
+					</view>
 					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
@@ -90,10 +94,10 @@
 						<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"><input type="text" v-model="meter"></view>
+					</view>
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -160,6 +164,7 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				meter: ''
 			}
 		},
 		onLoad() {
@@ -323,6 +328,7 @@
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
 				this.weight = this.dataList[i].weight
+				this.meter = this.dataList[i].meter
 				this.rowNum = i
 				this.eject()
 			},
@@ -352,6 +358,7 @@
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
 				this.dataList[this.rowNum].weight = this.weight
+				this.dataList[this.rowNum].meter = this.meter
 				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
@@ -392,6 +399,9 @@
 						return;
 					}
 				}
+				for (let k of that.dataList) {
+					k.batch = k.batch + '_' + k.meter
+				}
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({

--
Gitblit v1.9.1