diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue index 9eac854..03902cd 100644 --- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue +++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue @@ -25,21 +25,23 @@ export default { { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述2', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '库位组', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + // { field: '供应商代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '来源库位组', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '目标库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '单位', cellClass:"centerAlign", 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:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]}, - {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]}, - {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, + {type:'select',prop:'LocationGroupCode',label:'来源库位组',optionsProc:'LocationGroupCode',options:[]}, + // {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], searchForm:{ ItemCode:'', LocationGroupCode:"", - SupplierCode:'', + // SupplierCode:'', beginDate:"", endDate:'', }, diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue index 44307e7..d10e8bc 100644 --- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue +++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue @@ -25,21 +25,23 @@ export default { { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物料描述2', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '库位组', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + // { field: '供应商代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '来源库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '目标库位组', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '单位', cellClass:"centerAlign", 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:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]}, - {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]}, - {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, + {type:'select',prop:'LocationGroupCode',label:'目标库位组',optionsProc:'LocationGroupCode',options:[]}, + // {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], searchForm:{ ItemCode:'', LocationGroupCode:"", - SupplierCode:'', + // SupplierCode:'', beginDate:"", endDate:'', },