build

src/components/reports/src/DepartmentReport.vue

@@ -159,7 +159,7 @@ export default {
             msale_total:0,
             mth_total:0,
             type:'3'
-          } : monthinfo[1])
+          } : monthinfo[2])
         }
 
     
@@ -177,7 +177,8 @@ export default {
         this.tableData = types.map(type => {
           const _monthinfo = monthinfo.find(month => String(month.type) === type) || {}
           const _dayinfo = dayinfo.find(day => String(day.type) === type) || {}
-          const currentMonthSale = Number(_monthinfo.msale_total) || 0 
+          const msale_total = subtraction(_monthinfo.msale_total,_monthinfo.mth_total) || 0
+          const total = subtraction(this.total.month,this.total.monthReturn)
 
           return {
             type,
@@ -189,11 +190,11 @@ export default {
             monthinfo:{
               ..._monthinfo,
               /** 月销售额 = 月销售额 - 月退货额 */
-              msale_total:subtraction(_monthinfo.msale_total,_monthinfo.mth_total) || 0
+              msale_total
             },
              /* 月占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
             proportion:multiplication(
-              division(currentMonthSale,this.total.month) || 0
+              division(msale_total,Number(total).toFixed(2)) || 0
             ,100).toFixed(2)
           }
         })

src/components/reports/src/_utils.js

@@ -83,6 +83,6 @@ export function subtraction(arg1, arg2) {
 
 export function unit2TenThousand(value){
   if(value === NaN || value === "NaN" || Number(value) === 0) return '0'
-  if(value < 1000) return value
+  if(value < 1000 && value > 0 || value < 0 && value > -1000) return value
   return division(value,10000).toFixed(2) + 'W'
 }