1

src/components/TravelManager/TravelList/TravelPassengerList2.vue

@@ -64,6 +64,7 @@
           </table>
         </li>
         <li>
+          <input type="button" class="normalBtn" value="分房表确认" @click="querenHotel()">
           <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()">
         </li>
       </ul>
@@ -109,7 +110,7 @@
             <el-select v-model="subItem.HouseNo" placeholder="请选择" @change="sortNumberN(subItem, subIndex)">
               <el-option
                 v-for="(hs, hsIndex) in numberList"
-                :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || hs.dis"
+                :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || hs.dis || allDIs"
                 :key="hs.name"
                 :label="hs.name"
                 :value="hs.name">
@@ -119,7 +120,7 @@
           <td>
             <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)">
               <el-option 
-                :disabled="subItem.HouseType == 1 && IsLeaderGuide == 1"
+                :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || allDIs"
                 v-for="(hs, hsIndex) in HouseTypeList"
                 :key="hsIndex"
                 :label="hs.HouseName"
@@ -149,7 +150,7 @@
           <td>{{subItem.VisaTypeStr}} {{subItem.VisaTypeStr==1?'拒签':"正常"}}</td>
         </tr>
       <!-- </template> -->
-      <tr>
+      <tr v-if="!allDIs">
         <td style="text-align:right" colspan="22"><input type="button" value="保存" class="leader2Btn" @click="saveOPSetGuestHouse"></td>
       </tr>
     </table>
