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

src/components/Hotel/roomReservations.vue

@@ -2,11 +2,33 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
-
-        <li><span><em>系列</em>
+       <!-- <li>
+         <span>
+            <em>线路</em>
+            <el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
+              </el-option>
+            </el-select>
+          </span>
+        </li> -->
+        <li>
+            <span>
+              <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+              <el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
+                @change="getLineTeamList()">
+                <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+                <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
+                  :key="item.LtID"></el-option>
+              </el-select>
+            </span>
+        </li>
+        <li>
+          <span>
+            <em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option label="不限" value='-1'></el-option>
-              <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
               </el-option>
             </el-select>
           </span>
@@ -18,11 +40,57 @@
           </span>
         </li>
         <li><span><em>日期</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateBefore"></el-date-picker>
             -
-            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
+          </span>
+        </li>
+        <li><span>
+          <em>状态</em>
+          <el-select v-model='msg.PriceStatus'>
+             <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+            <el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id" :value="team.Id"  v-if="team.Id==1 || team.Id==3"></el-option>
+          </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>航空公司</em>
+            <el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
+              <el-option :label="$t('system.ph_buxian')" :value="0">
+              </el-option>
+              <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
+                :label="item.AlName" :value="item.AirLineId"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>OP</em>
+          <el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-option :label="$t('pub.unlimitedSel')" :value="0">
+            </el-option>
+            <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
+              :value="item.EmployeeId" :key="item.EmployeeId"></el-option>
+          </el-select>
+          </span>          
+        </li>
+        <li>
+          <span>
+            <em>地接团号</em>
+            <el-input v-model='msg.CombinationNum'></el-input>
           </span>
         </li>
+        <li>
+          <span>
+            <em>出团公司</em>
+            <el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input" :placeholder="$t('pub.pleaseSel')">
+              <el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
+              </el-option>
+            </el-select>
+          </span>
+        </li>
+
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
         </li>
@@ -192,51 +260,57 @@
           pageIndex: 1,
           pageSize: 5,
           SelectType: 1,
-          LineId: 14,
-          LineteamId: "-1",
           StartDate: '',
           EndDate: '',
           //酒店编号
           HotelId: 0,
           //日期
           DateStr: "",
-          //出团公司不限
-          OutBranchId:-1,
+          //出团公司
+          OutBranchIds: [],
+          LineId: 14,
+          PlaceID: 0,
+          LineteamId: 0,
+          //航空公司
+          AirLineId:0,
+          CreateBy:0,
+          TCNUM: '',
+          PriceStatus: 0,
+          CombinationNum:''
         },
-        LineList: [],
-        LineTeamList: [],
         thLengthTitle: [],
         list: [],
         colspanTotal: 0,
         boxHeight: 0,
+        queryCommonData:{
+          //公司数据
+          BranchList: [],
+          //国家
+          PlaceList: [],
+          LineList: [],
+          LineTeamList: [],
+          AirlineList:[],
+          EmployeeList:[],
+        },
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+            if (this.msg.EndDate == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.msg.EndDate)
+              return endTime.getTime() < time.getTime()
+            }
+          }
+        },
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.StartDate)
+            return startTime.getTime() >= time.getTime()
+          }
+        }
       }
     },
     methods: {
-      getLineList() {
-        this.apipost("line_post_GetAllList", {}, res => {
-          if (res.data.resultCode == 1) {
-            this.LineList = res.data.data;
-          } else {
-            this.$message.error(res.data.message);
-          }
-        });
-      },
-      //获取系列列表
-      getLineTeamList(lineId) {
-        this.LineTeamList = [];
-        this.apipost(
-          "team_post_GetList", {
-            lineID: 14,
-            isTOOP: 1
-          },
-          res => {
-            if (res.data.resultCode == 1) {
-              this.msg.LineteamId = "-1";
-              this.LineTeamList = res.data.data;
-            }
-          }
-        );
-      },
       goUrlR(path, obj, title) {
         this.$router.push({
           name: path,
@@ -314,6 +388,98 @@
           }
         }, err => {})
       },
+      getLineList() {
+        this.apipost("line_post_GetAllList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.LineList = res.data.data;
+            this.queryCommonData.PlaceList = []
+            this.queryCommonData.LineTeamList = []
+
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
+      //获取目的地列表
+      getLinePlaceList() {
+        this.msg.PlaceID = 0;
+        this.msg.LineteamId = 0;
+        let msg = {
+          lineID: this.msg.LineId,
+        }
+        this.apipost('team_post_GetLinePlace', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.PlaceList = res.data.data
+            this.queryCommonData.LineTeamList = []
+          }
+        })
+      },
+      //获取系列列表
+      getLineTeamList() {
+        this.msg.LineteamId = 0
+        let msg = {
+          lineID: this.msg.LineId,
+          placeID: this.msg.PlaceID,
+          isTOOP: 1
+        }
+        this.apipost('team_post_GetList', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.LineTeamList = res.data.data
+          }
+        })
+      },
+      //获取航空公司
+      getAirlineList() {
+        this.apipost(
+          'airline_post_GetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.queryCommonData.AirlineList = res.data.data
+            }
+          },
+          err => {}
+        )
+      },
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        let userInfo = this.getLocalStorage()
+        let msg = {
+          GroupId: userInfo.RB_Group_id,
+          BranchId: '-1',
+          DepartmentId: '-1',
+          PostId: '-1',
+          IsLeave: '0'
+        }
+        this.apipost(
+          'admin_get_EmployeeGetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.queryCommonData.EmployeeList = res.data.data
+            }
+          },
+          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.queryCommonData.BranchList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
     },
     mounted() {
       let myDate = new Date();
@@ -339,8 +505,11 @@
       let height = window.innerHeight - 65 - 164
       this.boxHeight = height;
       this.offsetwidth = width
-      this.getList()
-      this.getLineTeamList()
+      this.getLinePlaceList();
+      this.getAirlineList();
+      this.getEmployeeList();
+      this.getCompanyList();
+      this.getList();
     },
   }
 

