From 9f2f0a58f3a6e073ad34ed04b99b742385b6a806 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 4 Aug 2025 11:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=8C=85=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zw/jb-lower-mater.vue  |  5 +++++
 pages/zw/jb-return-mater.vue | 11 ++++++++++-
 pages/zw/jb-up-mater.vue     |  5 +++++
 utils/getData4.js            |  5 +++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/pages/zw/jb-lower-mater.vue b/pages/zw/jb-lower-mater.vue
index 4f7730c..f809db4 100644
--- a/pages/zw/jb-lower-mater.vue
+++ b/pages/zw/jb-lower-mater.vue
@@ -58,6 +58,8 @@
 								<th>工单状态</th>
 								<th>开工人</th>
 								<th>创建者</th>
+								<th>计划重量</th>
+								<th>实际重量</th>
 								<th>计划量</th>
 								<th>实际量</th>
 							</tr>
@@ -70,6 +72,8 @@
 								<td>{{e.workorder_status}}</td>
 								<td>{{e.operator}}</td>
 								<td>{{e.create_name}}</td>
+								<td>{{e.plan_weight}}</td>
+								<td>{{e.real_weight}}</td>
 								<td>{{e.plan_qty}}</td>
 								<td>{{e.real_qty}}</td>
 							</tr>
@@ -162,6 +166,7 @@
 			},
 			selectChange2 (e) {
 				this.index2 = e
+				this.seachList()
 			},
 			handleChange (e) {
 				if (e) {
diff --git a/pages/zw/jb-return-mater.vue b/pages/zw/jb-return-mater.vue
index 6f39e46..bfd7783 100644
--- a/pages/zw/jb-return-mater.vue
+++ b/pages/zw/jb-return-mater.vue
@@ -71,7 +71,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {regionList, pointList, getOrderList, jbReturnMaterial} from '@/utils/getData4.js'
+	import {regionList, pointList, getOrderList, jbGetVehicleCode, jbReturnMaterial} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -141,6 +141,9 @@
 			},
 			selectChange2 (e) {
 				this.index2 = e
+				if (e) {
+					this._jbGetVehicleCode()
+				}
 			},
 			handleChange (e) {
 				if (e) {
@@ -192,6 +195,12 @@
 				this.pkId = this.pkId === e.workorder_id ? '' : e.workorder_id
 				this.pkObj = this.pkId === e.workorder_id ? e : {}
 			},
+			async _jbGetVehicleCode () {
+				let res = await jbGetVehicleCode(this.index2)
+				if (res.code === '200') {
+					this.val1 = res.data.tp_code
+				}
+			},
 			async _jbReturnMaterial () {
 				this.disabled = true
 				if (!this.index || !this.index2 || !this.val1 || !this.pkId) {
diff --git a/pages/zw/jb-up-mater.vue b/pages/zw/jb-up-mater.vue
index 069ff35..8254aaa 100644
--- a/pages/zw/jb-up-mater.vue
+++ b/pages/zw/jb-up-mater.vue
@@ -32,6 +32,8 @@
 								<th>工单状态</th>
 								<th>开工人</th>
 								<th>创建者</th>
+								<th>计划重量</th>
+								<th>实际重量</th>
 								<th>计划量</th>
 								<th>实际量</th>
 							</tr>
@@ -44,6 +46,8 @@
 								<td>{{e.workorder_status}}</td>
 								<td>{{e.operator}}</td>
 								<td>{{e.create_name}}</td>
+								<td>{{e.plan_weight}}</td>
+								<td>{{e.real_weight}}</td>
 								<td>{{e.plan_qty}}</td>
 								<td>{{e.real_qty}}</td>
 							</tr>
@@ -132,6 +136,7 @@
 			},
 			selectChange2 (e) {
 				this.index2 = e
+				this.seachList()
 			},
 			seachList () {
 				if (!this.index2) {
diff --git a/utils/getData4.js b/utils/getData4.js
index aab8948..18d5193 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -172,3 +172,8 @@ export const jbReturnMaterial = (area, pcode, wid) => request({
 	url:'api/pda/jb/jbReturnMaterial',
 	data: {area: area, point_code: pcode, workorder_id: wid}
 })
+// 获取解包点位的托盘编码
+export const jbGetVehicleCode = (pcode) => request({
+	url:'api/pda/jb/jbGetVehicleCode',
+	data: {point_code: pcode}
+})