1

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1259,8 +1259,8 @@ Vue.component("Transport", {
 });
 Vue.component("TCIDJumpWang", {
   template: `<div>
-  <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData[field]}}</span>
-  <span v-else >{{rowData[field]}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{moneyFormatN(rowData[field])}}</span>
+  <span v-else >{{moneyFormatN(rowData[field])}}</span>
   </div>`,
   props: {
     rowData: {
@@ -1493,13 +1493,11 @@ export default {
         },
         {
           field: "DMCNUM",
-          formatter: this.moneyFormat,
           title: this.$t('salesModule.DJNum'),
           width: 100,
           titleAlign: "left",
           columnAlign: "right",
-          isResize: true,
-          componentName: "TCIDJumpWang"
+          isResize: true
         }, //,orderBy:''
         {
           field: "YingShou",
@@ -1819,14 +1817,12 @@ export default {
           componentName: "TCIDJumpWang"
         },
         {
-          field: "XiaoFeiTravelStr",
-          formatter: this.moneyFormat,
+          field: "XiaoFeiTravelStr",          
           title: this.$t('objFill.tuanduixiaofei'),
           width: 90,
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
-          componentName: "TCIDJumpWang"
         },
         {
           field: "YongJinShouRu",
@@ -1885,8 +1881,7 @@ export default {
           width: 90,
           titleAlign: "left",
           columnAlign: "right",
-          isResize: true,
-          componentName: "TCIDJumpWang"
+          isResize: true
         },
         {
           field: "GZIncome",
@@ -2303,13 +2298,11 @@ export default {
         },
         {
           field: "DMCNUM",
-          formatter: this.moneyFormat,
           title: this.$t('salesModule.DJNum'),
           width: 100,
           titleAlign: "left",
           columnAlign: "right",
-          isResize: true,
-          componentName: "TCIDJumpWang"
+          isResize: true
         },
         {
           field: "YingShou",
@@ -2498,7 +2491,6 @@ export default {
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
-          componentName: "TCIDJumpWang"
         },
         {
           field: "ShiJiLiRun",
@@ -3141,52 +3133,52 @@ export default {
       XLSX.writeFile(wb, xlsxName + ".xlsx");
     },
     moneyFormat(rowData, rowIndex, pagingIndex, field) {
-      if (field === "YingShou") return this.priceFormat(rowData.YingShou);
-      if (field === "ShiShou") return this.priceFormat(rowData.ShiShou);
-      if (field === "TuiKuan") return this.priceFormat(rowData.TuiKuan);
+      if (field === "YingShou") return this.moneyFormatN(rowData.YingShou);
+      if (field === "ShiShou") return this.moneyFormatN(rowData.ShiShou);
+      if (field === "TuiKuan") return this.moneyFormatN(rowData.TuiKuan);
       if (field === "PingTaiShuiJin")
-        return this.priceFormat(rowData.PingTaiShuiJin);
-      if (field === "DaiShou") return this.priceFormat(rowData.DaiShou);
-      if (field === "ZaiTu") return this.priceFormat(rowData.ZaiTu);
-      if (field === "RealIncome") return this.priceFormat(rowData.RealIncome);
-      if (field === "YiShou") return this.priceFormat(rowData.YiShou);
-      if (field === "YaoQingHan") return this.priceFormat(rowData.YaoQingHan);
-      if (field === "CheZi") return this.priceFormat(rowData.CheZi);
-      if (field === "CarExpectedCost") return this.priceFormat(rowData.CarExpectedCost);
-      if (field === "JiPiao") return this.priceFormat(rowData.JiPiao);
-      if (field === "GuoNeiLianYunJiPiao") return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
-      if (field === "AirLossIncome") return this.priceFormat(rowData.AirLossIncome);
-      if (field === "AirServiceCharge") return this.priceFormat(rowData.AirServiceCharge);
-      if (field === "Visa") return this.priceFormat(rowData.Visa);
-      if (field === "TiCheng") return this.priceFormat(rowData.TiCheng);
+        return this.moneyFormatN(rowData.PingTaiShuiJin);
+      if (field === "DaiShou") return this.moneyFormatN(rowData.DaiShou);
+      if (field === "ZaiTu") return this.moneyFormatN(rowData.ZaiTu);
+      if (field === "RealIncome") return this.moneyFormatN(rowData.RealIncome);
+      if (field === "YiShou") return this.moneyFormatN(rowData.YiShou);
+      if (field === "YaoQingHan") return this.moneyFormatN(rowData.YaoQingHan);
+      if (field === "CheZi") return this.moneyFormatN(rowData.CheZi);
+      if (field === "CarExpectedCost") return this.moneyFormatN(rowData.CarExpectedCost);
+      if (field === "JiPiao") return this.moneyFormatN(rowData.JiPiao);
+      if (field === "GuoNeiLianYunJiPiao") return this.moneyFormatN(rowData.GuoNeiLianYunJiPiao);
+      if (field === "AirLossIncome") return this.moneyFormatN(rowData.AirLossIncome);
+      if (field === "AirServiceCharge") return this.moneyFormatN(rowData.AirServiceCharge);
+      if (field === "Visa") return this.moneyFormatN(rowData.Visa);
+      if (field === "TiCheng") return this.moneyFormatN(rowData.TiCheng);
       if (field === "CompensationMoney")
-        return this.priceFormat(rowData.CompensationMoney);
-      if (field === "QiTa") return this.priceFormat(rowData.QiTa);
-      if (field === "DiJieZhiChu") return this.priceFormat(rowData.DiJieZhiChu);
-      if (field === "DiJieShouRu") return this.priceFormat(rowData.DiJieShouRu);
-      if (field === "ZiFei") return this.priceFormat(rowData.ZiFei);
+        return this.moneyFormatN(rowData.CompensationMoney);
+      if (field === "QiTa") return this.moneyFormatN(rowData.QiTa);
+      if (field === "DiJieZhiChu") return this.moneyFormatN(rowData.DiJieZhiChu);
+      if (field === "DiJieShouRu") return this.moneyFormatN(rowData.DiJieShouRu);
+      if (field === "ZiFei") return this.moneyFormatN(rowData.ZiFei);
       if (field === "MianShuiDian")
-        return this.priceFormat(rowData.MianShuiDian);
+        return this.moneyFormatN(rowData.MianShuiDian);
       if (field === "XiaoFeiShouRu")
-        return this.priceFormat(rowData.XiaoFeiShouRu);
+        return this.moneyFormatN(rowData.XiaoFeiShouRu);
       if (field === "YongJinShouRu")
-        return this.priceFormat(rowData.YongJinShouRu);
-      if (field === "YingFu") return this.priceFormat(rowData.YingFu);
-      if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
+        return this.moneyFormatN(rowData.YongJinShouRu);
+      if (field === "YingFu") return this.moneyFormatN(rowData.YingFu);
+      if (field === "MaoLi") return this.moneyFormatN(rowData.MaoLi);
       // if (field === "MaoLiRate") return rowData.MaoLiRate;
-      if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
+      if (field === "ShiJiLiRun") return this.moneyFormatN(rowData.ShiJiLiRun);
       if (field === "TransportCost")
-        return this.priceFormat(rowData.TransportCost);
+        return this.moneyFormatN(rowData.TransportCost);
       if(field === "UnionExtraMoney")
-      return this.priceFormat(rowData.UnionExtraMoney);
+      return this.moneyFormatN(rowData.UnionExtraMoney);
         if (field === "UnionTiCheng")
-        return this.priceFormat(rowData.UnionTiCheng);
-      if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
+        return this.moneyFormatN(rowData.UnionTiCheng);
+      if (field === "YingYeE") return this.moneyFormatN(rowData.YingYeE);
       if (field === "AverageIncome")
-        return this.priceFormat(rowData.AverageIncome);
-      if (field === "AverageCost") return this.priceFormat(rowData.AverageCost);
+        return this.moneyFormatN(rowData.AverageIncome);
+      if (field === "AverageCost") return this.moneyFormatN(rowData.AverageCost);
       if (field === "AverageProfit")
-        return this.priceFormat(rowData.AverageProfit);
+        return this.moneyFormatN(rowData.AverageProfit);
     },
     setFooterCellClass(rowIndex, colIndex, value) {
       if (colIndex === 0) {
@@ -3195,21 +3187,6 @@ export default {
         return "footer-cell-class-name-normal";
       }
     },
-    priceFormat(value) {
-      if (value == null) {
-        return 0.0;
-      }
-      let nStr = value.toFixed(2);
-      nStr += "";
-      let x = nStr.split(".");
-      let x1 = x[0];
-      let x2 = x.length > 1 ? "." + x[1] : "";
-      var rgx = /(\d+)(\d{3})/;
-      while (rgx.test(x1)) {
-        x1 = x1.replace(rgx, "$1" + "," + "$2");
-      }
-      return x1 + x2;
-    },
     columnCellClass(rowIndex, columnName, rowData) {
        if(rowData.YingShou < 0 && columnName=="YingShou"){
         return "column-cell-class-name-test-red"