From 271b4dd42d28bcf160a0f88c7ea1ebb46ceec5a2 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 10 Jul 2025 10:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E9=80=89=E4=BD=99=E6=96=99=E5=9B=9E?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/entry/pick-yl-return-store.vue | 4 ++--
 pages/outbound/out-store-confirm.vue | 6 +++---
 utils/getData3.js                    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue
index eaee367..4b2ae22 100644
--- a/pages/entry/pick-yl-return-store.vue
+++ b/pages/entry/pick-yl-return-store.vue
@@ -108,7 +108,7 @@
 				try {
 					let res = await getReturnMaterial(this.val1)
 					if (res) {
-						this.currentData = res
+						this.currentData = res.data
 					} else {
 						this.currentData = {}
 					}
@@ -143,7 +143,7 @@
 					return
 				}
 				try {
-					let res = await confirmReturnMaterial(this.currentData)
+					let res = await confirmReturnMaterial(this.index, this.currentData)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index 8164645..a48e4a6 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -67,8 +67,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_confirm('2')">强制确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_confirm('1')">出库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('2')">强制确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('1')">出库确认</button>
 		</view>
 	</view>
 </template>
@@ -119,7 +119,7 @@
 			},
 			async _confirm (type) {
 				this.disabled = true
-				if (!this.code) {
+				if (!this.val1 || !this.currentData.group_id) {
 					this.disabled = false
 					return
 				}
diff --git a/utils/getData3.js b/utils/getData3.js
index 1413e8e..be2d710 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -66,9 +66,9 @@ export const getReturnMaterial = (search) => request({
 	data: {search: search}
 })
 // 拣选余料回库确认
-export const confirmReturnMaterial = (gid, code, sid) => request({
+export const confirmReturnMaterial = (sid, obj) => request({
 	url:'api/pda/iosIn/confirmReturnMaterial',
-	data: {group_id: gid, vehicle_code: code, sect_id: sid}
+	data: {sect_id: sid, obj: obj}
 })
 
 // 出库管理
@@ -80,7 +80,7 @@ export const getMaterialDtl = (sid, search) => request({
 // 线边仓出库确认
 export const materialConfirm = (sid, siteCode, obj) => request({
 	url:'api/pda/iosOut/materialConfirm',
-	data: {sect_id: sid, siteCode: siteCode, obj}
+	data: {sect_id: sid, siteCode: siteCode, obj: obj}
 })
 // 产线叫料获取物料库存
 export const linegetMaterialDtl = (rcode, search) => request({
@@ -90,7 +90,7 @@ export const linegetMaterialDtl = (rcode, search) => request({
 // 产线叫料确认
 export const callMaterialConfirm = (rcode, siteCode, obj) => request({
 	url:'api/pda/iosOut/callMaterialConfirm',
-	data: {region_code: rcode, siteCode: siteCode, obj}
+	data: {region_code: rcode, siteCode: siteCode, obj: obj}
 })
 // 出库确认获取物料明细
 export const iosOutgetVehicleMaterial = (search) => request({