build

src/components/newEarningReport/company.vue

@@ -423,7 +423,7 @@ export default {
             /** 月成本 = 月采购额 - 月退货额 */
             let mcost_total = 0;
 
-              mcost_total = subtraction(_monthinfo.mcgd_total, _monthinfo.mcgd_th_total) || 0;
+            mcost_total = subtraction(_monthinfo.mcgd_total, _monthinfo.mcgd_th_total) || 0;
     
 
             prev_sale_total = Number(addition(prev_sale_total, sale_total)).toFixed(2);
@@ -440,8 +440,6 @@ export default {
 
           const gross_completion = Number(subtraction(prev_msale_total, prev_mcost_total)).toFixed(2) //当月毛利完成 = 月营收 - 月成本
 
-
-
           total_tips = Number(total_tips) === 0 ? '-' : total_tips
           cost_tips = Number(cost_tips) === 0 ? '-' : cost_tips
 

src/components/newEarningReport/supplier.vue

@@ -504,6 +504,9 @@ export default {
       const res = await asyncRequest.supplier({ daytime: this.daytime });
       if (res.code === 1 && res.data) {
         let { '2': selfSupport, '3': otherSupport } = JSON.parse(JSON.stringify(res.data))
+
+        console.log(JSON.parse(JSON.stringify(selfSupport)))
+
         selfSupport.companyArr = this.handleData(selfSupport) 
         otherSupport.companyArr = this.handleData(otherSupport)
 
@@ -521,6 +524,7 @@ export default {
 
         this.selfSupport.companyArr = this.selfSupport.companyArr.filter(({companyNo}) => !this.composeCompanies.includes(companyNo))
 
+
         this.selfSupport.companyArr = [
           {
             ...amountData,
@@ -561,6 +565,9 @@ export default {
         }
 
                
+
+      console.log(this.selfSupport.companyArr)
+
        if(this.selfSupport.companyArr.length === 1){
         this.selfSupport.companyArr[0].order_type = '自营订单'
        }else{