修复bug

src/components/Hotel/HotelManagement.vue

@@ -500,7 +500,7 @@
         </el-table-column>
         <el-table-column prop="CreateTime" :label="$t('visa.v_creatDate')">
         </el-table-column>
-        <el-table-column prop="DateStr" :label="$t('system.table_operation')"> width="120">
+        <el-table-column prop="DateStr" :label="$t('system.table_operation')" width="120">
           <template slot-scope="scope">
             <el-popconfirm @confirm="deleteFile(scope.row, scope.$index)" :title="$t('objFill.quedinscm')">
               <el-button slot="reference" class="editInfo" type="danger">{{$t('system.table_delete')}}</el-button>

src/components/TravelManager/customizedcar/carmanageList.vue

@@ -4,7 +4,7 @@
 			<ul>
 				<li><span><em>车辆类型</em><el-select  filterable  v-model='msg.CarType' >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in companyList' 
+									<el-option v-for='item in companyList'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
@@ -30,8 +30,8 @@
                         {{scope.row.CarName}}
                         </div>
                     </div>
-                    
-                  </template>    
+
+                  </template>
             </el-table-column>
 			<el-table-column  prop="CarTypeName" :label="$t('system.query_type')"> </el-table-column>
 			<el-table-column  prop="CarModel" label="型号"> </el-table-column>
@@ -39,27 +39,27 @@
 			<el-table-column  prop="BrandName" label="品牌"> </el-table-column>
 			<el-table-column  prop="CarNo" label="车牌号"> </el-table-column>
 			<el-table-column  prop="GuestNum" label="荷载人数"> </el-table-column>
-			<el-table-column  prop="ImageList" label="图片列表"> 
+			<el-table-column  prop="ImageList" label="图片列表">
                 <template slot-scope="scope">
                     <div style="display: flex;align-items: center;">
                         <div class="app-image" :style="{backgroundImage:'url(' + scope.row.ImageList[0] + ')',backgroundSize:'cover'}"></div>
                         <div v-if='scope.row.ImageList.length>2' @click='lookgd(scope.row)' style="cursor:pointer;color:#409EFF">查看更多</div>
                     </div>
-                    
-                </template>    
+
+                </template>
             </el-table-column>
-			<el-table-column  prop="UpdateByName" :label="$t('active.cl_addPp')"> 
+			<el-table-column  prop="UpdateByName" :label="$t('active.cl_addPp')">
                 <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>    
+                </template>
             </el-table-column>
-            <el-table-column fixed="right" :label="$t('system.table_operation')"> width="120" >
+            <el-table-column fixed="right" :label="$t('system.table_operation')" width="120" >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
                     <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
@@ -69,7 +69,7 @@
                   </el-tooltip>
                 </template>
               </el-table-column>
-		
+
 		</el-table>
 		<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
 		</el-pagination>
@@ -85,7 +85,7 @@
 	export default {
 		data() {
 			return {
-				
+
 				loading:true,
 				//分页
 				total: 0,
@@ -99,9 +99,9 @@
 					CarType: '0',
 					CarName: '',
 					BrandName: '',
-					
+
 				},
-			
+
 				//返回数据
 				dataList: [],
 				companyList: [],
@@ -109,7 +109,7 @@
 			}
 		},
 		methods: {
-			
+
 			getCompany() {
 				this.apipost('car_get_GetCarCustomTypeEnumList', {}, res => {
 					if(res.data.resultCode == 1) {
@@ -121,18 +121,18 @@
                 this.changeState = true;
                 this.CarPic = row.ImageList
             },
-			
-		
+
+
 			getList() {
 				this.loading=true
-				
-					
+
+
 				this.apipost('car_get_GetCarInfoPageList', this.msg, res => {
 					if(res.data.resultCode == 1) {
 						this.loading=false
 						this.$nextTick(() => {
 						this.dataList = res.data.data.pageData;
-						 });						
+						 });
 						this.total = res.data.data.count;
 					}
 
@@ -157,14 +157,14 @@
 							that.$message.success(res.data.message)
 							that.getList()
 						} else {
-							that.$message.error(res.data.message)	
+							that.$message.error(res.data.message)
 						}
 					}, err => {})
 				});
 			},
 		},
 		mounted() {
-			
+
 			this.getList()
 			this.getCompany()
 		}
