build

src/components/newResults/company.vue

@@ -178,6 +178,7 @@ export default {
     unit2TenThousand,
     addDataToCompany(c1, c2) {
       // Number(addition(c1.total_tips,c2.total_tips)).toFixed(2)
+
       return {
         companyName: '普润&锦兴&知事',
         cost_tips: Number(addition(c1.cost_tips, c2.cost_tips)).toFixed(2),
@@ -189,13 +190,15 @@ export default {
           mth_total: Number(addition(item.mth_total, c2.monthinfo[index].mth_total)).toFixed(2),
           type: item.type
         })),
-        dayinfo: c1.monthinfo.map((item, index) => ({
-          cgd_th_total: Number(addition(item.cgd_th_total, c2.monthinfo[index].cgd_th_total)).toFixed(2),
-          cgd_total: Number(addition(item.cgd_total, c2.monthinfo[index].cgd_total)).toFixed(2),
-          sale_total: Number(addition(item.sale_total, c2.monthinfo[index].sale_total)).toFixed(2),
-          th_total: Number(addition(item.th_total, c2.monthinfo[index].th_total)).toFixed(2),
-          type: item.type
-        })),
+        dayinfo: c1.dayinfo.map((item, index) => {
+          return {
+            cgd_th_total: Number(addition(item.cgd_th_total, c2.dayinfo[index].cgd_th_total)).toFixed(2),
+            cgd_total: Number(addition(item.cgd_total, c2.dayinfo[index].cgd_total)).toFixed(2),
+            sale_total: Number(addition(item.sale_total, c2.dayinfo[index].sale_total)).toFixed(2),
+            th_total: Number(addition(item.th_total, c2.dayinfo[index].th_total)).toFixed(2),
+            type: item.type
+        }
+        }),
       }
     },
     setCellClassName({ column }) {
@@ -229,6 +232,8 @@ export default {
         res.data[prIndex] = this.addDataToCompany(jxResult.data[0], res.data[prIndex]);
       }
 
+      console.log(res.data[prIndex])
+
       // const isBeforeDate = this.getDiffDay() < 0 && this.companyNo === "GS2302231323386950"
 
       if (res.code === 0 && res.data && res.data.length > 0) {
@@ -283,7 +288,9 @@ export default {
             /** 月成本 = 月采购额 - 月退货额 */
             const mcost_total = subtraction(_monthinfo.mcgd_total, _monthinfo.mcgd_th_total) || 0;
 
+
             prev_sale_total = Number(addition(prev_sale_total, sale_total)).toFixed(2);
+
             prev_msale_total = Number(addition(prev_msale_total, msale_total)).toFixed(2);
             prev_cost_total = Number(addition(prev_cost_total, cost_total)).toFixed(2);
             prev_mcost_total = Number(addition(prev_mcost_total, mcost_total)).toFixed(2);