Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

src/views/statisticalanalysis/specialgoods/index.vue

@@ -474,6 +474,32 @@ export default {
               weight: returnData.listValues[0].totalWeight,
             };
             this.tableListcop.push(objar);
+          } else if (this.action === 1) {
+            let objar = {
+              indexs: "合计",
+              weight: returnData.listValues[0].totalWeight,
+            };
+          } else if (this.action === 2) {
+            let objar = {
+              indexs: "合计",
+              weight:
+                dat == 1
+                  ? returnData.listValues[0].totalFlightNum
+                  : returnData.listValues[0].totalWeight,
+            };
+          } else if (this.action === 3) {
+            let objar = {
+              indexs: "合计",
+              weight: returnData.listValues[0].totalWeight,
+            };
+          } else if (this.action === 4) {
+            let objar = {
+              indexs: "合计",
+              weight:
+                dat == 1
+                  ? returnData.listValues[0].totalFlightNum
+                  : returnData.listValues[0].totalWeight,
+            };
           }
           returnData.listValues.forEach((element) => {
             if (this.action === 0) {