@@ -175,11 +175,11 @@
 	.el-table .el-table__row {
 		font-size: 12px!important;
 	}
-	
+
 	.el-table__row td {
 		padding: 5px 0;
 	}
-	.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;} 	
+	.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;}
      .app-image{
         background-position: center center;
         width: 50px;
@@ -188,4 +188,4 @@
         float: left;
         margin-right: 8px;
     }
-</style>
+</style>
\ No newline at end of file

src/components/TravelManager/customizedcar/dzlineList.vue

@@ -6,29 +6,29 @@
 					<span><em>出发类型</em>
 								<el-select  filterable  v-model='msg.StartCityType'  >
 									<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in gotpye' 
+									<el-option v-for='item in gotpye'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
 									</el-option>
 								</el-select>
-							
+
 					</span>
 					<span v-if="msg.StartCityType==2"><em>出发景点</em>
 								<el-select  filterable  v-model='msg.StartCityId' @change="chufa()" >
 									<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in ScenicList' 
+									<el-option v-for='item in ScenicList'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
 									</el-option>
 								</el-select>
-							
+
 					</span>
 					<span v-if="msg.StartCityType==1"><em>出发城市</em>
 								<el-select  filterable  v-model='goProvinceId'  @change="getProvinceList(goProvinceId,2,1)" >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in provinceList' 
+									<el-option v-for='item in provinceList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -36,7 +36,7 @@
 								</el-select>
 								<el-select  filterable  v-model='msg.StartCityId' @change="getProvinceList(msg.StartCityId,3,1)" >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in cityList' 
+									<el-option v-for='item in cityList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -44,7 +44,7 @@
 								</el-select>
 								<el-select  filterable  v-model='msg.startdistrict'  >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in district' 
+									<el-option v-for='item in district'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -52,34 +52,34 @@
 								</el-select>
 					</span>
 				</li>
-			
+
 				<li style="display: block;width: 100%">
 					<span><em>到达类型</em>
 								<el-select  filterable  v-model='msg.ArriveCityType'  @change="daoda()" >
 									<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in gotpye' 
+									<el-option v-for='item in gotpye'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
 									</el-option>
 								</el-select>
-							
+
 					</span>
 					<span v-if="msg.ArriveCityType==2"><em>到达景点</em>
 								<el-select  filterable  v-model='msg.ArriveCityId'  >
 									<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in ScenicList' 
+									<el-option v-for='item in ScenicList'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
 									</el-option>
 								</el-select>
-							
+
 					</span>
 					<span v-if="msg.ArriveCityType==1"><em>到达城市</em>
 								<el-select  filterable  v-model='daProvinceId'  @change="getProvinceList(daProvinceId,2,2)" >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in provinceList' 
+									<el-option v-for='item in provinceList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -87,7 +87,7 @@
 								</el-select>
 								<el-select  filterable  v-model='msg.ArriveCityId' @change="getProvinceList(msg.ArriveCityId,3,2)" >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in cityList2' 
+									<el-option v-for='item in cityList2'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -95,7 +95,7 @@
 								</el-select>
 								<el-select  filterable  v-model='msg.arrivedistrict'  >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in district2' 
+									<el-option v-for='item in district2'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
@@ -103,22 +103,22 @@
 								</el-select>
 					</span>
 				</li>
-				
-				
+
+
 					<li style="display: block;width: 100%">
 					<span><em>线路状态</em>
 								<el-select  filterable  v-model='msg.ProductState'  >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in producttpye' 
+									<el-option v-for='item in producttpye'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
 									</el-option>
 								</el-select>
-							
+
 					</span>
 				</li>
-                
+
 				<li>
 					<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
 					<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="CommonJump('adddzline')" />
