From 89cfe77308a638cd5b197079054593670a96666f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 15 Feb 2023 08:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E6=A0=87=E6=8D=86=E6=89=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/LabelBind.vue | 14 +++++++++++---
 utils/getData2.js                   |  5 +++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pages/WarehouseManage/LabelBind.vue b/pages/WarehouseManage/LabelBind.vue
index bf1878e..04c813e 100644
--- a/pages/WarehouseManage/LabelBind.vue
+++ b/pages/WarehouseManage/LabelBind.vue
@@ -23,10 +23,16 @@
 						/>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">重量</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 }" :disabled="disabled1" @tap="_mendCode">贴标</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val3 }" :disabled="disabled1" @tap="_mendCode">贴标</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled2" @tap="_stBale">捆扎</button>
 		</view>
 	</view>
@@ -45,6 +51,7 @@
 			return {
 				val1: '',
 				val2: '',
+				val3: '',
 				disabled1: false,
 				disabled2: false
 			};
@@ -52,17 +59,18 @@
 		methods: {
 			async _mendCode () {
 				this.disabled1 = true
-				if (!this.val1) {
+				if (!this.val1 || !this.val3) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await mendCode(this.val1)
+					let res = await mendCode(this.val1, this.val3)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
 					this.val1 = ''
+					this.val3 = ''
 					this.disabled1 = false
 				} catch (e) {
 					this.disabled1 = false
diff --git a/utils/getData2.js b/utils/getData2.js
index 2b0a9d1..4883bc7 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -451,10 +451,11 @@ data: {
  * 贴标捆扎
  */
 // 1.1贴标
-export const mendCode = (no) => request({
+export const mendCode = (no, weight) => request({
 url:'api/pda/st/mendCode',
 data: {
-	box_no: no
+	box_no: no,
+	weight: weight
 }
 })
 //1.2捆扎