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) } - }, + } } } 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 @@ + @@ -203,6 +204,9 @@ + + + @@ -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) + } } } }