diff --git a/fe/UI.DY.AgGridReport/src/utils/util.js b/fe/UI.DY.AgGridReport/src/utils/util.js index f71584f36..06ad4da7d 100644 --- a/fe/UI.DY.AgGridReport/src/utils/util.js +++ b/fe/UI.DY.AgGridReport/src/utils/util.js @@ -47,11 +47,14 @@ var formatTimeStrToStr = function(timeStr) { * @param {*} fixed 保留小数位数,默认2(选填) * @returns */ -var numberFixedFormatter = function(number,isKilo,fixed){ - let _fixed = fixed || 2; - let _res = Number(number).toFixed(_fixed) +var numberFixedFormatter = function(number,isKilo,fixed = 0){ + let _res = Number(number).toFixed(fixed) if(isKilo){ - _res = Number(Number(number).toFixed(_fixed)).toLocaleString('en-US'); + _res = Number(number).toLocaleString('en-US', { + minimumFractionDigits: fixed, + maximumFractionDigits: fixed + }) + // _res = Number(Number(number).toFixed(fixed)).toLocaleString('en-US'); } return _res; } diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue index aa53df6fd..c0903f2e0 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue @@ -31,7 +31,8 @@ export default { { 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 } }, - ], + { field: '销售价格', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true,2)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + ], searchConfig:[ {type:'select',prop:'DeliverRequestType',label:'发货类型',optionsProc:'DeliverRequestType',options:[]}, {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100}, @@ -44,7 +45,7 @@ export default { endDate:'', DeliverRequestType:"", }, - BottomFixedItem:['数量'], + BottomFixedItem:['数量','销售价格'], }; } };