diff --git a/fe/UI.DY.AgGridReport/src/api/api.js b/fe/UI.DY.AgGridReport/src/api/api.js index 9915ec0b1..3c6eea401 100644 --- a/fe/UI.DY.AgGridReport/src/api/api.js +++ b/fe/UI.DY.AgGridReport/src/api/api.js @@ -7,7 +7,7 @@ export function getReportPageList(procName, data) { return axiosUtil.ajax_post(procApi+procName,data) } -// 获取 物料 +// 获取 ERP料号 export function getItemCodeList() { return axiosUtil.ajax_post(procApi+'Proc_InputWhere_ItemCode',{}) } @@ -27,7 +27,7 @@ export function getSupplierCode() { return axiosUtil.ajax_post(procApi+'Proc_InputWhere_SupplierCode',{}) } -// 获取 ERP库位 +// 获取 ERP储位 export function getLocationErpCode() { return axiosUtil.ajax_post(procApi+'Proc_InputWhere_LocationErpCode',{}) } diff --git a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue index 61c3ba122..4f26cfa84 100644 --- a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue +++ b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue @@ -223,7 +223,7 @@ export default { item.options = [] // 普通下拉 + 大数据下拉 if((item.type == 'select' || item.type == 'selectExcess') && item.optionsProc){ - // 物料 + // ERP料号 if(item.optionsProc == 'itemCode'){ getItemCodeList().then(res=>{ if(item.type == 'selectExcess'){item.optionsTS = res} @@ -259,7 +259,7 @@ export default { item.opV="SupplierCode" }) } - // ERP库位 + // ERP储位 if(item.optionsProc == 'LocationErpCode'){ getLocationErpCode().then(res=>{ if(item.type == 'selectExcess'){item.optionsTS = res} diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue index 21537ac2f..a46f95e33 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue @@ -21,11 +21,11 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { 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: 'ERP料号', 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: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位代码', maxWidth:120,filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库存状态', maxWidth:90, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '批次', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -36,7 +36,7 @@ export default { { field: '入库天数',maxWidth:140, type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, {type:'select',prop:'Status',label:'状态',optionsProc:'InventoryBalanceStatus',options:[]}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue index 18d7a32ca..213e51251 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue @@ -21,10 +21,10 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库存状态', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '30天内', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -38,7 +38,7 @@ export default { { field: '合计数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue index 241448389..6e66b9244 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue @@ -21,16 +21,16 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库存状态', 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:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, ], searchForm:{ diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue index a2ec770a9..abd83d522 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue @@ -21,16 +21,16 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库存状态', 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:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, ], searchForm:{ diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue index 0c763d2ab..8c5c7ab5e 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue @@ -21,16 +21,16 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, ], searchForm:{ diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue index 5764788a5..ccc7382ad 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue @@ -23,10 +23,10 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', 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 } }, @@ -36,7 +36,7 @@ export default { { field: '期末库存', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue index 0ef23e7ce..b72271b04 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue @@ -23,10 +23,10 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'Erp储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -37,7 +37,7 @@ export default { { field: '期末库存', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue index 0107df7cb..8b23f8ecc 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue @@ -24,9 +24,9 @@ export default { { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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: '车牌号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -35,7 +35,7 @@ export default { ], searchConfig:[ {type:'select',prop:'DeliverRequestType',label:'发货类型',optionsProc:'DeliverRequestType',options:[]}, - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue index 4f5efc9ae..5bd0c2e37 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue @@ -24,9 +24,9 @@ export default { { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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: '车牌号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -36,7 +36,7 @@ export default { ], searchConfig:[ {type:'select',prop:'DeliverRequestType',label:'发货类型',optionsProc:'DeliverRequestType',options:[]}, - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue index 55cccf740..b8d93ff35 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue @@ -21,16 +21,16 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: 'ERP库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '单位', 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:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue index a2948190f..43efa3232 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue @@ -21,16 +21,16 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '类型', 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:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue index b23249a45..bc4568298 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue @@ -21,14 +21,14 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue index 4f6c8bc41..e22f5d2e3 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue @@ -21,14 +21,15 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', 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 } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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 } }, + { field: '上架后退货', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], @@ -37,7 +38,7 @@ export default { beginDate:"", endDate:'', }, - BottomFixedItem:['退货总数'], + BottomFixedItem:['上架前退货','上架后退货'], }; } }; diff --git a/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue index ed701c627..4ec96efeb 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue @@ -22,10 +22,10 @@ export default { return { columnDefs: [ { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'ERP储位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'WMS库位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '计量单位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -34,7 +34,7 @@ export default { { field: '报废数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue b/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue index bfb4ce87a..9371fdf72 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue @@ -24,15 +24,15 @@ export default { { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', 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: '合格', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue index 1be0ed296..863d05b5d 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue @@ -21,11 +21,11 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { 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: 'ERP料号', 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: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -38,7 +38,7 @@ export default { { field: '汇总数', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]}, {type:'select',prop:'UnplannedIssueType',label:'领料类别',optionsProc:'UnplannedIssueType',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue index baf421b5f..bb34aedd4 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue @@ -21,11 +21,11 @@ export default { data () { return { columnDefs: [ - { field: '物品代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { 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: 'ERP料号', 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: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -38,7 +38,7 @@ export default { { field: '汇总数', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]}, {type:'select',prop:'UnplannedReceiptType',label:'退料类别',optionsProc:'UnplannedReceiptType',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue b/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue index 44405e478..b905cd56d 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue @@ -21,7 +21,7 @@ export default { data () { return { columnDefs: [ - { field: '零件号', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { 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 } }, diff --git a/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue b/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue index 5eebbe77d..5b25503f7 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue @@ -21,7 +21,7 @@ export default { data () { return { columnDefs: [ - { field: '零件号', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'mes最后一条时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: 'wms最后一条时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, diff --git a/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue index c5efcd69b..e03a71d6c 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue @@ -24,9 +24,9 @@ export default { { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", 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 } }, { field: '未交数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, @@ -34,7 +34,7 @@ export default { searchConfig:[ {type:'input',prop:'Number',label:'订单号'}, {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]}, - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'}, ], diff --git a/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue index 53e00e891..19fa0eeb3 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue @@ -22,11 +22,12 @@ export default { return { columnDefs: [ { 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: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP料号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号名称', minWidth:170, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '完成时间',minWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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 } }, { field: '盘末数量', 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 } }, @@ -34,7 +35,7 @@ export default { { field: '盘亏', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ - {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, + {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]}, {type:'date',prop:'beginDate',label:'起始'}, {type:'date',prop:'endDate',label:'截止'},