From d0ff76238e4382bacbf046f39f4e8372cf6aed31 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 13 Nov 2025 16:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/NumberInput.vue      |   4 +
 pages/common/mater-list.vue     |   1 +
 pages/zw/ltzp.vue               | 191 ++++++++++++++++++++++++++++++--
 pages/zw/manual-callmater.vue   |   7 +-
 pages/zw/manual-returnmater.vue |   9 +-
 pages/zw/materbox-instore.vue   |   1 +
 pages/zw/wl-groupplate.vue      |   9 +-
 7 files changed, 205 insertions(+), 17 deletions(-)

diff --git a/components/NumberInput.vue b/components/NumberInput.vue
index 8542bcf..6ee8f80 100644
--- a/components/NumberInput.vue
+++ b/components/NumberInput.vue
@@ -132,4 +132,8 @@ export default {
   border-radius: 4px;
   font-size: 14px;
 }
+input {
+  font-size: 14px;
+  color: #333;
+}
 </style>
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index da775dd..e1c8a0a 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -85,6 +85,7 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this.searchList()
 		},
 		methods: {
 			searchList () {
diff --git a/pages/zw/ltzp.vue b/pages/zw/ltzp.vue
index bac159d..93380a9 100644
--- a/pages/zw/ltzp.vue
+++ b/pages/zw/ltzp.vue
@@ -29,12 +29,13 @@
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料单重(kg)</span>
+					<view class="zd-col-6">
+						<span class="filter_label">物料单重</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-16">
 						<NumberInput v-model="currentData.single_weight"/>
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
@@ -65,7 +66,29 @@
 						<span class="filter_label">料桶编码</span>
 					</view>
 					<view class="zd-col-17 filter_select">
-						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+						<!-- <zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select> -->
+						<!-- <uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select> -->
+						<view class="input-wrapper">
+							<input 
+							class="input-field" 
+							v-model="materialCode" 
+							placeholder="请输入或选择料桶编码" 
+							placeholder-class="placeholder"
+							@input="onInput"
+							/>
+							<picker 
+							class="picker" 
+							mode="selector" 
+							:range="materialOptions" 
+							:value="selectedIndex"
+							@change="onPickerChange"
+							>
+							<view class="picker-trigger">
+								<!-- <text class="picker-text">></text> -->
+								<text class="uni-icons zd_icon_wraper uniui-bottom" style="color: rgb(153, 153, 153); font-size: 14px;"></text>
+							</view>
+							</picker>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -95,8 +118,21 @@
 				currentData: {},
 				options: [],
 				index: '',
-				options1: [],
-				index1: '',
+				// options1: [{text:'t1', value: 't1'}, {text:'t2', value: 't2'}],
+				// index1: '',
+				materialCode: '',
+				selectedIndex: 0,
+				materialOptions: [],
+				// materialOptions: [
+				// 	'TB-001',
+				// 	'TB-002',
+				// 	'TB-003',
+				// 	'TB-004',
+				// 	'TB-005',
+				// 	'TB-006',
+				// 	'TB-007',
+				// 	'TB-008'
+				// ],
 				disabled: false
 			};
 		},
