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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -699,6 +699,21 @@ Vue.component("GuestNum", {
     }
   }
 });
+Vue.component("ManNum", {
+  // 人数
+  template: `<span>{{rowData.ManNum}}/{{rowData.WoManNum}}</span>`,
+  props: {
+    rowData: {
+      type: Object
+    },
+    field: {
+      type: String
+    },
+    index: {
+      type: Number
+    }
+  }
+});
 Vue.component("Transport", {
   //  是否联运团
   template: `<span><span v-if="rowData.Is_Transport==='是'" style="color: red;">{{rowData.Is_Transport}}</span><span v-else>{{rowData.Is_Transport}}</span></span>`,
@@ -972,6 +987,24 @@ export default {
           isResize: true,
           componentName: "GuestNum"
         },
+        {
+          field: "ManNum",
+          title: "男/女",
+          width: 50,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "ManNum"
+        },
+        {
+          field: "AgeAvg",
+          title: "平均年龄",
+          width: 50,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "YaoQingHan",
           formatter: this.moneyFormat,
@@ -1112,6 +1145,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "YongJinShouRuAvg",
+          formatter: this.moneyFormat,
+          title: "平均佣金收入",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "YingFu",
           formatter: this.moneyFormat,