diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index e88f6f4ea..4ce457144 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -121,6 +121,11 @@ export const constantRoutes = [ }, { path: '/InventoryBookDetail_innerPage', + component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old'), + hidden: true + }, + { + path: '/report-test', component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage'), hidden: true }, diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue index db7db6d95..26960c827 100644 --- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue +++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue @@ -70,7 +70,10 @@ v-for="(item,key) in tableTh" :prop="item.prop" :label="item.label" - :width="item.width"> + :width="item.width" + > + @@ -91,7 +94,7 @@ export default { // 查询字段 searchForm:{ interfaceCalendar:null, - erpLocatioCode:null, + erpLocatioCode:'', itemCode:null,//VW316C1A028A,UTT06PP5483 beginDate: '',//2021-10-01 endDate: '',//2023-11-28T23:59:59 @@ -110,7 +113,10 @@ export default { }, // table标头 tableTh:[ - {label:'物料信息',prop:'itemCode',width:180}, + {label:'物料代码',prop:'itemCode',width:180}, + {label:'物料名称',prop:'itemName'}, + {label:'物料描述',prop:'itemDesc1'}, + {label:'物料配置',prop:'configuration'}, {label:'ERP储位',prop:'erpLocatioCode',width:80}, {label:'库位代码',prop:'locationCode',width:90}, {label:'单号',prop:'number',width:170}, @@ -258,7 +264,11 @@ export default { } }) } + else{ + _list.push(_item1) + } }); + console.log(_list) this.tableData = _list }, // 获取表格数据 diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage copy.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old.vue similarity index 96% rename from fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage copy.vue rename to fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old.vue index d1593da39..4c04a366f 100644 --- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage copy.vue +++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old.vue @@ -1,5 +1,5 @@