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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1421,7 +1421,7 @@ export default {
     this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
     this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
     this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
-    this.msg.OutBranchId=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
+    this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
     if(this.msg.endDate!=""){
       this.productionDate[0]=this.msg.startDate;
       this.productionDate[1]=this.msg.endDate;
@@ -1741,7 +1741,6 @@ export default {
           }
         };
       });
-      console.log(dataInfo);
       // return
       XLSX.writeFile(wb, xlsxName + ".xlsx");
     },
@@ -2109,14 +2108,11 @@ export default {
     getPageList() {
       // 获取列表数据
       this.loading = true;
-      if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0)
-        this.msg.OutBranchId = -1;
       if (!this.msg.StartCityId) this.msg.StartCityId = 0;
       if (!this.msg.LineId) this.msg.LineId = 0;
       if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
       if (!this.msg.TCID) this.msg.TCID = 0;
       if (this.msg.startDate == "") this.msg.startDate = "2019-01-01";
-      console.log("this.msg",this.msg);
       this.apipost(
         "financestatistics_post_GetPageList",
         this.msg,
@@ -2189,7 +2185,7 @@ export default {
             this.loading = false;
             this.$message.error(res.data.message);
           }
-          if (this.msg.OutBranchId === -1) this.msg.OutBranchId = -1;
+          // if (this.msg.OutBranchId === -1) this.msg.OutBranchId = -1;
           if (!this.msg.StartCityId) this.msg.StartCityId = 0;
           if (!this.msg.LineId) this.msg.LineId = 0;
           if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;

src/components/SalesModule/groupTourOrder.vue

@@ -1913,6 +1913,7 @@
     <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
       <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
     </div>
+      <a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
   </div>
 </template>
 
@@ -2266,10 +2267,10 @@ import moment from "moment";
 
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0)
           let saveMsg = {}
-          saveMsg.Path = x.data.FilePath
-          saveMsg.FileName = file.file.name
-          saveMsg.Status = 1
-          saveMsg.OrderId = this.checkedObj.orderId
+          saveMsg.Path = x.data.FilePath;
+          saveMsg.FileName = file.file.name;
+          saveMsg.Status = 1;
+          saveMsg.OrderId = this.checkedObj.orderId;
           that.apipost('sellorder_post_SetConfirmationLetter', saveMsg, res => {
             if (res.data.resultCode == 1) {
               this.$message.success(res.data.message)
@@ -2282,8 +2283,9 @@ import moment from "moment";
         })
       },
       downLoadFile (obj) {
-        let reg = /^http(s)?:\/\/(.*?)\//
-        this.downloadFileRename(obj[0].fullUrl.replace(reg, ''), obj[0].name)
+        let dom = document.querySelector("#groupTourOrder_DownLoad");
+        dom.href = obj[0].fullUrl;
+        dom.click();
       },
       // 订单转团
       transfer: function (item) {
@@ -3535,7 +3537,6 @@ import moment from "moment";
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
-              console.log("this.list",this.list)
             } else {
               this.$message.error(res.data.message)
             }

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1710,7 +1710,7 @@
               </div>
             </td>
             <td>
-          	<span v-if='item.confirmFileList.length>0'  class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
+          	<span v-if='item.confirmFileList.length>0' style="cursor:pointer"   class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
 							确认函下载
 						</span>
 						<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
@@ -1992,7 +1992,7 @@
               </div>
             </td>
           <td>
-          	<span v-if='item.confirmFileList.length>0'  class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
+          	<span v-if='item.confirmFileList.length>0' style="cursor:pointer"  class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
 							确认函下载
 						</span>
 						<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
@@ -2224,6 +2224,7 @@
           <button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
         </div>
       </el-dialog>
+      <a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
 	</div>
 </template>
 
@@ -2732,8 +2733,9 @@ export default {
 				});
 			},
 	downLoadFile(obj) {
-					let reg = /^http(s)?:\/\/(.*?)\//
-					this.downloadFileRename(obj[0].fullUrl.replace(reg,''),obj[0].name);
+        let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
+        dom.href = obj[0].fullUrl;
+        dom.click();
 				},
     // 订单转团
     transfer: function (item) {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1897,8 +1897,8 @@
               <td>
                 <div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
                 <span v-if='childItem.ConfirmFileList.length>0'
-                  @click="downLoadFile(childItem.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;">已上传</span>
-                <span v-else style="color:gray;font-size:12px;">未上传</span>
+                  @click="downLoadFile(childItem.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
+         
               </td>
               <td class="RL-BTNlist" rowspan="2">
                 <el-button-group>
@@ -2207,7 +2207,7 @@
             </td>
             <td>
               <div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
-              <span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)">确认函下载</span>
+              <span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
             </td>
             <td class="RL-BTNlist" rowspan="2">
               <el-button-group>
@@ -2618,7 +2618,7 @@
         </el-row>
       </el-form>
     </div>
-
+      <a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
   </div>
 </template>
 
