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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1654,6 +1654,7 @@
           <input type="button" class="normalBtn" v-else
             @click="showSetLeader=true,isShowLayerRemarks = false,isShowLayer = false" value="设置领队" />
           <input type="button" class="normalBtn" @click="goUrl('TravelPassengerList',msg.TCID,'旅客名单')" value="旅客名单" />
+           <a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
         </template>
       </div>
     </div>
@@ -3270,6 +3271,7 @@
           PayStatus: "-1",
           //zk新增
           TCID: 0,
+        downList: "",
         },
         //返回数据
         currentPage: 1,
@@ -3444,6 +3446,23 @@
           "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=6&OrderId=" + id + "&EmployeeId=" + uerInfo.EmployeeId;
         this.importNameFile = true;
       },
+
+       getDownList() {
+        let msg = {};
+        this.apipost(
+          "Guest_Post_OutToExcel",
+          msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.downList =
+                this.domainManager().LocalTemplateFileDownLoadUrl + res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
       // OP备注赋值
       OPRemark(item) {
         this.apipost('sellorder_post_GetOrderEntity', {
@@ -5531,6 +5550,7 @@
       //获取所属公司
       this.getBranchList();
       this.canEditUnitPrice();
+        this.getDownList();
     }
   }
 

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1868,7 +1868,7 @@
           isOnlyFenFang:1,//只查询已分房的
         };
         var fileName ="【" + item.TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
-        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+        this.GetLocalFile("travel_get_GetTravelRoomExport", msg, fileName, res => {
           this.queryCommonData.loading = false;
         });
       },

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -452,7 +452,7 @@
           fileName =
             "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
         }
-        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+        this.GetLocalFile("travel_get_GetTravelRoomExport", msg, fileName, res => {
           this.QueryMsg.loading = false;
         });
       },