From 774ccb1b54448f18339868b0d3fdbd1f7dbf6715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 14:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/alloc-maintenance_new.vue |  2 +-
 pages/management/receive-confirm_new.vue   | 34 ++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 7cbd25f..ee91934 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -534,7 +534,7 @@
 				} catch (e) {
 					console.log(e)
 				} 
-			},
+			}
 		}
 	}
 </script>
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index b9a8224..c290d9e 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -56,6 +56,7 @@
 								<button class="confirm-button" @tap="toSubSearch(e)">查询</button>
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" @tap="showPop(1, e, {})">一键设置</button>
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" @tap="showPop(4, e, {})">库位分配</button>
+								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" @tap="inWarehouseSure(e)">库存提交</button>
 								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" :disabled="disabled1" @tap="_receiptBillConfirm(e)">确认收货</button>
 							</view>
 						</view>
@@ -203,6 +204,9 @@
 			</view>
 		</view>
 		<view v-if="show" class="modal" @click.stop="show = false"></view>
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="是否提交库存？" @confirm="_inWarehouseCommit" @close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
@@ -212,7 +216,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync} from '@/utils/getData2.js'
+	import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync, inWarehouseCommit} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,
@@ -245,7 +249,8 @@
 				value2: '', // 收货仓库信息
 				range2: [],
 				raw: '', // 副表格修改前输入框数据
-				rawObj: {} // 副表格修改前行数据
+				rawObj: {} ,// 副表格修改前行数据
+				subCheckData: [] // 二级表格多选数组
 			}
 		},
 		onLoad () {
@@ -606,6 +611,31 @@
 				} catch (e) {
 					this.disabled1 = false
 				}
+			},
+			// 库存提交
+			inWarehouseSure (e) {
+				if (!e.subOneChecked || !e.subStatus1) {
+					return
+				}
+				this.$refs.alertDialog.open()
+				this.popObj = e
+				let arr = e.subData.filter(ele => ele.checked === true)
+				this.subCheckData = [...arr]
+			},
+			// 库存提交-确认接口
+			async _inWarehouseCommit () {
+				try {
+					let res = await inWarehouseCommit(this.subCheckData, 'RECE')
+					if (res.code === 1) {
+						this._receiptPage(this.popObj)
+					}
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+				} 
 			}
 		}
 	}