@@ -3304,8 +3304,9 @@
         }, null)
       },
       downLoadFile(obj) {
-        let reg = /^http(s)?:\/\/(.*?)\//
-        this.downloadFileRename(obj[0].FullUrl.replace(reg, ''), obj[0].Name)
+        let dom = document.querySelector("#RegistrationList_DownLoad");
+        dom.href = obj[0].FullUrl;
+        dom.click();
       },
 
       goUrlTravelControl(name, path, id, tcmun) {

src/components/TravelManager/TravelList/SalesTravelCoupomList.vue

@@ -69,6 +69,7 @@
 		<!-- <div style="margin: 10px 0;" class="fz14 color333">{{$t('adm.adm_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> -->
 		<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
+                <th>单号</th>                
                 <th>出发地</th>
 				<th>目的地</th>
                 <th>人数</th>
@@ -77,12 +78,13 @@
                 <th>订单状态</th>
 				<th>出发日期</th>
 				<th>返回日期</th>
-				<th>销售数量</th>
+				<th>上传合同</th>
 				<th>方案数量</th>
                 <th>创建日期</th>
 				<th>操作</th>
 			</tr>
 			<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
+                <td>{{item.customId}}</td>			                
                 <td>{{item.departureName}}</td>			
 				<td>{{item.destinationNames}}</td>	
                 <td>
@@ -103,7 +105,11 @@
 				
 				<td>{{item.startDate | YearMD}}</td>
 				<td>{{item.backDate | YearMD}}</td>
-				<td>{{item.salesCount}}</td>
+				<td>
+                    <el-tooltip class="item" effect="dark" content="上传合同" placement="top">
+						<el-button v-if="item.chooseSalesId&&item.chooseSalesId==EmployeeId" type="primary" icon="el-icon-upload2" circle></el-button>
+					</el-tooltip>
+                </td>
 				<td>{{item.planCount}}</td>
 				<td>{{item.createDate | YearMD}}</td>	
 								
@@ -186,12 +192,15 @@ import moment from "moment"
                         let startTime = new Date(this.form.searchStartDate)
                         return startTime.getTime() >= time.getTime()
                     }
-                }
+                },
+                EmployeeId:-1,
 			
 			}
 		},
 		mounted() {
-			let userInfo=this.getLocalStorage();
+            let userInfo=this.getLocalStorage();
+            this.EmployeeId=userInfo.EmployeeId;
+            console.log(this.EmployeeId)
 			this.getList();
 		},
         filters:{
@@ -213,6 +222,7 @@ import moment from "moment"
                     name: path,
                     query: { 
                         customId: item.customId,
+                        allotId: item.allotId,
                         blank: "y", 
                         tab: "行程定制方案" 
                     }

src/components/TravelManager/TravelList/SalesTravelCoupomPlanList.vue

@@ -22,7 +22,7 @@
 	<div class="TravelInfoList flexOne">
 		<div class="query-box">
             <div style="overflow:auto">
-                <!-- <input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/> -->
+                <input type="button" class="normalBtn" value="新增" style="float:right" @click="Gourl"/>
             </div>
         
 			
@@ -32,14 +32,19 @@
 		<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
                 <th>团期ID</th>                
+                <th>行程简介</th>                
+                <th>团期标题</th>                
                 <th>部门名称</th>
 				<th>销售姓名</th>
                 <th>公司名称</th>
                 <th>采用状态</th>
+                <th>方案价格</th>
 				
 			</tr>
 			<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
-                <td>{{item.tcid}}</td>			
+                <td>{{item.tcnum}}({{item.tcid}})</td>	
+                <td>{{item.planIntroduce}}</td>		
+                <td>{{item.travelTitle}}</td>		
 				<td>{{item.departmentName}}</td>
 				<td>{{item.salseName}}</td>
                 <td>{{item.companyName}}</td>
@@ -48,6 +53,7 @@
                     <span v-if="item.planUseStatus==2">采用</span>
                     <span v-if="item.planUseStatus==3">不合适</span>
                 </td>	
+                <td>{{item.planPrice}}</td>
 
 			</tr>
 		</table>
@@ -68,12 +74,14 @@ import moment from "moment"
                 total:0,
                 DataList:[],
                 loading:false,
-				customId:0,
+                customId:0,
+                allotId:0,
 			
 			}
 		},
 		mounted() {
             this.customId=this.$route.query.customId;
+            this.allotId=this.$route.query.allotId;
 			let userInfo=this.getLocalStorage();
 			this.getList();
 		},