@@ -133,11 +133,11 @@
                     <div style="display: flex;align-items: center;">
                        {{scope.row.StartCityName}} - {{scope.row.ArriveCityName}}
                     </div>
-                  </template>    
+                  </template>
 			</el-table-column>
-			
+
 			<el-table-column fixed prop="SiteList" label="站点列表" >
-				
+
 				<template slot-scope="scope">
                     <div style="display: flex;align-items: center;">
 						 <div v-show="scope.row.show==false">
@@ -162,15 +162,15 @@
 								<span v-if="scope.row.show==true" style="cursor:pointer;color:#409EFF"  @click="getlistshow(scope.$index)">收起</span>
 						 </div>
                     </div>
-                  </template>    
+                  </template>
 			</el-table-column>
 			<el-table-column fixed prop="Price" label="预计价格" width="120"> </el-table-column>
 
-			
+
 
 			<el-table-column fixed prop="Description" :label="$t('pub.pubRemark')" > </el-table-column>
 			<el-table-column fixed prop="ProductState" label="上架状态" width="80">
-				
+
 				<template slot-scope="scope">
                     <div style="display: flex;align-items: center;">
 					   <el-switch
@@ -181,20 +181,20 @@
 							>
 						</el-switch>
                     </div>
-                  </template>    
+                  </template>
 			</el-table-column>
-				<el-table-column  prop="UpdateByName" :label="$t('active.cl_addPp')" width="150"> 
+				<el-table-column  prop="UpdateByName" :label="$t('active.cl_addPp')" 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>    
+                </template>
             </el-table-column>
-            <el-table-column fixed="right" :label="$t('system.table_operation')"> width="150" >
+            <el-table-column fixed="right" :label="$t('system.table_operation')" width="150" >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
                     <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
@@ -207,11 +207,11 @@
                   </el-tooltip>
                 </template>
               </el-table-column>
-		
+
 		</el-table>
 		<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
 		</el-pagination>
-       
+
 	</div>
 </template>
 
@@ -219,7 +219,7 @@
 	export default {
 		data() {
 			return {
-				
+
 				loading:true,
 				//分页
 				total: 0,
@@ -244,10 +244,10 @@
 				},
 				gotpye:[{Id:1,Name:'城市'},{Id:2,Name:'景点'},],
 				producttpye:[{Id:1,Name:'上架'},{Id:2,Name:'下架'}],
-			
+
 				//返回数据
 				dataList: [],
-			
+
 				provinceList: "",
 				cityList: "",
 				cityList2: "",
@@ -263,7 +263,7 @@
 							that.$message.success(res.data.message)
 							that.getList()
 						} else {
-							that.$message.error(res.data.message)	
+							that.$message.error(res.data.message)
 						}
 					}, err => {})
 			},
@@ -272,14 +272,14 @@
 				let msg = { Id: ID };
 				if (type == 1) {
 					this.goProvinceId = '0';
-					this.daProvinceId = '0';	
+					this.daProvinceId = '0';
 				} else if (type == 2) {
 					if(type_t==1){
 						this.msg.StartCityId = '0';
 					}else if(type_t==2){
 						this.msg.ArriveCityId = '0';
 					}
-					
+
 				} else if (type == 3) {
 					if(type_t==1){
 						this.msg.startdistrict = '0';
@@ -287,7 +287,7 @@
 						this.msg.arrivedistrict = '0';
 					}
 				}
-				
+
 					this.apipost(
 					"dict_post_Destination_GetChildList",
 					msg,
@@ -310,7 +310,7 @@
 					},
 					err => {}
 					);
-				
+
 			},
 			chufa(){
 				this.msg.StartCityId='0';
@@ -325,10 +325,10 @@
 				this.$set(this.dataList,index,this.dataList[index])
 				this.$forceUpdate();
 			},
-			
-           
-			
-		
+
+
+
+
 			getList() {
 				this.loading=true
 				let msg = JSON.parse(JSON.stringify(this.msg))
@@ -349,7 +349,7 @@
 								x.show=false
 							})
 						//  });
-					
+
 						this.total = res.data.data.count;
 					}
 
