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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2629,6 +2629,46 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         });
+        this.columns.splice(26, 0, {
+          field: "RoomExpectedCost",
+          formatter: this.moneyFormat,
+          title: "预估房费",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        });
+        this.columns.splice(28, 0, {
+          field: "MealExpectedCost",
+          formatter: this.moneyFormat,
+          title: "预估餐费",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        });
+        this.columns.splice(30, 0, {
+          field: "TicketExpectedCost",
+          formatter: this.moneyFormat,
+          title: "预估门票",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        });
+        this.columns.splice(32, 0, {
+          field: "AirExpectedCost",
+          formatter: this.moneyFormat,
+          title: "预估机票",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        });
     }
 
     this.columnsOld = this.columns;