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

src/components/FinancialModule/OpComPersonDetails.vue

@@ -5,6 +5,20 @@
   <div class="flexOne currentManage">
        <div class="query-box">
            <ul>
+               <li>
+                    <span>
+                       <em>公司别</em>
+                        <el-select filterable v-model="msg.RB_Branch_Id" :placeholder="$t('system.ph_choice')">
+                            <el-option label="不限" :value="-1"></el-option>
+                            <el-option
+                                v-for="item in companyList"
+                                :label="item.BName"
+                                :value="item.Id"
+                                :key="item.Id"
+                            ></el-option>
+                        </el-select>
+                   </span>
+               </li>
                <li>
                    <span>
                        <em>员工</em>
@@ -106,18 +120,21 @@
                     PeriodsId:"",
                     TCID:"",
                     TCNUM:"",
+                    RB_Branch_Id:-1
                 },
                 DataList:[],
                 loading:false,
                 currentPage:1,
                 total:0,
                 EmployeeList:[],
+                companyList:[]
 			}
 		},created(){        
             this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
             this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
         },
         mounted(){
+            this.getCompany();
             this.getEmployeeList();
             this.getList();
         },
@@ -161,7 +178,29 @@
                     }
                 }, err => {})
             },
-           
+            //获取公司下拉
+            getCompany() {
+                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.companyList = res.data.data
+                    }else{
+                        this.Error(res.data.message);
+                    }
+                },
+                err => {}
+                )
+            },
+
             getEmployeeList () {
                 let userInfo = this.getLocalStorage()
                 let msg = {

src/components/Ticketing/flightManagement.vue

@@ -639,7 +639,7 @@
 
       checkIsRightTime(time,type){
           let arrTime = time.split(':');
-          if (arrTime[1]>24 || arrTime[2]>60)
+          if (arrTime[0]>=24 || arrTime[1]>=60)
           {
               if(type==1){
                 this.Error('请输入正确的起飞时间格式！');