@@ -377,7 +377,7 @@
 							that.$message.success(res.data.message)
 							that.getList()
 						} else {
-							that.$message.error(res.data.message)	
+							that.$message.error(res.data.message)
 						}
 					}, err => {})
 				});
@@ -385,7 +385,7 @@
 			   GetScenicList(Name){
 					this.apipost('car_get_GetScenicList', {Name:Name}, res => {
 							if(res.data.resultCode == 1) {
-							
+
 							this.ScenicList = res.data.data;
 							}
 
@@ -405,11 +405,11 @@
 	.el-table .el-table__row {
 		font-size: 12px!important;
 	}
-	
+
 	.el-table__row td {
 		padding: 5px 0;
 	}
-	.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;} 	
+	.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;}
      .app-image{
         background-position: center center;
         width: 50px;
@@ -417,7 +417,7 @@
         border-radius:0%;
         float: left;
         margin-right: 8px;
-		
+
     }
 	.dzlineList .line-h{
 		display: flex;
@@ -434,6 +434,6 @@
 		justify-content: center;
 		background: #F56C6C;
 		margin-right: 15px;
-		
+
 	}
-</style>
+</style>
\ No newline at end of file

src/components/TravelManager/customizedcar/dzscenicspotList.vue

@@ -5,7 +5,7 @@
 				<li>
 					<span><em>景点名称：</em><el-input v-model='msg.Name'  class="permiss-input"></el-input></span>
 				</li>
-				
+
 				<li>
 					<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
 					<input type="button" @click="addjd(),dialogTitle='新增景点'" class="normalBtn" :value="$t('pub.addBtn')" />
@@ -19,7 +19,7 @@
 			style="width: 100%"
 			border
 		  >
-	
+
 			<el-table-column prop="Id" label="ID"  width="100"></el-table-column>
 			<el-table-column prop="Name" label="景点名称" ></el-table-column>
 			<el-table-column  prop="ProvinceName" label="景点地址">
@@ -27,12 +27,12 @@
 				<span>{{scope.row.ProvinceName}}、{{scope.row.CityName}}、{{scope.row.DistrictName}}</span>
 			  </template>
 			</el-table-column>
-	
+
 			<el-table-column prop="UpdateByName" :label="$t('admin.admin_czPerson')" ></el-table-column>
 			<el-table-column prop="UpdateDate" label="操作时间" ></el-table-column>
-			
-	
-			<el-table-column fixed="right" :label="$t('system.table_operation')"> width="180" >
+
+
+			<el-table-column fixed="right" :label="$t('system.table_operation')" width="180" >
 			  <template slot-scope="scope">
 				<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
 				  <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
@@ -44,12 +44,12 @@
 			</el-table-column>
 		  </el-table>
 		</div>
-		<el-pagination 
+		<el-pagination
 			 background
-			 @current-change="handleCurrentChange" 
+			 @current-change="handleCurrentChange"
 			 :current-page.sync="currentPage"
 			 layout="total,prev, pager, next, jumper"
-			 :page-size=msg.pageSize 
+			 :page-size=msg.pageSize
 			 :total=total>
 		</el-pagination>
 		<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
@@ -57,30 +57,30 @@
 							<table class="layerNoIcon">
 								<el-form-item  label="景点名称" prop="Name">
 									<el-input class='w600' type="text" v-model="addMsg.Name" placeholder="请输入"></el-input>
-								</el-form-item>	
+								</el-form-item>
 								<el-form-item  label="景点拼音">
 									<el-input class='w600' type="text" v-model="addMsg.PinYin" placeholder="请输入"></el-input>
-								</el-form-item>	
-								
+								</el-form-item>
+
 								<el-form-item label="景点地址">
-									
+
 									<el-select v-model="addMsg.ProvinceId" class="w150"  filterable @change="getProvinceList(addMsg.ProvinceId,2)" :placeholder="$t('hotel.hotel_province')">
 										<el-option v-for='item in provinceList'
-											:key="item.ID" 
+											:key="item.ID"
 											:label="item.Name"
 											:value="item.ID">
 										</el-option>
-									</el-select>                           
+									</el-select>
 									<el-select v-model="addMsg.CityId" class="w150"  filterable @change="getProvinceList(addMsg.CityId,3)" :placeholder="$t('hotel.hotel_city')">
 										<el-option v-for='item in cityList'
-											:key="item.ID" 
+											:key="item.ID"
 											:label="item.Name"
 											:value="item.ID">
 										</el-option>
 									</el-select>
 									<el-select v-model="addMsg.DistrictId" class="w150"  filterable :placeholder="$t('hotel.hotel_area')">
 										<el-option v-for='item in district'
-											:key="item.ID" 
+											:key="item.ID"
 											:label="item.Name"
 											:value="item.ID">
 										</el-option>
@@ -88,16 +88,16 @@
 								</el-form-item>
 						    </table>
 						</el-form>
-						
-						
+
+
 					<div  slot="footer" class="dialog-footer">
 						<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
 						 &nbsp;
 						<button class="normalBtn" type="primary" @click="submitForm('addMsg',1)" v-if="dialogTitle=='新增景点'">新增</button>
 						<button class="normalBtn" type="primary" @click="submitForm('addMsg',2)" v-if="dialogTitle=='修改景点'">修改</button>
 					</div>
-					
-			</el-dialog>		
+
+			</el-dialog>
 	</div>
 </template>
 
@@ -105,7 +105,7 @@
 	export default {
 		data() {
 			return {
-				
+
 				loading:true,
 				//分页
 				total: 0,
@@ -128,21 +128,21 @@
 					CityId:'',
 					ProvinceId:'',
 					PinYin:'',
-					
+
 				},
 				rules:{
 					Name: [{
 						required: true,
 						message: '景点名称',
 						trigger: 'blur'
-					}],	
+					}],
 					Content: [{
 						required: true,
 						message: this.$t('adm.adm_qsrgbneirong'),
 						trigger: 'blur'
-					}],	
+					}],
 				},
