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

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();