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

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -1223,7 +1223,8 @@ export default {
         EmployeeId: this.userId,
         Year: this.year,
         sharelist: [],
-        BranchId: this.msg.BranchId,
+        // BranchId: this.msg.BranchId,
+        ...this.msg
       }
       this.monthList.forEach(x=>{
         let obj = {

src/components/SalesModule/addPassenger.vue

@@ -314,7 +314,7 @@
               <el-input v-model="addMsg.Remarks" type="text" size=mini class="w230" maxlength="1000"></el-input>
             </el-form-item>
           </li>
-          <li>
+          <!-- <li>
             <el-form-item label="出游类型" prop="TravelType">
               <el-select v-model="addMsg.TravelType" filterable size=mini class="w230">
                 <el-option v-for="item in TravelTypeList" :key="item.Code" :label="item.Content" :value="item.Code">
@@ -337,7 +337,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </li>
+          </li> -->
           <li>
             <el-form-item label="高校学生">
               <el-checkbox v-model="addMsg.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>

src/components/SalesVisa/components/visaOrderList.vue

@@ -1579,7 +1579,7 @@
       },
       GetOPEmpList() {
         let userInfo = this.getLocalStorage();
-        this.apipost('admin_get_EmployeeGetList', {GroupId: userInfo.RB_Group_id,DepartmentId:232}, res => {
+        this.apipost('admin_get_EmployeeGetList', {GroupId: userInfo.RB_Group_id,DepartmentId:232,IsLeave:-1}, res => {
           if (res.data.resultCode == 1) {
             this.OPEmpList = res.data.data;
           }