-				
+
 				//返回结果
 				DataList: [],
 			    detailMessage:[],
@@ -152,7 +152,7 @@
 				district: "",
 			}
 		},
-	
+
 		mounted() {
 			let userInfo=this.getLocalStorage();
 		    this.addMsg.RB_Group_Id=userInfo.RB_Group_id
@@ -178,14 +178,14 @@
 					this.addMsg.ProvinceId = "";
 					this.addMsg.CityId = "";
 					this.addMsg.DistrictId = "";
-					
+
 				} else if (type == 2) {
 					this.addMsg.CityId = "";
 					this.addMsg.DistrictId = "";
-					
+
 				} else if (type == 3) {
 					this.addMsg.DistrictId = "";
-					
+
 				}
 				if (this.addMsg.Country != "" || this.msg.CountryStr != "") {
 					this.apipost(
@@ -204,7 +204,7 @@
 					);
 				}
 			},
-			
+
 			getList() { //景点列表
 				this.loading=true;
 				this.apipost('car_get_GetScenicPageList', this.msg, res => {
@@ -212,11 +212,11 @@
 						this.loading=false;
 						this.DataList = res.data.data.pageData;
 						this.total = res.data.data.count;
-					}  
+					}
 				}, err => {})
 			},
 			Edit(row){
-				
+
 				this.dialogTitle='修改景点'
 				this.addMsg.Name = row.Name;
 				this.addMsg.Id = row.Id;
@@ -228,7 +228,7 @@
 
 				this.outerVisible=true;
 			},
-		
+
 			addNotice(_status){
 				this.apipost('car_post_SetScenicInfo', this.addMsg, res => {
 						if(res.data.resultCode == 1) {
@@ -237,7 +237,7 @@
 							this.getList()
 							this.resetForm('addMsg');
 						} else {
-							this.$message.error(res.data.message)	
+							this.$message.error(res.data.message)
 						}
 					}, err => {})
 			},
