From 4a4f87d47796c42fa96652aa6d8e5d3bd6f3b5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 5 Jun 2024 11:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9+=E6=9C=89=E5=85=B3?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BD=BF=E7=94=A8=E5=8D=83?=
 =?UTF-8?q?=E4=BD=8D=E7=AC=A6+=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E7=BB=93=E5=90=88=E8=BD=AC=E4=B9=89=E5=B0=81=E8=A3=85=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/UI.DY.AgGridReport/src/utils/util.js               | 11 +++++++----
 .../src/views/report/ProductDeliverySummary.vue       |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

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:['数量','销售价格'],
     };
   }
 };