From 22a651d4b8a18b577f4cc55fb985978619aec8aa Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 8 Apr 2026 09:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A2=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hdyy/zpgl/mater-zudai.vue  | 29 +++++++++++++++++++----------
 pages/hdyy/zpgl/mater-zutong.vue |  2 +-
 utils/getData3.js                |  4 ++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index 4c4c926..fe13b67 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -73,12 +73,20 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label">数量</span>
+						<span class="filter_label">净重</span>
 					</view>
 					<view class="zd-col-18">
 						<input type="number" v-model="num" class="filter_input">
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">总重</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="number" v-model="totalQty" class="filter_input">
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
 						<span class="filter_label">有效期至</span>
@@ -102,9 +110,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': flag || !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZdPrint">组袋并打印</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': flag || !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="handleSubmit">确认组袋</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="tolPrint">标签打印</button>
+			<!-- <button class="zd-col-7 button-primary" :class="{'button-info': flag || !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZdPrint">组袋并打印</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': flag || !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="handleSubmit">确认组袋</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 ||  !pcsn ||  !num  || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="tolPrint">标签打印</button>
 		</view>
 		<!-- 自定义弹窗 -->
 		<view v-if="dialogVisible" class="dialog-mask" @click="closeDialog" @touchmove.stop.prevent>
@@ -176,6 +184,7 @@
 				recordNo: '',
 				materialData: {},
 				num: '',
+				totalQty: '',
 				unit: 'KG',
 				disabled: false,
 				disabled1: false,
@@ -192,8 +201,8 @@
 		},
 		computed: {
 			startDate() {
-				return this.nowDate
-				// return getDate('start');
+				// return this.nowDate
+				return getDate('start');
 			},
 			endDate() {
 				return getDate('end');
@@ -282,6 +291,7 @@
 						this.materialData = res.data
 						this.pcsn = this.materialData.pcsn
 						this.num = this.materialData.qty
+						this.totalQty = this.materialData.total_qty
 						this.date = this.materialData.validity_period
 						// 调用此接口后并成功返回结构后，页面所有操作禁用，【标签打印】按钮可以正常使用。
 						this.flag = true
@@ -322,6 +332,7 @@
 				this.recordNo = ''
 				this.materialData = {}
 				this.num = ''
+				this.totalQty = ''
 				this.unit = 'KG'
 				this.pcsn = ''
 				this.flag = false
@@ -345,14 +356,14 @@
 			async _confirmBagAssembly (username, password) {
 				this.disabled = true
 				try {
-					let res = await confirmBagAssembly(username, password, this.val1, this.materialData.material_id, this.materialData.supp_code, this.num, this.pcsn, this.date)
+					let res = await confirmBagAssembly(username, password, this.totalQty, this.val1, this.materialData.material_id, this.materialData.supp_code, this.num, this.pcsn, this.date)
 					if (res) {
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
 					}
-					this.toEmpty()
+					this.val1 = ''
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -491,7 +502,6 @@
 					title: '操作成功',
 					icon: 'none'
 				})
-				this.toEmpty()
 				this.disabled1 = false
 			},
 			printTwo (row) {
@@ -574,7 +584,6 @@
 					title: '操作成功',
 					icon: 'none'
 				})
-				this.toEmpty()
 				this.disabled1 = false
 			}
 		}
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index 96650a8..8cfd217 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -56,7 +56,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label filter_input_disabled">数量</span>
+						<span class="filter_label filter_input_disabled">净重</span>
 					</view>
 					<view class="zd-col-18">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
diff --git a/utils/getData3.js b/utils/getData3.js
index 740eced..f08be17 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -150,9 +150,9 @@ export const byBagCodeInfo = (mid) => request({
 	data: {material_id: mid}
 })
 // 物料组袋
-export const confirmBagAssembly = (username, password, bagNo, mid, suppCode, qty, pcsn, vperiod) => request({
+export const confirmBagAssembly = (username, password, tqty, bagNo, mid, suppCode, qty, pcsn, vperiod) => request({
 	url:'api/pdaCommon/confirmBagAssembly',
-	data: {username: username, password: RSAencrypt(password), bagNo: bagNo, materialId: mid, suppCode: suppCode, qty: qty, pcsn: pcsn, validity_period: vperiod}
+	data: {username: username, password: RSAencrypt(password), total_qty: tqty, bagNo: bagNo, materialId: mid, suppCode: suppCode, qty: qty, pcsn: pcsn, validity_period: vperiod}
 })
 // 物料组袋-打印
 export const printBag = (row, printId) => request({