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

src/components/TravelManager/customizedcar/dzlineList.vue

@@ -5,6 +5,7 @@
 				<li style="display: block;width: 100%">
 					<span><em>出发类型</em>
 								<el-select  filterable  v-model='msg.StartCityType'  >
+									<el-option label="不限" value='0'></el-option>
 									<el-option v-for='item in gotpye' 
 										:label='item.Name'
 										:value='item.Id'
@@ -55,6 +56,7 @@
 				<li style="display: block;width: 100%">
 					<span><em>到达类型</em>
 								<el-select  filterable  v-model='msg.ArriveCityType'  @change="daoda()" >
+									<el-option label="不限" value='0'></el-option>
 									<el-option v-for='item in gotpye' 
 										:label='item.Name'
 										:value='item.Id'
@@ -133,7 +135,6 @@
                     </div>
                   </template>    
 			</el-table-column>
-			<el-table-column fixed prop="Price" label="预计价格" width="120"> </el-table-column>
 			
 			<el-table-column fixed prop="SiteList" label="站点列表" >
 				
@@ -142,7 +143,7 @@
 						 <div v-show="scope.row.show==false">
 							 <div class="line-h">
 								<div class="line-h-l">{{scope.row.SiteList[0].Type==1?'上':'下'}}</div>
-								<div>{{scope.row.SiteList[0].Time}}分</div>
+								<!-- <div>{{scope.row.SiteList[0].Time}}分</div> -->
 								<div style="margin-left:10px">{{scope.row.SiteList[0].Name}} </div>
 							</div>
 							<div v-if="scope.row.SiteList.length>2"  style="cursor:pointer;color:#409EFF" @click="getlistshow(scope.$index)">····展开</div>
@@ -155,7 +156,7 @@
 						 <div v-show="scope.row.show==true">
 							  <div class="line-h" v-for="(activity, index) in scope.row.SiteList" :key="index">
 									<div class="line-h-l">{{activity.Type==1?'上':'下'}}</div>
-									<div>{{activity.Time}}分</div>
+									<div v-if="activity.Time!=0">{{activity.Time}}分</div>
 									<div style="margin-left:10px">{{activity.Name}} </div>
 								</div>
 								<span v-if="scope.row.show==true" style="cursor:pointer;color:#409EFF"  @click="getlistshow(scope.$index)">收起</span>
@@ -163,7 +164,9 @@
                     </div>
                   </template>    
 			</el-table-column>
-			<el-table-column fixed prop="ProductState" label="状态" width="80">
+			<el-table-column fixed prop="Price" label="预计价格" width="120"> </el-table-column>
+
+			<el-table-column fixed prop="ProductState" label="上架状态" width="80">
 				
 				<template slot-scope="scope">
                     <div style="display: flex;align-items: center;">
@@ -179,6 +182,17 @@
 			</el-table-column>
 
 			<el-table-column fixed prop="Description" label="备注" > </el-table-column>
+				<el-table-column  prop="UpdateByName" label="创建人" width="150"> 
+                <template slot-scope="scope">
+                    
+                    <div flex="dir:left cross:center">
+                        {{scope.row.UpdateByName}}
+                    </div>
+                    <div flex="dir:left cross:center">
+                        {{scope.row.UpdateDate}}
+                    </div>
+                </template>    
+            </el-table-column>
             <el-table-column fixed="right" label="操作" width="150" >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
@@ -219,9 +233,9 @@
 					pageSize: 15,
 					Id: 0,
 					StartCityId:'0',
-					StartCityType:1,
+					StartCityType:'0',
 					ArriveCityId:'0',
-					ArriveCityType:1,
+					ArriveCityType:'0',
 					ProductState:'0',
 
 					startdistrict:'0',
@@ -355,7 +369,7 @@
         
 			},
 			baojia(row){
-				 this.$router.push("/lineoffer?id="+row.Id)
+				 this.$router.push("/lineoffer?id="+row.Id+'&Price='+row.Price)
 			},
             delete_b(row){
 				let that=this;

src/components/TravelManager/customizedcar/lineProductCalendar.vue

@@ -31,8 +31,22 @@
           
           <template v-for="(childItem,childIndex) in item.data.SubList" >
             <p>
-                <span title="点击修改信息"  @click="goUrlA('2', item.day,item.data.SubList)">
-                  {{childItem.DepartureTime}}  <span class="text_underLine" style="margin:0 2px">￥{{childItem.Price}}</span>   {{childItem.CarName}}
+                <span   @click="goUrlA('2', item.day,item.data.SubList)">
+                  
+                    <el-tooltip class="item" effect="dark" content="出发时间" placement="top">
+                     <span style=" cursor: pointer;">{{childItem.DepartureTime}}</span> 
+                    </el-tooltip>
+                     <el-tooltip class="item" effect="dark" content="车辆名称" placement="top">
+                      <span style=" cursor: pointer;">{{childItem.CarName}}</span> 
+                      </el-tooltip>
+                     <el-tooltip class="item" effect="dark" content="b2b价格" placement="top">
+                      <span class="text_underLine" style="margin:0 2px">￥{{childItem.Price}}</span>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="报名数" placement="top">
+                      <span  style="cursor: pointer; margin-left:2px">{{childItem.EnrollSeat!=0?childItem.EnrollSeat:'-'}}</span> 
+                    </el-tooltip>
+                 
+                      
                 </span><br/>
                
             </p>