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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1253,6 +1253,26 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "XiaoFeiFinance",
+          formatter: this.moneyFormat,
+          title: "单据小费",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
+        {
+          field: "XiaoFeiTravelStr",
+          formatter: this.moneyFormat,
+          title: "团队小费",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "YongJinShouRu",
           formatter: this.moneyFormat,
@@ -1839,6 +1859,8 @@ export default {
         "地接款收入",
         "自费收入",
         "小费收入",
+        "单据小费",
+        "团队小费",
         "佣金收入",
         "应付金额",
         "毛利",