update

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>