Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1117,6 +1117,15 @@ export default {
           columnAlign: "left",
           isResize: true
         },
+        {
+          field: "UnionTiCheng",
+          formatter: this.moneyFormat,
+          title: "联运提成",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },
         {
           field: "YingYeE",
           formatter: this.moneyFormat,
@@ -1538,6 +1547,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if (field === "UnionTiCheng")
+        return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
       if (field === "AverageIncome")
         return this.priceFormat(rowData.AverageIncome);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1284,6 +1284,15 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "UnionTiCheng",
+          formatter: this.moneyFormat,
+          title: "联运提成",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "YingYeE",
           formatter: this.moneyFormat,
@@ -1577,6 +1586,7 @@ export default {
         "合肥",
         "南宁",
         "联运成本",
+        "联运提成",
         "营业额",
         "GRP",
         "TKT",
@@ -1673,7 +1683,8 @@ export default {
         "BC",
         "BD",
         "BE",
-        "BF"
+        "BF",
+        "BG"
       ];
       const ws = XLSX.utils.aoa_to_sheet(data);
       ws["!cols"] = wscols;
@@ -1747,6 +1758,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+        if (field === "UnionTiCheng")
+        return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
       if (field === "AverageIncome")
         return this.priceFormat(rowData.AverageIncome);
@@ -1904,6 +1917,9 @@ export default {
       }
        if(rowData.TransportCost < 0 && columnName=="TransportCost"){
         return "column-cell-class-name-test-red"
+      }
+       if(rowData.UnionTiCheng < 0 && columnName=="UnionTiCheng"){
+        return "column-cell-class-name-test-red"
       }
        if(rowData.YingYeE < 0 && columnName=="YingYeE"){
         return "column-cell-class-name-test-red"