From f8671be533a660810fd300d3891ec33d41be7605 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 22 Jul 2025 17:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=9B=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/entry/mater-group.vue  | 32 ++++++++++++--------------------
 pages/entry/mater-group2.vue |  2 +-
 pages/home/home.vue          |  2 +-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue
index e7226a5..b0b425f 100644
--- a/pages/entry/mater-group.vue
+++ b/pages/entry/mater-group.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 物料组盘 -->
+		<!-- 物料组盘（入库管理） -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -12,14 +12,6 @@
 						<search-box v-model="val2"/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">地面站点</span>
-					</view>
-					<view class="zd-col-17">
-						<search-box v-model="val3"/>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">物料信息</span>
@@ -52,14 +44,6 @@
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
 					</view>
 				</view>
-				<!-- <view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料批次</span>
-					</view>
-					<view class="zd-col-17">
-						<input type="text" class="filter_input" v-model="currentData.pcsn">
-					</view>
-				</view> -->
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">物料数量</span>
@@ -68,6 +52,14 @@
 						<NumberInput v-model="currentData.qty" />
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">源单编码</span>
@@ -80,7 +72,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !val3}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -129,13 +121,13 @@
 			},
 			async _groupPlate () {
 				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}' || !this.val3) {
+				if (JSON.stringify(this.currentData) === '{}') {
 					this.disabled = false
 					return
 				}
 				try {
 					this.currentData.stor_code = this.index
-					let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1, this.val3)
+					let res = await groupPlate(this.currentData.material_id, this.val3, this.currentData.qty, this.val2, this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/entry/mater-group2.vue b/pages/entry/mater-group2.vue
index c4a8a60..8720698 100644
--- a/pages/entry/mater-group2.vue
+++ b/pages/entry/mater-group2.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 物料组盘 -->
+		<!-- 物料组盘（预装管理） -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9cbfa78..6656c1f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
-					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer2'}]},
+					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线转运', path: '/pages/outbound/line-transfer2'}]},
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
 					// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},