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

src/assets/utils/commonUtils.js

@@ -414,8 +414,18 @@ var commonUtils = {
     }
     myDate = myDate.setDate(myDate.getDate() + day);
     myDate = new Date(myDate);
-    //返回年月日
-    return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
+    var seperator1 = "-";
+    var year = myDate.getFullYear();
+    var month = myDate.getMonth() + 1;
+    var strDate = myDate.getDate();
+    if (month >= 1 && month <= 9) {
+        month = "0" + month;
+    }
+    if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+    }
+    var currentdate = year + seperator1 + month + seperator1 + strDate;
+    return currentdate;
   }
 
 }

src/components/FinancialModule/addFinancialProcess.vue

@@ -278,7 +278,7 @@
 							</el-option>
 						</el-select>
 					</div> -->
-					<div class="approval_layer_info" v-if="approvalType==5||approvalType==6||approvalType==7||approvalType==8 || approvalType==9||approvalType==10">
+					<div class="approval_layer_info" v-if="approvalType==5||approvalType==6||approvalType==7||approvalType==8 || approvalType==9||approvalType==10||approvalType==11">
 						<div style="margin: 10px 0;">
 							<el-radio-group v-model="AuditWay">
 								<el-radio :label="2">{{$t('fnc.huiquandetail')}}</el-radio>
@@ -613,6 +613,10 @@ export default {
 				id:10,
 				name:"分公司OP"
 				},
+				{
+				id:11,
+				name:"总部线控"
+				},
 			],
       		accListMsg:[],
 			SpecialNodeSelectType:'',
@@ -1267,6 +1271,16 @@ export default {
 				this.myAuditList[this.updateItemIndex]=AuditList;
 
 			}
