diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js index e16dc38e8..1d1f73070 100644 --- a/fe/UI.DY.AgGridReport/src/router/index.js +++ b/fe/UI.DY.AgGridReport/src/router/index.js @@ -26,6 +26,7 @@ import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue' import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue' import rawScrapList from '../views/report/rawScrapList.vue' import openingBalance from '../views/report/openingBalance.vue' +import ItemStoreRelation from '../views/report/ItemStoreRelation.vue' import InventoryBookDetail from '../views/report/InventoryBookDetail.vue' @@ -239,7 +240,14 @@ const routes = [ title:"开账信息查询报表", } }, - + { + path: '/ItemStoreRelation', + name: 'ItemStoreRelation', + component: ItemStoreRelation, + meta:{ + title:"库位零件关系查询报表", + } + }, // { // path: '/InventoryBookDetail', // name: 'InventoryBookDetail', diff --git a/fe/UI.DY.AgGridReport/src/views/report/ItemStoreRelation.vue b/fe/UI.DY.AgGridReport/src/views/report/ItemStoreRelation.vue new file mode 100644 index 000000000..5a8370df8 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/ItemStoreRelation.vue @@ -0,0 +1,36 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/openingBalance.vue b/fe/UI.DY.AgGridReport/src/views/report/openingBalance.vue index 2717ae1fd..afd5d0ef5 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/openingBalance.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/openingBalance.vue @@ -21,23 +21,9 @@ export default { }, data () { return { - columnDefs: [ - // { field: 'ERP料号', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: '条码', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: '库位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: 'memo', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: 'WMS数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: 'MES数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - // { field: '差', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - ], - searchConfig:[ - // {type:'date',prop:'starttime',label:'起始'}, - // {type:'date',prop:'endtime',label:'截止'}, - ], - searchForm:{ - // starttime:"", - // endtime:'', - }, + columnDefs: [], + searchConfig:[], + searchForm:{}, BottomFixedItem:[], }; }, @@ -46,9 +32,20 @@ export default { let _column_item = [] for(var i in data){ _column_item = data[0];break } for(var i in _column_item){ - let _item = { field: i, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }; + let _item = { field: i, filter: 'agTextColumnFilter', cellRenderer: this.changeCellColor, suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }; this.columnDefs.push(_item) } + }, + changeCellColor(data){ + if (data.value === '√') { + return ('' + data.value + ''); + } + else if(data.value === '×'){ + return ('' + data.value + ''); + } + else { + return ('' + data.value + ''); + } } } }; @@ -56,8 +53,5 @@ export default { \ No newline at end of file