build

src/components/newReporting/CommonReporting.vue

@@ -70,6 +70,7 @@
 
 
 <script>
+import { addition } from "../../pages/_utils";
 import { mapModeToColumns } from "./columns"
 
 import axios from "axios"
@@ -98,12 +99,65 @@ export default {
       this.data.forEach(item => {
         if(!this.tableProps.every(key => Number(item[key]) === 0)) result.push(item)
       })
-      return result
+
+
+      let totalItem = {
+        "companyName": "全部",
+        "companyNo": "",
+        "year": "合计",
+        "noAddrOrderNum": 0,
+        "waitSendOrderNum": 0,
+        "noSignOrderNum": 0,
+        "noDzCgdNumComon": 0,
+        "noDzCgdNum": 0,
+        "dzNoPayCgdNumCom": 0,
+        "dzNoPayCgdNum": 0,
+        "dzNoInvCgdNumCom": 0,
+        "dzNoInvCgdNum": 0,
+        "noPayQrdTobNum": 0,
+        "noPayQrdTocNum": 0,
+        "noInvQrdTobNum": 0,
+        "noInvQrdTocNum": 0,
+        "noSignOrderNoExpressNum": 0,
+        "noSignOrderExpressNum": 0,
+        "noSignOrderFailNum": 0
+      }
+
+
+      this.data.forEach(item => {
+        if(item.year === '合计'){
+          totalItem = {
+            "companyName": "全部",
+            "companyNo": "",
+            "year": "合计",
+            "noAddrOrderNum": addition(totalItem.noAddrOrderNum, item.noAddrOrderNum),
+            "waitSendOrderNum": addition(totalItem.waitSendOrderNum, item.waitSendOrderNum), 
+            "noSignOrderNum": addition(totalItem.noSignOrderNum, item.noSignOrderNum), 
+            "noDzCgdNumComon": addition(totalItem.noDzCgdNumComon, item.noDzCgdNumComon), 
+            "noDzCgdNum": addition(totalItem.noDzCgdNum, item.noDzCgdNum), 
+            "dzNoPayCgdNumCom": addition(totalItem.dzNoPayCgdNumCom, item.dzNoPayCgdNumCom), 
+            "dzNoPayCgdNum": addition(totalItem.dzNoPayCgdNum, item.dzNoPayCgdNum), 
+            "dzNoInvCgdNumCom": addition(totalItem.dzNoInvCgdNumCom, item.dzNoInvCgdNumCom), 
+            "dzNoInvCgdNum": addition(totalItem.dzNoInvCgdNum, item.dzNoInvCgdNum), 
+            "noPayQrdTobNum": addition(totalItem.noPayQrdTobNum, item.noPayQrdTobNum), 
+            "noPayQrdTocNum": addition(totalItem.noPayQrdTocNum, item.noPayQrdTocNum), 
+            "noInvQrdTobNum": addition(totalItem.noInvQrdTobNum, item.noInvQrdTobNum), 
+            "noInvQrdTocNum": addition(totalItem.noInvQrdTocNum, item.noInvQrdTocNum), 
+            "noSignOrderNoExpressNum": addition(totalItem.noSignOrderNoExpressNum, item.noSignOrderNoExpressNum), 
+            "noSignOrderExpressNum": addition(totalItem.noSignOrderExpressNum, item.noSignOrderExpressNum), 
+            "noSignOrderFailNum": addition(totalItem.noSignOrderFailNum, item.noSignOrderFailNum),
+          }
+        }
+      })
+
+
+      console.log(this.data)
+      return [totalItem, ...result]
     }
   },
   methods: {
      handleDownload(column, data){
-        const parameter = { companyNo: data.companyNo, ...column.baseParameter }
+        let parameter = { companyNo: data.companyNo, ...column.baseParameter }
 
         if(data.year === '合计'){
           parameter[`start${column.suffix}`] = '2023-01-01'
@@ -113,11 +167,16 @@ export default {
           parameter[`end${column.suffix}`] = `${data.year}-12-31`
         }
 
+        if(data.companyName === '全部'){
+          parameter = { ...column.baseParameter }
+        }
+
         this.exportData(column.exportUrl, parameter, this.generateTitle(column, data))
       },
 
       handleChildDownload(column, child, data){
-        const parameter = { companyNo: data.companyNo, ...child.baseParameter }
+        let parameter = { companyNo: data.companyNo, ...child.baseParameter }
+        
         if(data.year === '合计'){
           parameter[`start${child.suffix}`] = '2023-01-01'
           parameter[`end${child.suffix}`] = '2024-12-31'
@@ -126,6 +185,11 @@ export default {
           parameter[`end${child.suffix}`] = `${data.year}-12-31`
         }
 
+
+        if (data.companyName === '全部') {
+          parameter = { ...child.baseParameter }
+        }
+
         this.exportData(child.exportUrl, parameter, this.generateChildTitle(column, child, data))
       },
     exportData(exportUrl, parameter, title){