@@ -88,7 +96,17 @@ import moment from "moment"
         },
 		
 		methods: {
-			
+			Gourl(){
+                this.$router.push({
+                    name: "TravelManager5",
+                    query: { 
+                        customId: this.customId,
+                        allotId: this.allotId,
+                        blank: "y", 
+                        tab: "自主开团" 
+                    }
+                });
+            },
 			 
 			getList() { //获取数据
                 this.loading=true,

src/components/activity/TravelInfoList.vue

@@ -74,6 +74,7 @@
 		<!-- <div style="margin: 10px 0;" class="fz14 color333">{{$t('adm.adm_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> -->
 		<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
+                <th>单号</th>                
                 <th>出发地</th>
 				<th>目的地</th>
                 <th>人数</th>
@@ -88,6 +89,7 @@
 				<th>操作</th>
 			</tr>
 			<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
+                <td>{{item.customId}}</td>			
                 <td>{{item.departureName}}</td>			
 				<td>{{item.destinationNames}}</td>	
                 <td>
@@ -124,9 +126,9 @@
 					<el-tooltip class="item" effect="dark" content="删除" placement="top">
 						<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
 					</el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消" placement="top">
+                    <!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
 						<el-button @click="Exit(item)" style="background:#62DC9E" class='zidingyiFz' icon="el-icon-document-remove" circle ></el-button>
-					</el-tooltip>
+					</el-tooltip> -->
 				</td>
 
 			</tr>
@@ -308,24 +310,24 @@ import moment from "moment"
                     }
                 }, null);
             },
-            Exit(item){
-                this.$confirm('是否取消该条行程定制信息?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning'
-					}).then(() => {
-                        this.apiJavaPost("/api/b2b/free/cancelTravelCoupom",{customId:item.customId}, res => {
-                            if (res.data.resultCode === 1) {
-                                this.Success(res.data.message)
-                                this.getList();
-                            } else {
-                            this.Error(res.data.message)
-                            }
-                        }, null);
-					}).catch(() => {
+            // Exit(item){
+            //     this.$confirm('是否取消该条行程定制信息?', '提示', {
+			// 			confirmButtonText: '确定',
+			// 			cancelButtonText: '取消',
+			// 			type: 'warning'
+			// 		}).then(() => {
+            //             this.apiJavaPost("/api/b2b/free/cancelTravelCoupom",{customId:item.customId}, res => {
+            //                 if (res.data.resultCode === 1) {
+            //                     this.Success(res.data.message)
+            //                     this.getList();
+            //                 } else {
+            //                 this.Error(res.data.message)
+            //                 }
+            //             }, null);
+			// 		}).catch(() => {
 						
-					});
-            },
+			// 		});
+            // },
 			Delete(item){
                 this.$confirm('是否删除该条行程定制信息?', '提示', {
 						confirmButtonText: '确定',

src/components/busManagement/busUsePrice.vue

 <style>
   .busUsePrice .busList {
     width: 230px;
-    height: 240px;
+    height: 270px;
     float: left;
     margin: 0 10px 10px 0;
     background-color: #fff;
@@ -188,6 +188,9 @@
             <td>全天茶代：{{item.AllDayChaDaiFee}}</td>
             <td>接送茶代：{{item.PickUpChaDaiFee}}</td>
           </tr>
+          <tr>
+            <td colspan="2"><div style="height:40px; overflow-y:scroll">{{item.Remark}}</div></td>
+          </tr>
         </table>
         <div class="busUserBtnList">
           <input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -966,7 +966,7 @@
           EstartcityId: 0,
           EendcityId: 0,
         };
-        
+
         if(TrafficList.TrafficList.length>=2) {
           if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalType!==1) return;
           if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalType!==1) return;
@@ -978,7 +978,7 @@
             let list = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length-1];
             if(list.ArrivalCityId===0) return;
             if(list.StartCityId===0) return;
-            msg.EstartcityId = list.StartCityId; 
+            msg.EstartcityId = list.StartCityId;
             msg.EendcityId = list.ArrivalCityId;
           }else {
             if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId===0) return;
@@ -986,7 +986,7 @@
             msg.EstartcityId =  TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId;
             msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId;
           }
-          
+
           let storageMsg = localStorage.queryFlightAirMsg?JSON.parse(localStorage.queryFlightAirMsg):null;
           if(storageMsg){
             if(storageMsg.FstartcityId!==msg.FstartcityId
@@ -1017,7 +1017,7 @@
       },
       // 拿到航班信息初始化日历
       initCalendarEdit() {
- 
+
         for(let i in this.queryFlightAirDateList){
           for(let k in this.days){
             if(this.queryFlightAirDateList[i].day == new Date(this.days[k].day).Format("yyyy-MM-dd")){
@@ -1103,7 +1103,7 @@
         this.queryFlightAirListData.forEach(x=>{
           if(x.purchaseID==this.getSelectdata){
             item = x;
-            
+
           }
         });
         this.priceData.AirticketBindList.push({

src/router/config.js

@@ -2714,6 +2714,14 @@ export default {
                             meta: {
                                 title: '团队营收统计'
                             },
+                        },
+                        { //财务 报表 团队人数统计
+                            path: '/NumberStatistics',
+                            name: 'NumberStatistics',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/NumberStatistics'], resolve),
+                            meta: {
+                                title: '团队人数统计'
+                            },
                         }, {
                             path: '/JumpReport',
                             name: 'JumpReport',