snow 2 жил өмнө
parent
commit
63a3fb7d3b

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/index.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/css/app.bcab3ba1.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/app.a6a009dd.js


BIN
dist/static/js/app.a6a009dd.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/app.faf47ed1.js


BIN
dist/static/js/app.faf47ed1.js.gz


+ 2 - 2
src/App.vue

@@ -58,8 +58,8 @@ export default {
     };
     };
   },
   },
   async created() {
   async created() {
-    // this.currentDate = this.transformTime();
-    this.currentDate = '2023-03-31'
+    this.currentDate = this.transformTime();
+    // this.currentDate = '2023-03-31'
     const { search } = window.location
     const { search } = window.location
     if(search.indexOf('?') !== -1){
     if(search.indexOf('?') !== -1){
       const query = {}
       const query = {}

+ 2 - 2
src/components/reports/src/DepartmentReport.vue

@@ -141,12 +141,12 @@ export default {
             dayinfo: {
             dayinfo: {
               ..._dayinfo,
               ..._dayinfo,
               /** 日销售额 = 日销售额 - 日退货额 */
               /** 日销售额 = 日销售额 - 日退货额 */
-              sale_total:subtraction(_dayinfo.sale_total,_dayinfo.th_total)
+              sale_total:subtraction(_dayinfo.sale_total,_dayinfo.th_total) || 0
             },
             },
             monthinfo:{
             monthinfo:{
               ..._monthinfo,
               ..._monthinfo,
               /** 月销售额 = 月销售额 - 月退货额 */
               /** 月销售额 = 月销售额 - 月退货额 */
-              msale_total:subtraction(_monthinfo.msale_total,_monthinfo.mth_total)
+              msale_total:subtraction(_monthinfo.msale_total,_monthinfo.mth_total) || 0
             },
             },
              /* 月占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
              /* 月占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
             proportion:multiplication(
             proportion:multiplication(

+ 3 - 3
src/components/reports/src/WanyuReport.vue

@@ -23,19 +23,19 @@
 
 
 
 
       <el-table-column label="本月金额" min-width="120" align="center">
       <el-table-column label="本月金额" min-width="120" align="center">
-        <el-table-column label="销售指标">
+        <el-table-column label="销售指标" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.total_tips) }}
             {{ unit2TenThousand(scope.row.total_tips) }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
 
 
-        <el-table-column label="净销售">
+        <el-table-column label="净销售" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.monthinfo.monthNetSales) }}
             {{ unit2TenThousand(scope.row.monthinfo.monthNetSales) }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
 
 
-        <el-table-column label="净销售完成率">
+        <el-table-column label="净销售完成率" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ scope.row.monthinfo.monthProportion }}
             {{ scope.row.monthinfo.monthProportion }}
           </template>
           </template>

+ 1 - 0
src/components/reports/src/_utils.js

@@ -72,6 +72,7 @@ export function subtraction(arg1, arg2) {
 
 
 
 
 export function unit2TenThousand(value){
 export function unit2TenThousand(value){
+  if(value === NaN || value === "NaN" || value === 0 || value === "0") return '0.00'
   if(value < 10000) return value
   if(value < 10000) return value
   return division(value,10000) + 'W'
   return division(value,10000) + 'W'
 }
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно