no message

src/components/Ticketing/flightPerformance.vue

@@ -40,6 +40,16 @@
   <div class="flexOne flightPerformance">
     <div class="query-box">
       <ul>
+        <li>
+          <em>出团公司</em>
+          <!-- S_CheckBranchOrder -->
+          <el-select v-model="msg.OutBranchId" size="mini" @change="getList"
+          :disabled="false">
+              <el-option label="不限" :value="-1"></el-option>
+              <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
+                  :value="item.Id"></el-option>
+          </el-select>
+      </li>
         <li>
           <span>
             <em>操作人</em>
@@ -217,12 +227,14 @@
 export default {
   data() {
     return {
+      BranchList: [],
       msg: {
         LineId: 0, //线路编号
         OutBranchId: -1, //出团公司
         AirLineID: 0, //航空公司编号
         CreateBy: 0, //操作人
-        QMonth: "" //月份
+        QMonth: "", //月份
+        OutBranchId: -1,
       },
       //单机票百分比
       singlePercent:0.1,
@@ -235,10 +247,9 @@ export default {
     };
   },
   mounted() {
+    this.getCompanyList()
     this.getEmployeeList();
-    if (this.$route.query.UserId) {
-      this.msg.CreateBy = Number(this.$route.query.UserId);
-    }
+    this.msg.CreateBy = this.$route.query.UserId?Number(this.$route.query.UserId):0;
     if (this.$route.query.Periods) {
       var str = this.$route.query.Periods;
       this.msg.QMonth = str.substring(0, 4) + "-" + str.substring(4);
@@ -251,10 +262,32 @@ export default {
             : date.getMonth() + 1;
       this.msg.QMonth = y + "-" + m;
     }
+    this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1;
     this.initAirlines();
     this.getList();
   },
   methods: {
+    //初始化公司
+    getCompanyList() {
+        let userInfo = this.getLocalStorage();
+        var RB_Group_id = userInfo.RB_Group_id;
+        let msg = {
+            Status: 0,
+            is_show: 0,
+            RB_Group_Id: RB_Group_id
+        };
+        this.apipost(
+          "admin_get_BranchGetList",
+          msg,
+          res => {
+              if (res.data.resultCode == 1) {
+                  this.BranchList = res.data.data;
+
+              }
+          },
+          err => { }
+        );
+      },
     //单卖机票计算
     getSingleCount(list) {
       let count = 0;

src/components/administrative/AirticketCommission.vue

@@ -10,6 +10,16 @@
   <div class="flexOne">
     <div class="query-box">
       <ul>
+        <li>
+          <em>出团公司</em>
+          <!-- S_CheckBranchOrder -->
+          <el-select v-model="msg.OutBranchId" size="mini" @change="getList(1)"
+          :disabled="false">
+              <el-option label="不限" :value="-1"></el-option>
+              <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
+                  :value="item.Id"></el-option>
+          </el-select>
+      </li>
         <li>
           <input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
         </li>
@@ -19,6 +29,8 @@
       <tr>
         <th>期数</th>
         <th>提成总金额</th>
+        <th>所属公司提成</th>
+        <th>财务单据</th>
         <th>{{$t('admin.admin_czPerson')}}</th>
         <th>日期</th>
         <th>{{$t('system.table_operation')}}</th>
@@ -26,6 +38,21 @@
       <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.Periods}}</td>
         <td>{{item.SumPrice}}</td>
+        <td>
+          <template v-if="item.BranchCommission">
+            {{item.BranchCommission}}
+          </template>
+        </td>
+        <td>
+          <template v-if="item.FinanceIdList">
+            <span v-for="(x,y) in item.FinanceIdList" >
+              <span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
+                  {{x}}
+              </span>
+              {{item.FinanceIdList.length == y+1 ?'':'、'}}
+            </span>
+          </template>
+        </td>
         <td>{{item.CreateByName}}</td>
         <td>{{item.CreateTimeStr}}</td>
         <td>
@@ -34,7 +61,7 @@
               icon="iconfont icon-chakan" circle></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="制单" placement="top">
-            <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button>
+            <el-button type="primary" class="CM_look" @click="goUrlZD(item)" icon="iconfont icon-caidan-fill" circle></el-button>
           </el-tooltip>
         </td>
       </tr>
@@ -50,9 +77,11 @@
   export default {
     data() {
       return {
+        BranchList: [],
         msg: {
           PageIndex: 1,
-          PageSize: 20
+          PageSize: 20,
+          OutBranchId: -1
         },
         loading: false,
         //数据源
@@ -64,12 +93,56 @@
       }
     },
     mounted() {
+      this.getCompanyList()
       this.GetAuth();
       this.getList();
     },
     methods: {
-      goUrlZD(){
+      gofinancialdetail(item){
+          let arr = item.split('-')
+          this.$router.push({
+              name: 'FinancialDocumentsDetail',
+              query: {
+              id: arr[0],
+              blank: 'y',
+              tab: '单据详情'
+              }
+          })
+      },
+      //初始化公司
+      getCompanyList() {
+        let userInfo = this.getLocalStorage();
+        var RB_Group_id = userInfo.RB_Group_id;
+        let msg = {
+            Status: 0,
+            is_show: 0,
+            RB_Group_Id: RB_Group_id
+        };
+        this.apipost(
+          "admin_get_BranchGetList",
+          msg,
+          res => {
+              if (res.data.resultCode == 1) {
+                  this.BranchList = res.data.data;
+
+              }
+          },
+          err => { }
+        );
+      },
+      goUrlZD(item){
+        let Money = item.BranchCommission
+        if(this.msg.OutBranchId==-1){
+          this.Error("请选择出团公司再制单!")
+          return;
+        }
+        if(Money<=0){
+          this.Error("所属公司提成为0不能制单!")
+          return;
+        }
         let orderObj = {
+          OtherType: 78,
+          ReFinanceId: item.Periods,
           OrderID: 0,
           OrderSource: 8,
           Obj: {},
@@ -103,7 +176,10 @@
         });
       },
       //获取数据
-      getList() {
+      getList(PageIndex) {
+        if(PageIndex){
+          this.msg.PageIndex = PageIndex
+        }
         this.loading = true;
         this.apipost(
           "AirTicketRules_post_GetAirticketCommissionPageList",
@@ -150,4 +226,4 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>