Kaynağa Gözat

Merge commit 'd29a56ef0425c507cd74ceaadec3fff2faccb60a' into HEAD

gitadmin 1 yıl önce
ebeveyn
işleme
ad6c55a652

+ 1 - 1
src/config/router.config.js

@@ -3396,7 +3396,7 @@ export const asyncRouterMap = [
         redirect: '/bigStatistics/realTimeSalesReport',
         component: PageView,
         meta: {
-          title: '大屏数据统计',
+          title: '数据统计',
           icon: 'desktop',
           permission: 'M_bigScreenStatistics'
         },

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -313,9 +313,9 @@
                 const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
                 if(acTotal){
                   // 采购额结余
-                  acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+                  acTotal.cgejyAmount = (Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)).toFixed(2)
                   // 采购额超出
-                  acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+                  acTotal.cgeccAmount = (Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)).toFixed(2)
                 }
                 // 有数据时才调用接口,避免做无用的调用
                 if(acTotal&&acTotal.totalQty){

+ 2 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -442,9 +442,9 @@ export default {
             const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
             if(acTotal){
               // 采购额结余
-              acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+              acTotal.cgejyAmount = (Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)).toFixed(2)
               // 采购额超出
-              acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+              acTotal.cgeccAmount = (Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)).toFixed(2)
             }
              
             // 有数据时才调用接口,避免做无用的调用