页面修改

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -65,18 +65,19 @@
     text-align: center;
     margin: 10px;
   }
- .PassengerList .disClick {
+
+  .PassengerList .disClick {
     background-color: #d1d1d1;
     color: #fff;
     border: 1px solid #d1d1d1;
   }
- .PassengerList .disClick:hover {
+
+  .PassengerList .disClick:hover {
     background-color: #d1d1d1 !important;
     cursor: default !important;
     box-shadow: none !important;
   }
 
-
 </style>
 
 <template>
@@ -99,8 +100,7 @@
           </table>
         </li>
         <li>
-          <!-- <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel(2)"> -->
-           <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
+          <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
           <input type="button" class="normalBtn" value="分房表下载" @click="exportExcel_singleRoom()">
           <input type="button" class="normalBtn" value="旅客名单下载" @click="exportExcel()">
         </li>
@@ -148,12 +148,8 @@
             </el-select>
           </td>
           <td>
-            <!-- <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.IsLeaderOrder==1">
-              <el-option :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || allDIs"
-                v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
-              </el-option>
-            </el-select> -->
-            <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType1(subItem, subIndex,subItem.HouseType)" v-if="subItem.IsLeaderOrder==1">
+            <el-select v-model="subItem.HouseType" placeholder="请选择"
+              @change="changeRmType1(subItem, subIndex,subItem.HouseType)" v-if="subItem.IsLeaderOrder==1">
               <el-option :disabled="(hs.disabled && IsLeaderGuide == 1) || allDIs"
                 v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
               </el-option>
@@ -189,7 +185,8 @@
         </tr>
         <tr v-if="!allDIs" style="height:50px; line-height:50px;">
           <td style="text-align:right" colspan="23">
-            <input type="button" value="保存" :class="{'disClick':!isSubmit}" class="leader2Btn" @click="saveOPSetGuestHouse">
+            <input type="button" value="保存" :class="{'disClick':!isSubmit}" class="leader2Btn"
+              @click="saveOPSetGuestHouse">
           </td>
         </tr>
       </tbody>
@@ -260,12 +257,12 @@
         houseList: [],
         HouseTypeList: [],
         //领队才能选数据
-        LeaderHouseList:[],
+        LeaderHouseList: [],
         numberList: [],
         dataList: [],
         otherList: [], //单机票和自由行列表
         //只有两个项、
-        twoList:[],
+        twoList: [],
         allDIs: false,
         //验证重复提交
         isSubmit: true,
@@ -277,7 +274,7 @@
         this.apipost(
           "travel_get_UpdateOpSureHouse", {
             TCID: this.TCID,
-            OpSureHouse:OpSureHouse
+            OpSureHouse: OpSureHouse
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -291,11 +288,11 @@
         );
       },
       // 修改类型1
-      changeRmType1: function (obj, index,type) {
-        if(type==1||type==6){
-          this.HouseTypeList.forEach((x,index)=>{
-            if(index!=0&&index!=5){
-              x.disabled=true
+      changeRmType1: function (obj, index, type) {
+        if (type == 1 || type == 6) {
+          this.HouseTypeList.forEach((x, index) => {
+            if (index != 0 && index != 5) {
+              x.disabled = true
             }
           })
         }
@@ -309,7 +306,6 @@
         list = list.sort(this.compare)
         this.dataList = list;
       },
-
       // 修改类型
       changeRmType: function (obj, index) {
         let list = this.dataList;
@@ -387,26 +383,6 @@
         }
         return str;
       },
-      //获取房间类型
-      getHouseTypeStr(HouseType) {
-        var str = "";
-        if (HouseType == 1) {
-          str = "自然单间";
-        } else if (HouseType == 2) {
-          str = "标准双人间";
-        } else if (HouseType == 3) {
-          str = "大床房";
-        } else if (HouseType == 4) {
-          str = "三人间";
-        } else if (HouseType == 5) {
-          str = "拼凑双人间";
-        }else if (HouseType == 6) {
-          str = "司导间";
-        } else {
-          str = "未分配";
-        }
-        return str;
-      },
       getHouseTypeList: function () {
         this.apipost(
           "travel_get_GetHouseType",
@@ -415,14 +391,14 @@
             this.QueryMsg.loading = false;
             if (res.data.resultCode == 1) {
               this.HouseTypeList = res.data.data;
-              this.LeaderHouseList=[];
-              this.twoList=[];
-              this.HouseTypeList.forEach(x=>{
-                x.disabled=false;
-                if(x.HouseType!=6){
+              this.LeaderHouseList = [];
+              this.twoList = [];
+              this.HouseTypeList.forEach(x => {
+                x.disabled = false;
+                if (x.HouseType != 6) {
                   this.LeaderHouseList.push(x)
                 }
-                if(x.HouseType==1||x.HouseType==6){
+                if (x.HouseType == 1 || x.HouseType == 6) {
                   this.twoList.push(x);
                 }
               })
@@ -431,30 +407,6 @@
           err => {}
         );
       },
-      setDataList: function (list) {
-        var Diningmap = {},
-          Diningdest = [];
-        for (var i = 0; i < list.length; i++) {
-          var ai = list[i];
-          if (!Diningmap[ai.HouseNo]) {
-            Diningdest.push({
-              HouseType: ai.HouseType,
-              HouseNo: ai.HouseNo,
-              data: [ai]
-            });
-            Diningmap[ai.HouseNo] = ai;
-          } else {
-            for (var j = 0; j < Diningdest.length; j++) {
-              var dj = Diningdest[j];
-              if (dj.HouseType == ai.HouseType && dj.HouseNo == ai.HouseNo) {
-                dj.data.push(ai);
-                break;
-              }
-            }
-          }
-        }
-        this.QueryMsg.dataList = Diningdest;
-      },
       //获取数据
       getList() {
         this.QueryMsg.loading = true;
@@ -513,27 +465,26 @@
           TCID: this.msg.TCID,
           isGetTicket: 1, //不查询机票
           isGetZiYouXing: 0, //查询自由行
-          isOnlyFenFang:1,//只查询已分房的
+          isOnlyFenFang: 1, //只查询已分房的
         };
         var fileName = "旅客名单.xls";
         if (this.QueryMsg.TeamInfoData != null) {
           fileName =
-            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
+            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表[" + this.getCurrentTime() + "].xls";
         }
         this.GetLocalFile("travel_get_GetTravelRoomExport", msg, fileName, res => {
           this.QueryMsg.loading = false;
         });
       },
-      getCurrentTime()
-      {
+      getCurrentTime() {
         var date = new Date();
         var year = date.getFullYear();
-        var month = date.getMonth()+1;
+        var month = date.getMonth() + 1;
         var day = date.getDate();
         var hour = date.getHours();
         var minute = date.getMinutes();
         var second = date.getSeconds();
-        return year+'_'+month+'_'+day+'_'+hour+'_'+minute+'_'+second;
+        return year + '_' + month + '_' + day + '_' + hour + '_' + minute + '_' + second;
       },
       //获取团期信息
       getTeamInfo() {

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -382,7 +382,7 @@
           ConfigId: this.ConfigId
         };
         var trip_map_obj = document.getElementById("trip_map");
-        console.log("trip_map_obj",trip_map_obj);
+        console.log("trip_map_obj", trip_map_obj);
         html2Canvas(trip_map_obj).then(function (canvas) {
           var image = document.createElement("a");
           image.href = canvas.toDataURL("image/png");
@@ -413,7 +413,7 @@
           "dict_get_Destination_GetCityExtList",
           this.searchNation,
           res => {
- 
+
             if (Type == 1) {
               this.NationList = res.data.data;
               this.NationList.forEach(x => {
@@ -504,7 +504,7 @@
         this.$forceUpdate();
         this.PostConfig.TripMapList = JSON.parse(JSON.stringify(this.TripMapList));
       },
-      // 查询城市
+      //查询国家下面的城市
       SearchCity(MId, x, index) {
         if (x) {
           x.NationList.forEach(item => {
@@ -513,13 +513,11 @@
             }
           });
         }
-    
         this.apipost(
           "dict_get_Destination_GetCountryCityList", {
             QCountry: MId
           },
           res => {
-     
             this.CityList = res.data.data;
             this.CityList.forEach(x => {
               x.ID = Number(x.ID);
@@ -555,11 +553,8 @@
         this.countriesData.forEach((x, i) => {
           if (x.MName == "中国") x.name = "中华人民共和国";
           if (x.MName == "韩国") x.name = "大韩民国";
-          x.CityListAll.forEach(y => {
-
-          })
-          let source
-          var paintBgObj
+          let source;
+          var paintBgObj;
           if (x.MId != 651 && x.MId != 891) {
             source = "word-source"
           } else {
@@ -609,7 +604,6 @@
               paint: paintBgObj
             })
           }
-
         });
       },
       clearCitiesMarkersHandler() {
@@ -891,7 +885,6 @@
   }
 
   #trip_map {
-    /* position: absolute; */
     position: fixed;
     top: 0;
     bottom: 0;