build

src/components/newResults/company-month.vue

@@ -152,25 +152,23 @@ export default {
 
       const result = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: this.companyNo })
 
-      if(this.companyNo === "GS2302231124114965"){
-        const jxResult = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: "GS2304031312553746" })
-
-        result.data = result.data.map((_,index) => {
-          const prItem = result.data[index];
-          const jxItem = jxResult.data[index];
-
-          return {
-            month:prItem.month,
-            cgd_th_total: Number(addition(prItem['cgd_th_total'],jxItem['cgd_th_total'])).toFixed(2),
-            cgd_total:Number(addition(prItem['cgd_total'],jxItem['cgd_total'])).toFixed(2),
-            cost_tips:Number(addition(prItem['cost_tips'],jxItem['cost_tips'])).toFixed(2),
-            sale_total:Number(addition(prItem['sale_total'],jxItem['sale_total'])).toFixed(2),
-            th_total:Number(addition(prItem['th_total'],jxItem['th_total'])).toFixed(2),
-            total_tips:Number(prItem['total_tips']).toFixed(2),
-          }
-        })
-      };
-
+      // if(this.companyNo === "GS2302231124114965"){
+      //   const jxResult = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: "GS2304031312553746" })
+      //   result.data = result.data.map((_,index) => {
+      //     const prItem = result.data[index];
+      //     const jxItem = jxResult.data[index];
+
+      //     return {
+      //       month:prItem.month,
+      //       cgd_th_total: Number(addition(prItem['cgd_th_total'],jxItem['cgd_th_total'])).toFixed(2),
+      //       cgd_total:Number(addition(prItem['cgd_total'],jxItem['cgd_total'])).toFixed(2),
+      //       cost_tips:Number(addition(prItem['cost_tips'],jxItem['cost_tips'])).toFixed(2),
+      //       sale_total:Number(addition(prItem['sale_total'],jxItem['sale_total'])).toFixed(2),
+      //       th_total:Number(addition(prItem['th_total'],jxItem['th_total'])).toFixed(2),
+      //       total_tips:Number(prItem['total_tips']).toFixed(2),
+      //     }
+      //   })
+      // };
       // if(this.companyNo === ""){
       //   result.data.forEach((item) => item.total_tips = 0);
       //   for(const c of this.cp_companies.filter(({value}) => value !== "")){

src/components/newResults/company.vue

@@ -223,6 +223,7 @@ export default {
         const jxItem = res.data[jxIndex];
         res.data[prIndex] = this.addDataToCompany(jxItem, res.data[prIndex]);
         res.data.splice(jxIndex, 1);
+        console.log(res.data);
       }
 
       if (this.companyNo === "GS2302231124114965") {