@@ -249,15 +249,15 @@
 							that.$message.success(res.data.message)
 							that.getList()
 						} else {
-							that.$message.error(res.data.message)	
+							that.$message.error(res.data.message)
 						}
 					}, err => {})
 				});
 			},
-		
-		
-		
-		
+
+
+
+
 			handleCurrentChange(val) {
 				this.msg.pageIndex = val;
 				this.getList();
@@ -269,7 +269,7 @@
 				this.$refs[addMsg].validate((valid) => {
 					if(valid) {
 						if(this.addMsg.ProvinceId=='' || this.addMsg.CityId == ''){
-							this.$message.error('请选择地址')	
+							this.$message.error('请选择地址')
 							return
 						}
 						this.addNotice(_type)
@@ -286,9 +286,9 @@
 				if (formName) {
 					this.$refs[formName].resetFields();
 				}
-				
+
 				this.addMsg.Id='-1'
-			}			
+			}
 		}
 	}
 </script>
@@ -310,8 +310,8 @@
 	.el-table .el-table__row {
 		font-size: 12px!important;
 	}
-	
+
 	.el-table__row td {
 		padding: 5px 0;
 	}
-</style>
+</style>
\ No newline at end of file

src/components/TravelManager/customizedcar/lineoffer.vue

@@ -11,8 +11,8 @@
           :placeholder="$t('ground.xuanzeyue')"></el-date-picker>
       </div>
     </div>
-  
-   
+
+
     <div class="lineoffer_calendar">
       <div class="lineoffer_calendarItem" v-for="(item, index) in dayList" :key="index">
         <div class="calendarItem_month" :title="$t('ground.dianjichakanxq')" @click="calendarShow(item, index)">
@@ -48,7 +48,7 @@
                       <th width="100" style="text-align:center">出发时间</th>
                       <th width="80" style="text-align:center">b2b价格</th>
                       <th width="80" style="text-align:center">b2c价格</th>
-                     
+
                       <th width="100" style="text-align:center">车名称</th>
                       <th width="80" style="text-align:center">品牌</th>
                       <th width="140" style="text-align:center">车型号</th>
@@ -60,12 +60,12 @@
                         {{childItem.DepartureTime}}
                       </td>
                       <td style="text-align:center;white-space:nowrap; ">
-                        {{childItem.Price}} 
+                        {{childItem.Price}}
                       </td>
                        <td style="text-align:center;white-space:nowrap; ">
-                        {{childItem.B2CPrice}} 
+                        {{childItem.B2CPrice}}
                       </td>
-                    
+
                       <td style="text-align:center;white-space:nowrap; ">
                         {{childItem.CarName}}
                       </td>
@@ -75,14 +75,14 @@
                       <td style="text-align:center">
                         {{childItem.CarModel}}
                       </td>
-                    
+
                         <td style="text-align:center">
                         {{childItem.GuestNum}}
                       </td>
                         <td style="text-align:center;white-space:nowrap; ">
                         {{childItem.EnrollSeat}}
                       </td>
-                     
+
                     </tr>
                   </table>
 
@@ -120,13 +120,13 @@
           </el-col>
         </el-row>
         <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;" v-for="(x,y) in msg2.PlanList" :key="y">
-         
+
           <el-col :span="6" >
             <el-form-item label="出发时间">
               <el-time-picker
                 v-model="x.DepartureTime"
                 value-format='HH:mm'
-                format='HH:mm' 
+                format='HH:mm'
                 placeholder="选择时间">
                 </el-time-picker>
             </el-form-item>
@@ -163,7 +163,7 @@
 
       </el-form>
     </div>
-    
+
     <!-- 弹出编辑 -->
     <div class="lineoffer_edit" v-show="editShow">
       <div class="lineoffer_edit_header">
@@ -245,13 +245,13 @@
           </el-col>
         </el-row>
         <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;" v-for="(x,y) in msg.PlanList" :key="y">
-         
+
           <el-col :span="6" >
             <el-form-item label="出发时间">
               <el-time-picker
                 v-model="x.DepartureTime"
                 value-format='HH:mm'
