1

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -630,15 +630,7 @@
             </el-select>
           </span>
         </li>
-        <li>
-          <span class="hotel_name">
-            <em>{{$t('system.ph_flightTime')}}</em>
-            <DateLimit :clearable="false" :StartGroupDate="Query.QNeedDateStart" :EndGroupDate="Query.QNeedDateEnd" @change="(date)=> Query.QNeedDateStart = date"></DateLimit>
-            <el-date-picker class="w150" v-model="Query.QNeedDateEnd" type="date" value-format="yyyy-MM-dd"
-              placeholder="" :picker-options="pickerBeginDateAfter">
-            </el-date-picker>
-          </span>
-        </li>
+
         <li>
           <span class="hotel_name">
             <em>{{$t('system.query_airCompanyName')}}</em>
@@ -672,6 +664,16 @@
             </el-input>
           </span>
         </li>
+        <li>
+          <span class="hotel_name">
+            <em>{{$t('system.ph_flightTime')}}</em>
+            <DateLimit :clearable="false" :StartGroupDate="Query.QNeedDateStart" :EndGroupDate="Query.QNeedDateEnd"
+              @change="(date)=> Query.QNeedDateStart = date"></DateLimit>
+            <el-date-picker class="w150" v-model="Query.QNeedDateEnd" type="date" value-format="yyyy-MM-dd"
+              placeholder="" :picker-options="pickerBeginDateAfter">
+            </el-date-picker>
+          </span>
+        </li>
         <li>
           <span>
             <em>{{$t('admin.admin_czPerson')}}</em>
@@ -682,6 +684,26 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>{{$t('op.Procurement')}}</em>
+            <el-select class="w150" v-model="Query.PurchaseCreateBy" filterable :placeholder="$t('pub.pleaseSel')" clearable>
+              <el-option :label="$t('pub.unlimitedSel')" :value="0">
+              </el-option>
+              <el-option v-for="(item, index) in AllEmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                :key="index"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('system.query_company')}}</em>
+            <el-select class="w150" v-model="Query.QBranchId" filterable :placeholder="$t('pub.pleaseSel')" clearable>
+              <el-option v-for="(item, index) in companyList" :label="item.BName" :value="item.Id" :key="index">
+              </el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
@@ -808,7 +830,8 @@
                         style="background-color:#909090;color:white;width:26px;" circle>
                         {{$t('op.WEI')}}
                       </el-button>
-                      <el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>{{$t('op.WEI')}}</el-button>
+                      <el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>{{$t('op.WEI')}}
+                      </el-button>
                     </td>
                   </tr>
                   <tr>
@@ -908,7 +931,9 @@
 <script>
   import DateLimit from '../../public/DateLimit.vue';
   export default {
-    components: {DateLimit},
+    components: {
+      DateLimit
+    },
     data() {
       return {
         Query: {
@@ -947,6 +972,8 @@
           //票务人员
           CreateBy: 0,
           SellType: 0, //只查询团队机票
+          QBranchId: "", //出团公司
+          PurchaseCreateBy: 0, //采购人
         },
         //线路列表
         LineList: [],
@@ -987,7 +1014,9 @@
             let startTime = new Date(this.Query.QNeedDateStart);
             return startTime.getTime() >= time.getTime();
           }
-        }
+        },
+        companyList: [], //出团公司
+        AllEmployeeList: [], //全部员工列表
       };
     },
     methods: {
@@ -996,7 +1025,7 @@
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
 
-          }else{
+          } else {
             let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
             this.Query.QNeedDateStart = StartDate
           }
@@ -1052,7 +1081,8 @@
       },
       GetPlaceHolder() {
         this.UseNum_placeholder =
-          this.$t('objFill.v101.zuiduoband') + this.bindAirticket.TotalNum + this.$t('objFill.v101.myOrdersAllType.gejiwei');
+          this.$t('objFill.v101.zuiduoband') + this.bindAirticket.TotalNum + this.$t(
+            'objFill.v101.myOrdersAllType.gejiwei');
       },
 
       //翻页功能按钮
@@ -1129,9 +1159,39 @@
           err => {}
         )
       },
+      //初始化公司
+      getCompanyList() {
+        let userInfo = this.getLocalStorage();
+        let msg = {
+          Status: 0,
+          is_show: 0,
+          RB_Group_Id: userInfo.RB_Group_id,
+        };
+        this.apipost(
+          "admin_get_BranchGetList",
+          msg,
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.companyList = res.data.data;
+            }
+          });
+      },
+      getAllEmployeeList() {
+        this.apipost(
+          "admin_get_EmployeeGetList", {},
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.AllEmployeeList = res.data.data;
+            }
+          });
+      }
+    },
+    created() {
+      this.getCompanyList();
+      this.getAllEmployeeList();
     },
     mounted() {
-      this.Query.QNeedDateStart=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
+      this.Query.QNeedDateStart = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
       this.GetSupperOrderEditAuth()
       this.getEmployeeList();
       this.GetLineList();