src/components/Restaurant/bookDinnerStatistics.vue

@@ -434,11 +434,13 @@
   }
 
   .DiningTable tr td {
-    height: 30px;
+    height: 34px;
     border-bottom: 1px solid #ccc;
     border-right: 1px solid #ccc;
   }
-
+  /* .bookDinnerStatisticsTalbe tr td .DiningTable tr:last-child >td{
+    border-bottom:0;
+  } */
   .DiningTable tr td:last-child {
     border-right: none;
   }

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1124,7 +1124,8 @@
       },
       //获取目的地列表
       getLinePlaceList() {
-        this.queryMsg.PlaceID = 0
+        this.queryMsg.PlaceID = 0;
+        this.queryMsg.LineteamId = 0;
         let msg = {
           lineID: this.queryMsg.LineId,
         }

src/components/busManagement/BusInfo.vue

@@ -91,9 +91,6 @@
 
   .busInfoP {
     display: inline-block;
-  }
-
-  .busInfoP :hover {
     text-decoration: underline;
     cursor: pointer;
   }
@@ -171,7 +168,7 @@
       <tfoot>
         <tr>
           <td>车辆类型</td>
-          <td colspan="7" align="left">
+          <td colspan="7" align="left" style="padding-left:5px;">
             <el-select class="w150" placeholder="请选择" v-model="PostData.BusType">
               <el-option :key="0" :value="0" label="请选择"></el-option>
               <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
@@ -500,8 +497,8 @@
         let tempCostFee = 0;
         var tempHighSpeedFee = 0;
         if (obj.BusType) {
+          obj.PayType=1;
           let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
-           
           if (busTypeObj) {
             obj.DetailList.forEach(subItem => {
               //接送价格
@@ -520,6 +517,8 @@
             obj.HighSpeedPrice = tempHighSpeedFee;
             obj.CostPrice = tempCostFee + tempHighSpeedFee;
           }
+        }else{
+          obj.PayType=null;
         }
       },
       AddSubItem(item) {
@@ -594,7 +593,7 @@
         this.apipost('bus_get_SetPlan', this.PostData, res => {
           if (res.data.resultCode == 1) {
             this.Success("保存成功！");
-            this.MsgBus.$emit('msg')
+            this.MsgBus.$emit('msg');
             this.createTableData();
           } else {
             this.Error(res.data.message);

src/components/busManagement/busHandBook.vue

 <style>
   .busManagerTalbe {
-    background: #ccc;
     font-size: 12px;
-  }
+    border-collapse: collapse;
+    background-color: #fff;
+    border: 1px solid #ccc;
 
+  }
   .busManagerTalbe tr {
-    background: #fff;
     text-align: center;
     height: 40px;
   }
   .busManagerTalbe tr td{
     padding:0 5px;
+    background-color: #fff;
+    border: 1px solid #ccc;
   }
   .commonBackColor {
-    background-color: #E6E6E6;
+    background-color: #E6E6E6!important;
     color: #333;
   }
 
@@ -76,12 +79,12 @@
         <td colspan="5" class="comTextAlign"></td>
       </tr>
       <tr>
-        <td class="commonBackColor">日付</td>
-        <td class="commonBackColor">用車状況</td>
-        <td class="commonBackColor">便名</td>
-        <td class="commonBackColor">スケジュール內容</td>
-        <td class="commonBackColor">ホテル</td>
-        <td class="commonBackColor">ホテルTEL</td>
+        <td class="commonBackColor" width="300">日付</td>
+        <td class="commonBackColor" width="150">用車状況</td>
+        <td class="commonBackColor" width="150">便名</td>
+        <td class="commonBackColor" width="500">スケジュール內容</td>
+        <td class="commonBackColor" width="400">ホテル</td>
+        <td class="commonBackColor" width="300">ホテルTEL</td>
       </tr>
       <tr v-for="(subItem,index) in DataObj.Details_Extends">
         <td>
@@ -95,13 +98,13 @@
           <el-input type="text" v-model="subItem.FlightNum" />
         </td>
         <td>
-          <el-input type="text" v-model="subItem.BusContent" />
+          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.BusContent" />
         </td>
         <td>
-          <el-input type="text" v-model="subItem.HotelName" />
+          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelName" />
         </td>
         <td>
-          <el-input type="text" v-model="subItem.HotelTel" />
+          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelTel" />
         </td>
       </tr>
       <tr>