-                format='HH:mm' 
+                format='HH:mm'
                 placeholder="选择时间">
                 </el-time-picker>
             </el-form-item>
@@ -285,10 +285,10 @@
           </el-col>
         </el-row>
         <input type="button" value="添加" style="margin-left:30px" @click="addcarlist_o(1)" class="hollowbtn" />
-       
-       
-      
-       
+
+
+
+
       </el-form>
     </div>
     <el-dialog
@@ -300,7 +300,7 @@
 			<ul>
 				<li><span><em>车辆类型</em><el-select  filterable  v-model='carmsg.CarType' >
 							        <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-									<el-option v-for='item in companyList' 
+									<el-option v-for='item in companyList'
 										:label='item.Name'
 										:value='item.Id'
 										:key='item.Id'>
@@ -327,8 +327,8 @@
                         {{scope.row.CarName}}
                         </div>
                     </div>
-                    
-                  </template>    
+
+                  </template>
             </el-table-column>
 			<el-table-column  prop="CarTypeName" :label="$t('system.query_type')"> </el-table-column>
 			<el-table-column  prop="CarModel" label="型号"> </el-table-column>
@@ -336,7 +336,7 @@
 			<el-table-column  prop="BrandName" label="品牌"> </el-table-column>
 			<el-table-column  prop="CarNo" label="车牌号"> </el-table-column>
 			<el-table-column  prop="GuestNum" label="荷载人数"> </el-table-column>
-             <el-table-column  :label="$t('system.table_operation')"> width="100" >
+             <el-table-column  :label="$t('system.table_operation')" width="100" >
                 <template slot-scope="scope">
                       <div class="btn_check" style="display: inline-block;
                                 margin: 0 0 0 10px;
@@ -462,7 +462,7 @@
               {DepartureTime:'',CarId:'',Price:'', CostPrice:'',B2CPrice:'',CarName:''}
           ]
 
-         
+
         },
         msg2: {
           ProductId: '0',
@@ -578,8 +578,8 @@
             message: this.$t("ground.fromrule[18]"),
             trigger: 'blur'
           },
-         
-         
+
+
         },
         rules2: {
           InventoryType: {
@@ -647,7 +647,7 @@
             message: this.$t("ground.fromrule2[12]"),
             trigger: 'blur'
           },
-         
+
         },
         companyList:[],//车辆类型
         carList:[],//车辆列表
@@ -657,11 +657,11 @@
       }
     },
     methods: {
-     
-    
+
+
       //库存类型
       stockColor: function (item, item2, childItem) {
-          
+
         if (item.date === item2.month && item2.hasOwnProperty('data')) {
           let type = item2.data.SubList.length;
           if(type>0){
@@ -762,7 +762,7 @@
           }else if(type==2){
               this.msg2.PlanList.push(obj)
           }
-         
+
       },
       delete_b(index,y){//删除
          if(y == 1){
@@ -806,7 +806,7 @@
                 }
             }, err => {})
         },
-   
+
       // 日期类型切换
       dayTypeChange: function (val) {
         this.msg.Year = ''
@@ -820,7 +820,7 @@
         let nowDate = new Date().Format('yyyy-MM-dd');
         this.msg.StartDate = date === undefined ? nowDate : date;
         this.msg.EndDate = date === undefined ? nowDate : date;
-       
+
         if (type === '2' && date) {
              this.msg.DayType = '4'
             this.msg.PlanList = BatchNumber
@@ -832,7 +832,7 @@
       editCanel: function () {
         this.editShow = false;
         this.$refs['hotelProductForm'].resetFields();
-      
+
       },
     // 弹窗初始化
     tancchushih(){
@@ -897,7 +897,7 @@
           }
         });
       },
