diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 5009984..43d1675 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -92,7 +92,7 @@
- | {{el.wlbm}} |
+ {{el.wlbm}} |
{{el.wlmc}} |
{{el.gzh}} |
{{el.jldw}} |
@@ -130,16 +130,16 @@
-
+
修改调出仓库
修改调入仓库
- 分配明细
+ 分配明细
-
+
序号
物料编号
@@ -151,7 +151,7 @@
分录序号
备注
-
+
{{t+1}}
{{ele.wlbm}}
{{ele.wlmc}}
@@ -168,12 +168,32 @@
{{ele.flxh}}
{{ele.bz}}
+
+ {{t+1}}
+ {{ele.wlbm}}
+ {{ele.wlmc}}
+ {{ele.kwbm}}
+
+
+
+ {{ele.fpsl}}
+
+
+
+ {{ele.kcsl}}
+ {{ele.djbh}}
+ {{ele.flxh}}
+ {{ele.bz}}
+
+
@@ -190,7 +210,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit} from '@/utils/getData2.js'
+ import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit, viewAssignDtl, updateAssignDtl} from '@/utils/mork2.js'
export default {
components: {
NavBar,
@@ -415,6 +435,23 @@
} else if (type === 3 && e.subOneChecked) { // 库位分配
this.popObj = e
this._inWarehouseAssignLocation(e)
+ } else if (type === 4) {
+ this._viewAssignDtl(e, obj)
+ }
+ },
+ // 点击二级表格行中的物料编号，弹窗加载表格
+ async _viewAssignDtl (e, obj) {
+ let res = await viewAssignDtl(obj)
+ if (res.code ===1) {
+ this.popData = [...res.result]
+ this.sortArr(this.popData)
+ this.popObj = e
+ this.show = true
+ } else {
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
}
},
// 副表格修改仓库弹窗->确定
@@ -474,6 +511,28 @@
}
})
},
+ // 点击二级表格行中的物料编号，弹窗加载表格 -> 点击确定按钮
+ async _updateAssignDtl () {
+ this.popdisabled = true
+ if (this.popData.length === 0) {
+ this.popdisabled = false
+ return
+ }
+ try {
+ let res = await updateAssignDtl(this.popData, 'ALLO')
+ if (res.code === 1) {
+ this.show = false
+ this._allocationPage(this.popObj)
+ }
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.popdisabled = false
+ } catch (e) {
+ this.popdisabled = false
+ }
+ },
// 分配库位弹窗表格
async _inWarehouseAssignLocation (e) {
let arr = e.subData.filter(ele => ele.checked === true)
diff --git a/utils/mork2.js b/utils/mork2.js
index 75f7f80..0785241 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -2353,7 +2353,7 @@ export const allocationBillDetail = () => {
"result": [
{
"id": "0201",
- "material_code": "btAAAAW8Wd5QCrde",
+ "wlbm": "btAAAAW8Wd5QCrde",
"sl": "1",
"dcckbm": '100',
"dcckmc": 'aaa',