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

src/components/FinancialModule/ticketSearch.vue

@@ -14,8 +14,10 @@
         <li>
           <span>
             <em>日期</em>
-            <el-date-picker class="w150" type="date" v-model="msg.QStartDate" :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
-            <el-date-picker class="w150" type="date" v-model="msg.QEndDate" :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <el-date-picker class="w150" type="date" v-model="msg.QStartDate" :picker-options="pickerBeginDateBefore"
+              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <el-date-picker class="w150" type="date" v-model="msg.QEndDate" :picker-options="pickerBeginDateAfter"
+              value-format="yyyy-MM-dd" placeholder></el-date-picker>
           </span>
         </li>
         <li>
@@ -27,7 +29,18 @@
         <li>
           <span>
             <em>团队编号</em>
-            <el-input v-model="msg.TCID" type="text" @keyup.native="checkInteger(msg,'TCID')"  ></el-input>
+            <el-input v-model="msg.TCID" type="text" @keyup.native="checkInteger(msg,'TCID')"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>航空公司</em>
+            <el-select v-model="msg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
+              <el-option :label="$t('system.ph_buxian')" :value="0">
+              </el-option>
+              <el-option v-for="item in  AirlineList" :key="item.AirLineId" :label="item.AlName"
+                :value="item.AirLineId"></el-option>
+            </el-select>
           </span>
         </li>
         <li>
@@ -80,35 +93,37 @@
           QEndDate: '',
           TCNUM: '',
           TCID: '',
+          AirTicketId: 0, //航空公司
           pageIndex: 1,
           pageSize: 15
         },
         dataList: [],
+        AirlineList: [], //航空公司
         currentPage: 1,
         total: 0,
         pickerBeginDateBefore: {
-            disabledDate: time => {
-                if (this.msg.QEndDate == null) {
-                    return false;
-                } else {
-                    let endTime = new Date(this.msg.QEndDate);
-                    return endTime.getTime() < time.getTime();
-                }
+          disabledDate: time => {
+            if (this.msg.QEndDate == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.msg.QEndDate);
+              return endTime.getTime() < time.getTime();
             }
+          }
         },
         pickerBeginDateAfter: {
-            disabledDate: time => {
-                let startTime = new Date(this.msg.QStartDate);
-                return startTime.getTime() >= time.getTime();
-            }
+          disabledDate: time => {
+            let startTime = new Date(this.msg.QStartDate);
+            return startTime.getTime() >= time.getTime();
+          }
         }
       }
     },
     created() {
-
     },
     components: {},
     mounted() {
+      this.getAirlineList();
       this.getList();
     },
     methods: {
@@ -124,6 +139,18 @@
           }
         }, err => {})
       },
+      //获取航空公司
+      getAirlineList() {
+        this.apipost(
+          "airline_post_GetList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.AirlineList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
       //翻页
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
@@ -145,4 +172,5 @@
       },
     }
   }
-</script>
+
\ No newline at end of file
+</script>