-   
+
       //批量删除
       delete2Reset: function () {
         var that = this;

src/components/busManagement/BookAcar/addEditVehicle.vue

@@ -173,21 +173,21 @@
       .c9e{
         color: #9e9e9e;
       }
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
       .flexOne-right{
         width: 300px;
         flex-shrink: 0;
@@ -270,14 +270,14 @@
       /deep/.el-date-editor.el-input, .el-date-editor.el-input__inner{
         width: 200px;
       }
-    
+
     </style>
     <template>
       <div class="flexOne">
         <div class="flexOne-left">
             <el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
           <div class="flexOne-form-bj">
-            <h3> 
+            <h3>
                 团订信息
             </h3>
             <div class="listone-form">
@@ -310,13 +310,13 @@
                   <li>
                     <el-form-item label="用车人数" prop="PeopleNum">
                       <!--  :max="SeatNum" -->
-                      <el-input-number v-model="msg.PeopleNum" :min="1" 
+                      <el-input-number v-model="msg.PeopleNum" :min="1"
                       placeholder="请输入用车人数" @change="getBusType"/>
                     </el-form-item>
                   </li>
                   <li>
                     <el-form-item label="开始日期" prop="StartDate">
-                        <el-date-picker v-model='msg.StartDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" 
+                        <el-date-picker v-model='msg.StartDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
                         :picker-options="beforeCheck" placeholder="选择日期" @change="checkInteger">
                         </el-date-picker>
                     </el-form-item>
@@ -362,7 +362,7 @@
                           </el-select>
                         </el-form-item>
                       </li>
-                    
+
                   </div>
                 </div>
               </div>
@@ -404,10 +404,10 @@
                       </el-form-item>
                       </div>
                     </el-popover>
-                    
+
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('system.table_operation')"> width="100">
+                <el-table-column :label="$t('system.table_operation')" width="100">
                   <template slot-scope="scope">
                     <el-button size="small" type="primary" @click="deleteLine(scope.$index)">{{$t('system.table_delete')}}</el-button>
                   </template>
@@ -416,16 +416,16 @@
             </div>
             </div>
             <div class="flexOne-infor-box">
-              
+
               <div style="margin-top: 20px;">
                 <div style="margin-bottom: 10px;">备注：</div>
-                <el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" 
+                <el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
                 v-model="msg.CreateRemark" :placeholder="$t('visaT.Orderremark')"/>
               </div>
             </div>
-            
+
           </div>
-          
+
           <!-- <div class="notice">
             <b>{{$t('objFill.yudinxuzhi')}}</b>
             <p></p>
@@ -652,11 +652,11 @@
                                     return val1 - val2
                                   })
                                 }
-                                
+
                               }
                           })
-                          
-                          
+
+
                       }
                   }
               }
@@ -720,7 +720,7 @@
                   }
               },
               err => {
-                  this.Error(err.message) 
+                  this.Error(err.message)
               });
             },
         // 获取车型下拉
@@ -731,13 +731,13 @@
                 this.loading = false;
                 if (res.data.resultCode == 1) {
                     this.vehicletop = res.data.data
-                    
+
                 } else {
                     this.Error(res.data.message)
                 }
             },
             err => {
-                this.Error(err.message) 
+                this.Error(err.message)
             });
         },
           submit(){
@@ -770,7 +770,7 @@
                       }
                   },
                   err => {
-                      this.Error(err.message) 
+                      this.Error(err.message)
                   });
           },
           // 获取订单详情
@@ -802,10 +802,10 @@
                         this.isCheck = true
                         this.getBusType()
                     }
-              
+
             })
             },
-          
+
         },
         mounted() {
           // crm自动登陆传过来的参数
@@ -831,9 +831,8 @@
           }
           this.vehicleinit()
           this.vehicleList()
-          
+
         }
       };
-    
+
     </script>
-    
\ No newline at end of file

src/components/dmc/manager/GroundSupplier/index.vue

@@ -139,7 +139,7 @@
             <p>{{scope.row.CreateDate}}</p>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('system.table_operation')"> width="165">
+        <el-table-column prop="" :label="$t('system.table_operation')" width="165">
           <template slot-scope="scope">
             <template v-if="(scope.row.IsSeeAll==1&&userInfo.EmployeeId==scope.row.CreateBy)||scope.row.IsSeeAll==0">
               <el-tooltip class="item" effect="dark" :content="$t('visaT.Accountmanagement')" placement="top">