+			if(type==11){//总部线控
+				AuditList.AuditType = 11;
+				AuditList.RoleOrInitiator = '';
+				AuditList.AuditWay = this.AuditWay;
+				AuditList.Sort = this.myAuditList.length + 1;
+				AuditList.AuditDescription = this.AuditDescription;
+				AuditList.SpecialNode = this.GetNodeValue;
+				this.myAuditList[this.updateItemIndex]=AuditList;
+
+			}
 		    if(type==8){//记账负责人
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")
@@ -1331,7 +1345,7 @@ export default {
 				this.showRole.push({DepartmentName:obj.AduitName,Id:obj.RoleOrInitiator})
 				this.SpecialNodeSelectType = obj.AuditType;
 			}
-			if(obj.AuditType==5||obj.AuditType==6||obj.AuditType==7 || obj.AuditType==8 || obj.AuditType==9||obj.AuditType==10){
+			if(obj.AuditType==5||obj.AuditType==6||obj.AuditType==7 || obj.AuditType==8 || obj.AuditType==9||obj.AuditType==10||obj.AuditType==11){
 				this.AuditWay=obj.AuditWay;
 				this.WindowID = obj.RoleOrInitiator;
 				this.SpecialNodeSelectType = obj.AuditType;
@@ -1533,6 +1547,15 @@ export default {
 				AuditList.AuditDescription = this.AuditDescription;
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
+			}	
+			if(type==11){//总部线控
+				AuditList.AuditType = 11;
+				AuditList.RoleOrInitiator = '';
+				AuditList.AuditWay = this.AuditWay;
+				AuditList.Sort = this.myAuditList.length + 1;
+				AuditList.AuditDescription = this.AuditDescription;
+				AuditList.SpecialNode = this.GetNodeValue;
+				this.myAuditList.push(AuditList);
 			}	
 				if(type==8){//记账出纳
 				// if(!this.WindowID){

src/components/Hotel/HotelProductManage2.vue

@@ -187,7 +187,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单间成本价" prop="SingleroomPrice">
+            <el-form-item label="自然单间成本价" prop="SingleroomPrice">
               <el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number>
             </el-form-item>
           </el-col>
@@ -424,7 +424,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单间成本价" prop="SingleroomPrice">
+            <el-form-item label="自然单间成本价" prop="SingleroomPrice">
               <el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number>
             </el-form-item>
           </el-col>

src/components/SalesModule/productQuery.vue

@@ -707,6 +707,14 @@
               <p><span>出发城市</span>{{item.StartCityName}}</p>
               <p><span>返回城市</span>{{item.ReturnArriveCityName}}</p>
               <p><span>出团公司</span>{{item.OutBranchName}}</p>
+              <p  v-show="item.ClearOrderHour>0">
+                    <span>同行清位时间</span>
+                    <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
+              </p>
+              <p  v-show="item.SaleClearOrderHour&&item.SaleClearOrderHour>0">
+                    <span>销售清位时间</span>
+                    <span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
+              </p>
                <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -88,7 +88,16 @@
         <tr v-for="(subItem,subIndex) in item" :class="{'redTr':subItem.VisaState==1}">
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount">{{index+1}}</td>
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount"></td>
-          <td>{{getHouseTypeStr(subItem)}}</td>        
+          <td>
+            <!--自然单间   指定单间（单房差）-->
+            <template v-if="subItem.SingleRoomType==subItem.HouseType">
+               {{getHouseTypeStr(subItem.HouseType)}} 
+            </template>
+            <template v-else>
+              {{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
+            </template>
+            <template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
+          </td>        
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
           <td>{{subItem.EName}}</td>
@@ -126,6 +135,8 @@ export default {
         OrderId: 0,
         currentPage: 1
       },
+      IsHaveLeader:1,//1-有领队,0-无领队
+      IsLeaderGuide:0,//1-领兼导,0-领队
       TCID: 0,
       QueryMsg: {
         loading: true,
@@ -162,19 +173,19 @@ export default {
       return str;
     },
     //获取房间类型
-    getHouseTypeStr(item) {
+    getHouseTypeStr(HouseType) {
       var str = "";
-      if (item.HouseType == 1) {
-        str = "单间";
-      } else if (item.HouseType == 2) {
+      if (HouseType == 1) {
+        str = "自然单间";
+      } else if (HouseType == 2) {
         str = "标准双人间";
-      } else if (item.HouseType == 3) {
+      } else if (HouseType == 3) {
         str = "大床房";
       } 
-      else if (item.HouseType == 4) {
+      else if (HouseType == 4) {
         str = "三人间";
       } 
-      else if (item.HouseType== 5) {
+      else if (HouseType== 5) {
         str = "拼凑双人间";
       } 
       else {
@@ -190,8 +201,11 @@ export default {
         this.msg,
         res => {
           this.QueryMsg.loading = false;
+          console.log(res.data.data);
           if (res.data.resultCode == 1) {
-            this.QueryMsg.dataList = res.data.data.pageData;
+            this.QueryMsg.dataList = res.data.data.pageData.result;
+            this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
+            this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
           }
         },
         err => {}

src/components/commonPage/comCheckHotelV2.vue

@@ -110,7 +110,7 @@
       </table>
     </div>
     <div>
-      <el-tabs type="border-card" v-loading="loading" v-if="IsShow">
+      <el-tabs type="border-card" v-loading="loading" v-if="qHotelType==1">
         <el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode">
           <div class="clearfix comCheckHotelV2">
             <div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList">
@@ -124,6 +124,36 @@
           </div>
         </el-tab-pane>
       </el-tabs>
+      <template v-else>
+        <table v-loading="loading" >
+          <thead>
+            <tr>
+              <th>选择</th>
+              <th>酒店名称</th>
+              <th>价格</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="item in ThirdHotelList">
+              <td width="50">
+                <input :id="item.hotelId" type="checkbox" />
+              </td>
+              <td width="150">{{item.hotelName}}</td>
+              <td width="150">{{item.lowrateTotal}}</td>
+            </tr>
+          </tbody>
+          <tfoot>
+            <tr>
+              <td colspan="3">
+                <el-pagination v-if="thirdHotelMsg.numberOfResultMatched>0" background @current-change="handleCurrentChange"
+                  :current-page.sync="thirdHotelMsg.displayFrom" :page-size="thirdHotelMsg.numberOfResults"
+                  layout="total,prev, pager, next, jumper" :total="thirdHotelMsg.numberOfResultMatched">
+                </el-pagination>
+              </td>
+            </tr>
+          </tfoot>
+        </table>
+      </template>
     </div>
     <input type="button" class="normalBtn com_SaveBtn" @click="sendCkedHotel()" value="保存" />
   </div>
@@ -142,6 +172,34 @@
           Name: "", //酒店名称
           UseDate: "", //入住时间
         },
+        thirdHotelMsg: {
+          displayFrom: 1, //当前页
+          numberOfResults: 5, //每页条数
+          numberOfResultMatched: 0, //总条数
+          arrivalDate: "", //入住时间
+          departureDate: "", //离店时间
+          //房间信息列表
+          searchroomGroup: [{
+            numberOfAdults: 1, //大人数,
+            numberOfChildren: 0, //儿童数
+            childAges: 0, //儿童年龄
+            roomNum: 1, //房间数
+          }],
+          searchHotelIdList: [], //酒店id，[1,2,3]
+          freeword: "", //关键字
+          //类型 1，地区，2-酒店名称
+          freewordType: 0,
+          reviewRatingUpperLimits: 0, //指定评论分数的上限
+          reviewRatingLowerLimits: 0, //指定评论分数的下限
+          searchHotelCategory: [], //酒店分类
+          searchHotelFeatures: [], //酒店的特征
+          searchRoomType: [], //类型的房间
+          searchMealType: [], //饮食条件搜索
+          searchMinRate: 0, //検索最小金額,
+          searchMinRate: 0, //検索最大金額
+          sort: 0, //排序
+        },
+        ThirdHotelList: [], //第三方酒店列表
         IsShow: false,
         ckedHotel: {}
       };
@@ -152,88 +210,88 @@
         this.IsShow = false;
         this.dataList = [];
         this.HotelList = [];
+        this.ThirdHotelList=[];
         //地接酒店
         if (this.qHotelType == 1) {
-          this.apipost('hotel_post_GetHasStockHotelList_V2', {
-            //1-只查询有库存的酒店
-            IsMoreThanZero: 0,
-            Country: "651",
-            IsAllHotel: 1,
-            Province: this.qMsg.ProvinceId,
-            Name: this.qMsg.Name,
-            sDate: this.qMsg.UseDate
-          }, res => {
-            this.loading = false;
-            this.IsShow = true;
-            if (res.data.resultCode == 1) {
-              this.dataList = res.data.data;
-              this.dataList.forEach(x => {
-                x.HotelList.forEach(y => {
-                  y.isChecked = false;
-                })
-              })
-            } else {
-              this.Error(res.data.message)
-            }
-          }, err => {})
+          this.GetDMCHotelList();
         }
         //第三方酒店
         else {
-          var nQMsg = {
-            displayFrom: "1", //当前页
-            numberOfResults: "10", //每页条数
-            arrivalDate: this.qMsg.UseDate, //入住时间
-            departureDate: "", //离店时间
-            //房间信息列表
-            searchroomGroup: {
-              numberOfAdults: 2, //大人数,
-              numberOfChildren: 0, //儿童数
-              childAges: 0, //儿童年龄
-            },
-            searchHotelIdList:[],//酒店id，[1,2,3]
-            freeword:this.qMsg.Name,//关键字
-            //类型 1，地区，2-酒店名称
-            freewordType:0,
-            reviewRatingUpperLimits:0,//指定评论分数的上限
-            reviewRatingLowerLimits:0,//指定评论分数的下限
-            searchHotelCategory:[],//酒店分类
-            searchHotelFeatures:[],//酒店的特征
-            searchRoomType:[],//类型的房间
-            searchMealType:[],//饮食条件搜索
-            searchMinRate:0,//検索最小金額,
-            searchMinRate:100000,//検索最大金額
-            sort:0,//排序
-          };
-          if(nQMsg.arrivalDate=="")
-          {
-            this.Info("请选择入住时间!");
-            return;
-          }
-          else
-          {
-             nQMsg.departureDate=this.$commonUtils.AddDay(nQMsg.arrivalDate,1);
-          }
-          if(nQMsg.freeword!="")
-          {
-             nQMsg.freewordType=1;
-          }
-          else
-          {
-            nQMsg.freewordType=2;
-            nQMsg.freeword="";
+          this.GetThirdHotelList();
+        }
+      },
+      //查询地接酒店
+      GetDMCHotelList() {
+        this.apipost('hotel_post_GetHasStockHotelList_V2', {
+          //1-只查询有库存的酒店
+          IsMoreThanZero: 0,
+          Country: "651",
+          IsAllHotel: 1,
+          Province: this.qMsg.ProvinceId,
+          Name: this.qMsg.Name,
+          sDate: this.qMsg.UseDate
+        }, res => {
+          this.loading = false;
+          this.IsShow = true;
+          if (res.data.resultCode == 1) {
+            this.dataList = res.data.data;
+            this.dataList.forEach(x => {
+              x.HotelList.forEach(y => {
+                y.isChecked = false;
+              })
+            })
+          } else {
+            this.Error(res.data.message)
           }
-          console.log("nQMsg",nQMsg);
-          //多了一个参数调用线上的就酒店数据
-          this.apipost('dmc_post_Get_GetJAPAN_HotelList', nQMsg, res => {
-            this.loading = false;
-            this.IsShow = true;
-            if (res.data.resultCode == 1) {
-               console.log("res.data",res.data);
+        }, err => {})
+      },
+      //查询第三方酒店
+      GetThirdHotelList() {
+        this.thirdHotelMsg.arrivalDate=this.qMsg.UseDate;
+        if (this.thirdHotelMsg.arrivalDate == "") {
+          this.Info("请选择入住时间!");
+          return;
+        } else {
+          this.thirdHotelMsg.departureDate = this.$commonUtils.AddDay(this.thirdHotelMsg.arrivalDate, 1);
+        }
+        this.thirdHotelMsg.freeword=this.qMsg.Name;
+        if (this.thirdHotelMsg.freeword == "") {
+          this.thirdHotelMsg.freewordType = 1;
+          if (this.qMsg.ProvinceId > 0) {
+            //获取当前选中的对象
+            let obj = {};
+            obj = this.ProvinceList.find(item => {
+              return item.ID === this.qMsg.ProvinceId; //筛选出匹配数据
+            });
+            if (obj != undefined) {
+              this.thirdHotelMsg.freeword = obj.Name;
             } else {
-              this.Error(res.data.message)
+              this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
             }
-          }, err => {},true)
+          } else {
+            this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
+          }
+        } else {
+          this.thirdHotelMsg.freewordType = 2;
+          this.thirdHotelMsg.freeword = this.qMsg.Name;
         }
+        //多了一个参数调用线上的就酒店数据
+        this.apipost('dmc_post_Get_GetJAPAN_HotelList', this.thirdHotelMsg, res => {
+          this.loading = false;
+          this.IsShow = true;
+          if (res.data.resultCode == 1) {
+            //总条数
+            this.thirdHotelMsg.numberOfResultMatched = Number(res.data.data.numberOfResultMatched);
+            this.ThirdHotelList = res.data.data.hotelSummary;
+          } else {
+            this.Error(res.data.message)
+          }
+        }, err => {}, true)
+      },
+
+      handleCurrentChange(val) {
+        this.thirdHotelMsg.displayFrom = val;
+        this.GetThirdHotelList();
       },
       getCheck(hotelList, index) {
         hotelList.forEach((x, subIndex) => {