@@ -112,9 +148,20 @@
 			}
 		},
 		methods: {
+			onInput(e) {
+				// console.log('输入内容:', e.detail.value)
+			},
+			onPickerChange(e) {
+				const index = e.detail.value
+				this.selectedIndex = index
+				this.materialCode = this.materialOptions[index]
+			},
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
 			async _suppList () {
 				try {
 					let res = await suppList()
@@ -129,8 +176,16 @@
 			},
 			/** 料桶编码下拉框*/
 			async _vehiclelist () {
-				let res = await vehiclelist()
-				this.options1 = [...res]
+				try {
+					let res = await vehiclelist()
+					if (res) {
+						this.materialOptions = res.data.map(item => item.value);
+					} else {
+						this.materialOptions = []
+					}
+				} catch (e) {
+					this.materialOptions = []
+				}
 			},
 			toJump () {
 				uni.navigateTo({
@@ -173,6 +228,8 @@
 							}
 						}
 					})
+				} else {
+					this._combination()
 				}
 			},
 			async _combination () {
@@ -193,4 +250,122 @@
 </script>
 
 <style lang="stylus">
+.input-container {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+  margin-bottom: 40rpx;
+}
+
+.input-wrapper {
+  position: relative;
+  display: flex;
+  align-items: center;
+//   border: 2rpx solid #e0e0e0;
+  border-radius: 12rpx;
+  overflow: hidden;
+  transition: border-color 0.3s;
+}
+
+.input-wrapper:focus-within {
+  border-color: #007AFF;
+}
+
+.input-field {
+  flex: 1;
+  height: 80rpx;
+//   padding: 0 24rpx;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.placeholder {
+  color: #999;
+  font-size: 28rpx;
+}
+
+.picker {
+  width: 80rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f8f8f8;
+  border-left: 2rpx solid #e0e0e0;
+}
+
+.picker-trigger {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.picker-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.hint {
+  margin-top: 20rpx;
+  font-size: 24rpx;
+  color: #999;
+  text-align: center;
+}
+
+.result-section {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  margin-bottom: 40rpx;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+}
+
+.result-label {
+  font-size: 28rpx;
+  color: #666;
+  margin-bottom: 16rpx;
+}
+
+.result-value {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #007AFF;
+}
+
+.history-section {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+}
+
+.history-title {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 24rpx;
+  display: block;
+}
+
+.history-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+}
+
+.history-item {
+  background-color: #f0f8ff;
+  border-radius: 12rpx;
+  padding: 16rpx 24rpx;
+  border: 1rpx solid #cce5ff;
+}
+
+.history-code {
+  font-size: 26rpx;
+  color: #007AFF;
+}
 </style>
diff --git a/pages/zw/manual-callmater.vue b/pages/zw/manual-callmater.vue
index 38f9b41..93171ab 100644
--- a/pages/zw/manual-callmater.vue
+++ b/pages/zw/manual-callmater.vue
@@ -53,12 +53,13 @@
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label filter_input_disabled">数量(kg)</span>
+					<view class="zd-col-6">
+						<span class="filter_label filter_input_disabled">数量</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-16">
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.qty" disabled>
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></view>
 				</view>
 				<!-- <view class="zd-row border-bottom">
 					<view class="zd-col-7">
diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue
index a35fe10..82b691d 100644
--- a/pages/zw/manual-returnmater.vue
+++ b/pages/zw/manual-returnmater.vue
@@ -21,12 +21,13 @@
 					</view>
 				</view>
 				<view v-show="index4 !== '2'" class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料数量(kg)</span>
+					<view class="zd-col-6">
+						<span class="filter_label">物料数量</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-16">
 						<input type="text" class="filter_input" v-model="qty">
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></view>
 				</view>
 			</view>
 		</view>
@@ -149,6 +150,8 @@
 							}
 						}
 					})
+				} else {
+					this._checkoutbillBackMaterial()
 				}
 			},
 			async _checkoutbillBackMaterial () {
diff --git a/pages/zw/materbox-instore.vue b/pages/zw/materbox-instore.vue
index 62e2457..26216b2 100644
--- a/pages/zw/materbox-instore.vue
+++ b/pages/zw/materbox-instore.vue
@@ -203,6 +203,7 @@
 					let res = await jbGetLtInfo(this.index, this.val2)
 					if (res.code === '200') {
 						this.currentData = res.data
+						this.val2 = this.currentData.storagevehicle_code
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
diff --git a/pages/zw/wl-groupplate.vue b/pages/zw/wl-groupplate.vue
index 0a96f89..90cc765 100644
--- a/pages/zw/wl-groupplate.vue
+++ b/pages/zw/wl-groupplate.vue
@@ -64,12 +64,13 @@
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料数量(kg)</span>
+					<view class="zd-col-6">
+						<span class="filter_label">物料数量</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-16">
 						<NumberInput v-model="currentData.qty" />
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
@@ -211,6 +212,8 @@
 							}
 						}
 					})
+				} else {
+					this._zwgroupPlate()
 				}
 			},
 			async _zwgroupPlate () {