diff --git a/src/api/boxManage/boxManage.js b/src/api/boxManage/boxManage.js index 5e70792..a3e3210 100644 --- a/src/api/boxManage/boxManage.js +++ b/src/api/boxManage/boxManage.js @@ -31,3 +31,4 @@ export const deletePallet = data => createAPI('/boxForNotification/deletePallet' export const updatePalletStatus = data => createAPI('/boxForNotification/updatePalletStatus','post',data) export const scanPalletBox = data => createAPI('/boxForNotification/scanPalletBox','post',data) export const deletePalletBox = data => createAPI('/boxForNotification/deletePalletBox','post',data) +export const searchBoxRollDetail = data => createAPI('/boxForNotification/searchBoxRollDetail','post',data) diff --git a/src/views/modules/boxManage/com_saleBoxManage_boxing.vue b/src/views/modules/boxManage/com_saleBoxManage_boxing.vue index 674ccb1..4ce0f3f 100644 --- a/src/views/modules/boxManage/com_saleBoxManage_boxing.vue +++ b/src/views/modules/boxManage/com_saleBoxManage_boxing.vue @@ -225,10 +225,10 @@ export default { { userId: this.$store.state.user.name, functionId: this.functionId, - serialNumber: '750001Table2RollsQty', + serialNumber: '750001Table2RollsCount', tableId: "750001Table2", tableName: "装箱清单", - columnProp: "xxx", + columnProp: "rollsCount", headerAlign: "center", align: "right", columnLabel: "装箱总数", diff --git a/src/views/modules/boxManage/com_saleBoxManage_pallet.vue b/src/views/modules/boxManage/com_saleBoxManage_pallet.vue index 2316fd5..9015fb2 100644 --- a/src/views/modules/boxManage/com_saleBoxManage_pallet.vue +++ b/src/views/modules/boxManage/com_saleBoxManage_pallet.vue @@ -108,12 +108,107 @@ min-width="100" label="装托人"> + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + 关闭 + + @@ -126,7 +221,8 @@ import { searchPalletDetail, searchPalletList, updatePalletStatus, - deletePalletBox + deletePalletBox, + searchBoxRollDetail } from '../../../api/boxManage/boxManage' export default { @@ -208,10 +304,10 @@ export default { { userId: this.$store.state.user.name, functionId: this.functionId, - serialNumber: '750002Table2BoxesQty', + serialNumber: '750002Table2BoxesCount', tableId: "750002Table2", tableName: "托清单", - columnProp: "xxx", + columnProp: "boxesCount", headerAlign: "center", align: "right", columnLabel: "装托总数", @@ -271,6 +367,10 @@ export default { scanBoxNo:'', palletModelFlag: false, palletActionType: 'add', // 新增:添加/删除模式 + // 装箱明细相关数据 + boxRollDetailDialogVisible: false, + boxRollDetailList: [], + boxRollDetailLoading: false, } }, methods: { @@ -487,6 +587,31 @@ export default { } }) }, + // 查看装箱明细 + viewBoxRollDetail(row){ + this.boxRollDetailList = [] + this.boxRollDetailDialogVisible = true + this.boxRollDetailLoading = true + + let params = { + site: this.palletData.site, + buNo: this.palletData.buNo, + boxNo: row.boxNo + } + + searchBoxRollDetail(params).then(({data}) => { + this.boxRollDetailLoading = false + if (data && data.code == 0) { + this.boxRollDetailList = data.rows || [] + } else { + this.$message.error(data.msg || '查询装箱明细失败') + this.boxRollDetailList = [] + } + }).catch(() => { + this.boxRollDetailLoading = false + this.$message.error('查询装箱明细失败') + }) + }, } }