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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -940,23 +940,28 @@
     cursor: pointer;
     width: 60px;
   }
-  .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
-    float:left;
+
+  .RegistrationList .leftSetInfo,
+  .RegistrationList .GO_TPright {
+    float: left;
   }
-  .RegistrationList .GO_Title{
+
+  .RegistrationList .GO_Title {
     display: inline-block;
     margin-top: 10px;
-    padding-right:10px;
-    font-size:12px;
+    padding-right: 10px;
+    font-size: 12px;
     width: 90px;
     text-align: right;
   }
-  ._TravelPricePopover .GOScenicDiv{
+
+  ._TravelPricePopover .GOScenicDiv {
     width: 500px;
     max-height: 400px;
     overflow: auto;
   }
-  ._TravelPricePopover table{
+
+  ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
@@ -966,13 +971,13 @@
     width: 100%;
   }
 
-  ._TravelPricePopover table ._color_666{
+  ._TravelPricePopover table ._color_666 {
     background-color: #ededed;
     color: #666666;
     padding: 5px;
   }
 
-  ._TravelPricePopover table td{
+  ._TravelPricePopover table td {
     background-color: #ffffff;
     padding: 9px 0;
     color: #333333;
@@ -983,6 +988,7 @@
   ._TravelPricePopover table td._d_name {
     background-color: #ededed;
   }
+
   .RegistrationList .SimulateDrop-box {
     width: 230px;
     min-height: 34px;
@@ -991,13 +997,15 @@
     float: left;
     margin-top: 4px;
     border: 1px solid #d1d1d1;
-}
-  .RegistrationList .GO_SimulaDrop{
+  }
+
+  .RegistrationList .GO_SimulaDrop {
     position: absolute;
-    right:10px;
-    top:5px;
-    color:#d1d1d1;
+    right: 10px;
+    top: 5px;
+    color: #d1d1d1;
   }
+
   .RegistrationList .SD_flight {
     display: inline-block;
     height: 24px;
@@ -1006,7 +1014,7 @@
     max-width: 200px;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size:12px;
+    font-size: 12px;
     padding: 0 8px;
     line-height: 22px;
     background-color: #f0f2f5;
@@ -2683,7 +2691,7 @@
                   {{LeaderInfoList.LeaderGuide.Surname}}{{LeaderInfoList.LeaderGuide.Name}}
                 </td>
                 <td>
-                  请假
+                  {{leaderItem.HolidayStr}}
                 </td>
                 <td>
                   {{leaderItem.StartDateStr2}}到{{leaderItem.EndDateStr2}}
@@ -5061,8 +5069,44 @@
           err => {}
         );
       },
+      getStartOrEndDate(start1, end1, start2, end2) {
+        var startdate1 = new Date(start1.replace("-", "/").replace("-", "/"));
+        var enddate1 = new Date(end1.replace("-", "/").replace("-", "/"));
+        var startdate2 = new Date(start2.replace("-", "/").replace("-", "/"));
+        var enddate2 = new Date(end2.replace("-", "/").replace("-", "/"));
+        //startdate1介于另一个区间之间
+        if (startdate1 >= startdate2 && startdate1 <= enddate2) { 
+          return true;
+        }
+         //enddate1介于另一个区间之间
+        if (enddate1 >= startdate2 && enddate1 <= enddate2) {
+          return true;
+        }
+        //startdate1-enddate1的区间大于另一个区间，且另一个区间在startdate1-enddate1之间
+        if (startdate1 <= startdate1 && enddate1 >= enddate2) {
+          return true;
+        }
+
+        return false;
+      },
       //确定设置领队
       setTheLeader() {
+        let isCked = false;
+        this.LeaderHolidyList.forEach(x => {
+          if (!isCked && this.getStartOrEndDate(this.ConfigData.Config.StartDate, this.ConfigData.Config.EndDate, x.StartDateStr2,x.EndDateStr2)) {
+            isCked = true;
+          }
+        })
+        if (isCked) {
+          var that = this;
+          that.Confirm("该领队在请假期，是否继续?", function () {
+            that.getLeader();
+          })
+        } else {
+          this.getLeader();
+        }
+      },
+      getLeader() {
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost(

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -811,7 +811,9 @@
                         <div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查
                         </div>
                       </el-dropdown-item>
-
+                      <el-dropdown-item>
+                        <div @click='exportExcel_singleRoom(item)'>分房表下载 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -1855,6 +1857,32 @@
           }
         })
       },
+      //分房表下载
+      exportExcel_singleRoom(item) {
+         this.queryCommonData.loading = true;
+        //导出报表
+        let msg = {
+          TCID: item.TCID,
+          isGetTicket: 1, //不查询机票
+          isGetZiYouXing: 0, //查询自由行
+          isOnlyFenFang:1,//只查询已分房的
+        };
+        var fileName ="【" + item.TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
+        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+          this.queryCommonData.loading = false;
+        });
+      },
+      getCurrentTime()
+      {
+        var date = new Date();
+        var year = date.getFullYear();
+        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;
+      }
     },
     filters: {
       formatStartDate(value) {

src/components/TravelManager/TravelList/TravelPassengerList2.vue

@@ -58,7 +58,7 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()">
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;">
         </li>
       </ul>
     </div>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -89,7 +89,8 @@
         </li>
         <li>
           <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel()">
-          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()">
+          <input type="button" class="normalBtn" value="分房表下载" @click="exportExcel_singleRoom()">
+          <input type="button" class="normalBtn" value="旅客名单下载" @click="exportExcel()">
         </li>
       </ul>
     </div>
@@ -436,7 +437,36 @@
         }
         this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName);
       },
-
+      //分房表下载
+      exportExcel_singleRoom() {
+        this.QueryMsg.loading = true;
+        //导出报表
+        let msg = {
+          TCID: this.msg.TCID,
+          isGetTicket: 1, //不查询机票
+          isGetZiYouXing: 0, //查询自由行
+          isOnlyFenFang:1,//只查询已分房的
+        };
+        var fileName = "旅客名单.xls";
+        if (this.QueryMsg.TeamInfoData != null) {
+          fileName =
+            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
+        }
+        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+          this.QueryMsg.loading = false;
+        });
+      },
+      getCurrentTime()
+      {
+        var date = new Date();
+        var year = date.getFullYear();
+        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;
+      },
       //获取团期信息
       getTeamInfo() {
         var qmsg = {

src/components/dmc/manager/dmcTotalTable.vue

@@ -280,7 +280,8 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList2',item.TCID,'旅客名单')">
+                <!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单')-->
+                <div class="fz16 fbold linkspan" @click="goRoomTip()">
                   <span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
                 </div>
@@ -1124,6 +1125,10 @@
             this.loading = false;
           });
       },
+      goRoomTip()
+      {
+        this.Error("请联系组团OP提供分房表文件!");
+      }
     },
     mounted() {
       let myDate = new Date();