@@ -183,9 +184,26 @@ export default {
       HouseTypeList: [],
       numberList: [],
       dataList: [],
+      allDIs: false,
     };
   },
   methods: {
+    // 确认酒店
+    querenHotel: function (){
+      this.apipost(
+        "travel_get_UpdateOpSureHouse",
+        {TCID: this.TCID},
+        res => { 
+          if (res.data.resultCode == 1) {
+            this.$message.success('操作成功')
+            this.getList()
+          }else{ 
+            this.$message.error('操作失败')
+          }
+        },
+        err => {}
+      );
+    },
     // 修改类型
     changeRmType: function (obj, index){
       let list = this.dataList;
@@ -331,6 +349,7 @@ export default {
             this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
             this.houseList = res.data.data.pageData.houseList;
             let disNum = [],numberList = this.numberList;
+            this.allDIs = res.data.data.pageData.houseList.OpSureHouse==2 ? true : false
             list.map(x=>{
               if (x.HouseType == 1 && this.IsLeaderGuide == 1){
                 disNum.push(x.HouseNo)

src/components/TravelManager/TravelList/TravelPassengerList3.vue

@@ -141,7 +141,7 @@
         <tr v-for="(subItem, subIndex) in item.GuestList" :class="{'redTr':subItem.IsLeaderOrder==1}" class="h34">
           <td>{{subIndex+1}}</td>
           <td width="80">
-            <el-select v-model="subItem.HouseNo" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.HouseNo == 1">
+            <el-select v-model="subItem.HouseNomber" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.HouseNo == 1">
               <el-option
                 v-for="(hs, hsIndex) in numberList"
                 :key="hs"
@@ -171,12 +171,49 @@
           <td>{{subItem.PeopleType}}</td>
           <td>{{subItem.GroupTypeStr}}</td>
         </tr>
+        <tr>
+          <td style="text-align:right" colspan="11"><input type="button" value="保存" class="leader2Btn" @click="SetTravelChangeHouseService"></td>
+        </tr>
+        <tr v-if="item.ChangeGuest.length > 0"  class="h34">
+          <td colspan="11"></td>
+        </tr>
+        <tr v-for="(subItem, subIndex) in item.ChangeGuest"  class="h34">
+          <td>{{subIndex+1}}</td>
+          <td width="80">
+            <el-select v-model="subItem.ChangeHouseNum" placeholder="请选择" @change="changeRmType2(subItem, subIndex)">
+              <el-option
+                v-for="(hs, hsIndex) in numberList"
+                :key="hs"
+                :label="hs"
+                :value="hs">
+              </el-option>
+            </el-select> 
+          </td>
+          <td>
+            <el-select v-model="subItem.ChangeHouseType" placeholder="请选择" @change="changeRmType2(subItem, subIndex)">
+              <el-option
+                v-for="(hs, hsIndex) in HouseTypeList"
+                :key="hsIndex"
+                :label="hs.HouseName"
+                :value="hs.HouseType">
+              </el-option>
+            </el-select> 
+          </td>
+          <td>{{subItem.GuestName}}</td>
+          <td>{{'占床'}}</td>
+          <td>{{subItem.ESurName}}</td>
+          <td>{{subItem.EName}}</td>
+          <td>{{getSexStr(subItem)}}</td>
+          <td>{{subItem.Birthday.split('T')[0]}}</td>
+          <td>{{subItem.PeopleType}}</td>
+          <td>{{subItem.GroupTypeStr}}</td>
+        </tr>
       <!-- </template> -->
-      <tr>
-        <td style="text-align:right" colspan="11"><input type="button" value="保存" class="leader2Btn" @click="saveOPSetGuestHouse"></td>
+      <tr v-if="item.ChangeGuest.length > 0">
+        <td style="text-align:right" colspan="11"><input type="button" value="保存" class="leader2Btn" @click="SetTravelChangeHouseService2"></td>
       </tr>
     </table>
-    <div class="noDataNotice" v-if="GuestDataList.length<1">
+    <div class="noDataNotice" v-if="GuestDataList.length < 1">
       <i class="iconfont icon-kong"></i>
       <p>{{$t("active.ld_noData")}}</p>
     </div>
@@ -209,10 +246,48 @@ export default {
       numberList: [],
       HotelList: [],
       GuestDataList: [],
-      editeList: [],
+      editList: [],
+      editList2: [],
+      selectTime: '',
     };
   },
   methods: {
+    SetTravelChangeHouseService2: function (){
+      if (this.editList2.length < 1) {
+        return this.$message.error('请修改房间类型后在保存！')
+      }
+      this.apipost(
+        "travelhouse_post_SetTravelChangeHouseService",
+        this.editList2,
+        res => { 
+          if (res.data.resultCode == 1) {
+            this.$message.success('操作成功')
+            this.getList(this.selectTime)
+          }else{ 
+            this.$message.error('操作失败')
+          }
+        },
+        err => {}
+      );
+    },
+    SetTravelChangeHouseService: function (){
+      if (this.editList.length < 1) {
+        return this.$message.error('请修改房间类型后在保存！')
+      }
+      this.apipost(
+        "travelhouse_post_SetTravelChangeHouseService",
+        this.editList,
+        res => { 
+          if (res.data.resultCode == 1) {
+            this.$message.success('操作成功')
+            this.getList(this.selectTime)
+          }else{ 
+            this.$message.error('操作失败')
+          }
+        },
+        err => {}
+      );
+    },
     changeTime: function (index){
       this.HotelList.map((x, i)=>{ 
         x.active = false;
@@ -220,19 +295,100 @@ export default {
       this.HotelList[index].active = true;
       this.getList(this.HotelList[index].UseTime)
     },
+    changeRmType2: function (obj, index) {
+      let list = this.editList2
+      let msg = {
+        CombineNo: '',
+        HouseType: obj.ChangeHouseType,
+        HouseNum: obj.ChangeHouseNum,
+        OldHouseId: obj.HouseId,
+        GuestId: obj.Id,
+        TravelDate: this.selectTime,
+        HotelId: obj.HotelId,
+        TCID: obj.TCID,
+      }
+      if (!list.length) {
+        list.push(msg)
+      } else {
+        let re = false;
+        for(let i = 0; i < list.length; i ++) {
+          if (list[i].GuestId == obj.Id) {
+            list[i] = {
+              CombineNo: '',
+              HouseType: obj.ChangeHouseType,
+              HouseNum: obj.ChangeHouseNum,
+              OldHouseId: obj.HouseId,
+              GuestId: obj.Id,
+              TravelDate: this.selectTime,
+              HotelId: obj.HotelId,
+              TCID: obj.TCID,
+            }
+            re = true
+            break;
+          }
+        }
+        if (!re) {
+          list.push({
+            CombineNo: '',
+            HouseType: obj.ChangeHouseType,
+            HouseNum: obj.ChangeHouseNum,
+            OldHouseId: obj.HouseId,
+            GuestId: obj.Id,
+            TravelDate: this.selectTime,
+            HotelId: obj.HotelId,
+            TCID: list[0].TCID,
+          })
+        }
+      }
+      this.editList2 = list
+    },
     // 修改类型
     changeRmType: function (obj, index){
-       let msg = {
-        CombineNo: obj.CombineNo,
+      let list = this.editList
+      let msg = {
+        CombineNo: '',
         HouseType: obj.HouseType,
-        HosueNum: obj.HosueNum,
-        OldHouseId: obj.OldHouseId,
-        GuestId: obj.GuestId,
-        TravelDate: obj.TravelDate,
+        HouseNum: obj.HouseNomber,
+        OldHouseId: obj.HouseId,
+        GuestId: obj.Id,
+        TravelDate: this.selectTime,
         HotelId: obj.HotelId,
         TCID: obj.TCID,
-       }
-      this.GuestDataList = list;
+      }
+      if (!list.length) {
+        list.push(msg)
+      } else {
+        let re = false;
+        for(let i = 0; i < list.length; i ++) {
+          if (list[i].GuestId == obj.Id) {
+            list[i] = {
+              CombineNo: '',
+              HouseType: obj.HouseType,
+              HouseNum: obj.HouseNomber,
+              OldHouseId: obj.HouseId,
+              GuestId: obj.Id,
+              TravelDate: this.selectTime,
+              HotelId: obj.HotelId,
+              TCID: obj.TCID,
+            }
+            re = true
+            break;
+          }
+        }
+        if (!re) {
+          list.push({
+            CombineNo: '',
+            HouseType: obj.HouseType,
+            HouseNum: obj.HouseNomber,
+            OldHouseId: obj.HouseId,
+            GuestId: obj.Id,
+            TravelDate: this.selectTime,
+            HotelId: obj.HotelId,
+            TCID: list[0].TCID,
+          })
+        }
+      }
+      this.editList = list
     },
     compare:function (obj1, obj2) {
         var val1 = Number(obj1.HouseNo);
@@ -328,6 +484,7 @@ export default {
     }, 
     //获取数据
     getList(time) {
+      this.selectTime = time
       let msg = {
         TCIDs: this.TCID,
         travelDate: time