From 5d9a49bfd96b5ab2b4b8f7320c6e4a0911f0b1c2 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 25 Aug 2023 16:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=87=80=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/SboProcess.vue            |  2 +-
 pages/WarehouseManage/ProdDelivery.vue        |  2 ++
 pages/WarehouseManage/XuniDeliveryConfirm.vue | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index a288627..d221ffb 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -70,7 +70,7 @@
 			<button class="submit-button" :class="{'btn-disabled': !(val1 && !pkId)}" :disabled="disabled5" @tap="_needEmptyVehicle">呼叫空轴</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button>
+			<!-- <button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button> -->
 			<button class="submit-button" @tap="searchList">查询</button>
 		</view>
 	</view>
diff --git a/pages/WarehouseManage/ProdDelivery.vue b/pages/WarehouseManage/ProdDelivery.vue
index 1a8e04e..23b431e 100644
--- a/pages/WarehouseManage/ProdDelivery.vue
+++ b/pages/WarehouseManage/ProdDelivery.vue
@@ -29,6 +29,7 @@
 								<th>单据号</th>
 								<th>状态</th>
 								<th>总重量</th>
+								<th>总净重</th>
 								<th>明细数</th>
 								<th>客户编码</th>
 								<th>客户名称</th>
@@ -47,6 +48,7 @@
 								<td>{{e.bill_code}}</td>
 								<td>{{e.bill_status}}</td>
 								<td>{{e.total_qty}}</td>
+								<td>{{e.net_weight_num}}</td>
 								<td>{{e.detail_count}}</td>
 								<td>{{e.cust_code}}</td>
 								<td>{{e.cust_name}}</td>
diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue
index 05cffe2..df784be 100644
--- a/pages/WarehouseManage/XuniDeliveryConfirm.vue
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -20,6 +20,14 @@
 						<search-box v-model="val2" />
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">总净重</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input filter_input_disabled" v-model="net_weight_num" disabled>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -72,7 +80,8 @@
 				val2: '',
 				billCode: '',
 				dataList: [],
-				disabled1: false
+				disabled1: false,
+				net_weight_num: ''
 			};
 		},
 		onLoad (option) {
@@ -91,7 +100,8 @@
 			/** 初始化查询 */
 			async _virtualivtQuery () {
 				let res = await virtualivtQuery(this.val1, this.val2, this.billCode)
-				this.dataList = [...res.data]	
+				this.dataList = [...res.data]
+				this.net_weight_num = res.net_weight_num
 			},
 			async _virtualoutConfirm () {
 				this.disabled1 = true