新增机票按公司查询

src/components/EditTemplate.vue

@@ -477,7 +477,7 @@
         <span class="ql-formats" v-if="toolbar.font">
           <select class="ql-font">
             <option selected="selected"></option>
-            <option :value="item" v-for="item in fonts"></option>
+            <option :value="item" v-for="(item,fIndex) in fonts" :key="fIndex"></option>
           </select>
         </span>
         <span class="ql-formats" v-if="toolbar.align">

src/components/Ticketing/TicketManager.vue

@@ -1327,17 +1327,7 @@
             </el-select>
           </span>
         </li>
-        <li>
-          <span>
-            <em>航班日期</em>
-            <el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date" :picker-options="beforeCheck"
-              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
-            </el-date-picker>
-            <span class="_ln">-</span>
-            <el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
-              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
-          </span>
-        </li>
+        
         <li>
           <span>
             <em>{{$t('admin.admin_czPerson')}}</em>
@@ -1413,6 +1403,27 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>公司</em>
+            <el-select class="w180 multiple_input" v-model="msg.BId" clearable>
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+              <el-option v-for="item in BranchList" :key="item.Id" :label="item.BName" :value="item.Id">
+              </el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>航班日期</em>
+            <el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date" :picker-options="beforeCheck"
+              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
+            </el-date-picker>
+            <span class="_ln">-</span>
+            <el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
+              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
+          </span>
+        </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
@@ -1591,7 +1602,8 @@
                 <el-col :span="4" class="vmiddle">
                   <div class="TK_raduis">
                     <ul>
-                      <li style="margin:4px 0 0 0;min-width:10px;color:green;">{{$t('objFill.v101.DomesticModule.shou')}}</li>
+                      <li style="margin:4px 0 0 0;min-width:10px;color:green;">
+                        {{$t('objFill.v101.DomesticModule.shou')}}</li>
                       <!--一定-->
                       <li v-if="item.FirstDeposit!=''">
                         <div @click="goFinacePageOne(item,1,1)" :class="getClass(item.FirstDepositStatus)">
@@ -1970,8 +1982,8 @@
               <span
                 v-if="Number(item.B2BPrice)<Number(item.CostPrice) || Number(item.B2BPrice)==Number(item.CostPrice) || Number(item.B2CPrice)<Number(item.CostPrice)|| Number(item.B2CPrice)==Number(item.CostPrice)"
                 style="margin-left:10px;color:red">小程序价格未维护</span>
-                <span v-if="item.TravelTicketType && item.TravelTicketType>0" style="margin-left:20px;color:deepskyblue">
-                  {{item.TravelTicketType==1?'团票':item.TravelTicketType==2?'散票':''}}
+              <span v-if="item.TravelTicketType && item.TravelTicketType>0" style="margin-left:20px;color:deepskyblue">
+                {{item.TravelTicketType==1?'团票':item.TravelTicketType==2?'散票':''}}
               </span>
             </el-row>
             <el-row :gutter="0">
@@ -1983,7 +1995,7 @@
                   <span v-show="item.PriceList==null ||item.PriceList.length==0">{{$t('pub.noMsg')}}</span>
                   <span class="Ticket_TCID" v-for="(subItem,subIndex) in item.PriceList" :key="subIndex">
                     <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'>
-                      ({{subItem.TCID}}){{subItem.TCNUM}} </a>
+                      ({{subItem.TCID}}){{subItem.TCNUM}}【{{subItem.OutBranchName}}】 </a>
                     <a style="color:red;cursor:pointer;" @click="goUrlTicketUnion(subItem.TCID,item.ID)">设置联运</a>
                     <a style="cursor:pointer;" @click="goFinaceDetails(subItem.FinanceId)" v-if="subItem.FinanceId">
                       (折让单:
@@ -2679,7 +2691,8 @@
     <el-dialog width="1000px" :title="BillingChargeTitle" :visible.sync="BillingChargeDialog" center>
       <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px" :disabled="BillingChargeTitle=='开票费用详情'">
         <div style="color: red;font-size: 13px;text-align: right;padding: 0 0 5px 0;">
-          注：开票单价*开票数量+升舱增收=总开票金额,<strong>已出团</strong>才能维护开票费用,每月<strong>{{BillingChargeObj.TicketManagerEndDay}}</strong>日之前维护上月的开票费用</div>
+          注：开票单价*开票数量+升舱增收=总开票金额,<strong>已出团</strong>才能维护开票费用,每月<strong>{{BillingChargeObj.TicketManagerEndDay}}</strong>日之前维护上月的开票费用
+        </div>
         <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0"
           cellpadding="0" v-loading="loading">
           <tr>
@@ -2829,6 +2842,7 @@
           IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护
           IsNoTCID: 0, //1未绑定团期  2有机损的取消团期
           TravelTicketType: 0, //团票/散票类型：1-团队，2-散票
+          BId: -1, //出团公司
         },
         maintenanceList: [{
             Name: this.$t('pub.unlimitedSel'),
@@ -2867,7 +2881,7 @@
           SellType: 0, //售卖机票类型：0-团队机票，1-单卖机票
           Remark: "", //备注信息
           B2BSellNum: 0, //可售机票数量
-          TravelTicketType: 1,// 团票/散票： 1团票  2散票
+          TravelTicketType: 1, // 团票/散票： 1团票  2散票
         },
         //去程
         addGoFlight: {
@@ -3060,6 +3074,7 @@
           }]
         },
         userInfo: {}, //当前登录用户
+        BranchList: [], //出团公司
       };
     },
     methods: {
@@ -4381,10 +4396,30 @@
           },
           err => {}
         );
-      }
+      },
+      //初始化公司
+      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;
+            }
+          }
+        );
+      },
     },
     mounted() {
       this.userInfo = this.getLocalStorage();
+      this.getCompanyList();
       var id = this.$route.query.id;
       if (id) {
         this.msg.ID = id;