diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index a83ae07f2..df23776d3 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -293,7 +293,7 @@ export const tableMixins = { // 主列表更新后全局通用操作 pagingCallback(callback){ this.Loading.tableLoading = false - // 如果业务页面设置showTableBaseFromFE为空,tableColumns.js别忘了删除配置项 + // 如果业务页面设置showTableBaseFromFE,tableColumns.js别忘了添加配置项 if(this.showTableBaseFromFE && this.showTableBaseFromFE.length > 0){ this.getItemInfoByItemCodeHandle('table') } diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 63f73be69..1a0d36229 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2557,6 +2557,7 @@ export const InventoryBalance = [ { label: "物品名称", prop: 'itemName' }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "库存数量", prop: "qty" }, { label: "计量单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -2598,6 +2599,7 @@ export const InventoryTransaction = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" }, { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index f71cb404c..496fc9df6 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -100,6 +100,7 @@ export default { }, data () { return { + showTableBaseFromFE:['configuration'], URL: 'wms/inventory/inventory-balance', //常用按钮数据 currenButtonData: [ diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue index cf1d2982c..61187ae5b 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue @@ -56,6 +56,7 @@ export default { ], data () { return { + showTableBaseFromFE:['configuration'], URL: 'wms/inventory/inventory-transaction', //常用按钮数据 currenButtonData: [