Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/activityManagement/activityList.vue

@@ -36,7 +36,7 @@
             <span v-if="scope.row.status==2">下架</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作" width="200">
+        <el-table-column align="center" label="操作" width="200"  fixed="right">
             <template scope="scope">
                 <el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
                 <el-button size="small" type="success" @click="handleActivityData(scope.row)" style="margin-left:0px">活动数据</el-button>
@@ -275,7 +275,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         pickerOptionsEnd: {
             disabledDate: time => {
                 const beginDateVal = new Date(this.formdata.starTimeStr).getTime()
@@ -289,7 +289,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         shareDatapickerOptionsEnd: {
             disabledDate: time => {
                 const beginDateVal = new Date(this.shareDataQuery.starTimeStr).getTime()
@@ -303,7 +303,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         newPeopelpickerOptionsEnd: {
             disabledDate: time => {
                 const beginDateVal = new Date(this.newPeopelDataQuery.starTimeStr).getTime()
@@ -455,7 +455,7 @@
             console.log(this.formdata)
             that.newPeopelVisible = true;
           })
-          
+
       },
       handleActivityData(row){
         // 1--新人尊享; 2--推广活动表

src/views/appManagement/appVersion/index.vue

@@ -63,12 +63,12 @@
           <span>{{scope.row.downloadSwitch}}/{{scope.row.isCompel}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="581" align="center" label="版本详情">
+      <el-table-column align="center" label="版本详情">
         <template scope="scope">
           <span><p><font size="1" face="arial">{{scope.row.content}}</font></p></span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="200">
+      <el-table-column align="center" label="操作" width="160" fixed="right">
         <template scope="scope">
           <el-button size="small" type="primary" @click="compileAppUpload(scope.row)">编辑
           </el-button>

src/views/appManagement/modalManagement/index.vue

@@ -39,12 +39,12 @@
           <img :src="scope.row.background" style="width:100%;max-height:100px;">
         </template>
       </el-table-column>
-      <el-table-column width="300" align="center" label="创建时间">
+      <el-table-column width="250" align="center" label="创建时间">
         <template scope="scope">
           <span>{{scope.row.crtTimeStr}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="300" align="center" label="状态">
+      <el-table-column  align="center" label="状态">
         <template scope="scope">
           <span v-if="scope.row.status==1">上架</span>
           <span v-if="scope.row.status==2">下架</span>
@@ -226,7 +226,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         pickerOptionsEnd: {
             disabledDate: time => {
                 const beginDateVal = new Date(this.form.starTimeStr).getTime()
@@ -304,7 +304,7 @@
           console.log(this.form)
           this.bannerDialogVisible = true;
         })
-        
+
       },
       /**
        * 弹框-取消

src/views/appManagement/selectedActivities/index.vue

@@ -34,17 +34,17 @@
           <img :src="scope.row.picture" style="width:100%;max-height:100px;">
         </template>
       </el-table-column>
-      <el-table-column width="300" align="center" label="排序">
+      <el-table-column align="center" label="排序">
         <template scope="scope">
           <span>{{scope.row.sort}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="300" align="center" label="创建时间">
+      <el-table-column width="250" align="center" label="创建时间">
         <template scope="scope">
           <span>{{scope.row.crtTimeStr}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="300" align="center" label="状态">
+      <el-table-column align="center" label="状态">
        <template scope="scope">
           <span v-if="scope.row.status==1">上架</span>
           <span v-if="scope.row.status==2">下架</span>
@@ -210,7 +210,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         pickerOptionsEnd: {
             disabledDate: time => {
                 const beginDateVal = new Date(this.form.starTimeStr).getTime()
@@ -286,7 +286,7 @@
           this.form = item;
           this.bannerDialogVisible = true;
         })
-        
+
       },
       /**
        * 弹框-取消

src/views/campsiteManage/campsiteLabel.vue

@@ -6,17 +6,17 @@
       </el-button>
     </div>
     <el-table :key='tableKey' :data="list" border fit highlight-current-row
-              style="width: 867px">
+              style="width: 100%">
       <el-table-column
         type="index"
         align="center" label="序号" width="65">
       </el-table-column>
-      <el-table-column width="200" align="center" label="类型名称">
+      <el-table-column align="center" label="类型名称">
         <template scope="scope">
           <span>{{scope.row.name}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="标签底图">
+      <el-table-column align="center" label="标签底图">
         <template scope="scope">
           <img :src="scope.row.tagUrl" style="width: 130px;"/>
         </template>
@@ -28,7 +28,7 @@
           <el-button size="mini" type="text" @click="isSearchChange(scope.row)" v-else ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" width="200" label="操作">
+      <el-table-column align="center" width="200" label="操作" fixed="right">
         <template scope="scope">
           <el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑
           </el-button>

src/views/campsiteManage/index.vue

@@ -33,12 +33,12 @@
         </el-button>
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
-                style="width: 1367px;">
+                style="width: 100%">
         <el-table-column
           type="index"
           align="center" label="序号" width="65">
         </el-table-column>
-        <el-table-column width="200" align="center" label="名称">
+        <el-table-column align="center" label="名称">
           <template scope="scope">
             <img :src="scope.row.cover" style="width: 30px;"/>
             <span>{{scope.row.name}}</span>
@@ -57,12 +57,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column width="300" align="center" label="创建时间">
+        <el-table-column align="center" label="创建时间">
           <template scope="scope">
             <span>{{scope.row.crtTimeStr}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" width="300" label="操作">
+        <el-table-column align="center" width="300" label="操作" fixed="right">
           <template scope="scope">
             <el-button size="small" type="success" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
             </el-button>

src/views/cunponManagements/cunponManagement.vue

@@ -61,7 +61,7 @@
             <span>{{scope.row.crtTimeStr}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center" label="操作"  fixed="right">
           <template scope="scope">
             <el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
             <el-popover
@@ -371,7 +371,7 @@
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
           }
-        }, 
+        },
         // pickerOptionsStart: {
         //         disabledDate: time => {
         //           const endDateVal = new Date(this.formdata.endTimeStr).getTime()
@@ -489,8 +489,8 @@
             that.formdata = item;
             that.editDialogVisible = true;
           })
-          
-          
+
+
       },
       addCunpon(){
           var that = this;
@@ -541,7 +541,7 @@
             }else{
               that.formdata.endTime = 0
             }
-            
+
             console.log(that.formdata)
             addObj(that.formdata)
               .then(response => {
@@ -597,7 +597,7 @@
             }else{
               that.formdata.endTime = 0
             }
-            
+
             console.log(that.formdata)
             addObj(that.formdata)
               .then(response => {
@@ -683,7 +683,7 @@
     }
   }
 </script>
- 
+
 <style lang="" scope>
-    
-</style>
+
+</style>
\ No newline at end of file

src/views/index/index.vue

@@ -70,7 +70,7 @@
         </div>
         <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
                 style="width: 100%;cursor: pointer;" class="schedul-tb">
-        <el-table-column width="220" align="center" :label="firstTime">
+        <el-table-column width="220" align="center" :label="firstTime" fixed>
           <template scope="scope">
             <div>
               <div style="color: #bfcbd9;font-size: 14px;">
@@ -493,10 +493,10 @@
 //        <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
         if(!ii.bg){
           //空白-可安排用车
-          this.anpai = true;
-          let arr = item.vehicleModel.keyword.split(",");
-          item.vehicleModel.keyword = arr.join(" | ");
-          this.currentItem = {item: item, iitem: iitem, ii: ii};
+//          this.anpai = true;
+//          let arr = item.vehicleModel.keyword.split(",");
+//          item.vehicleModel.keyword = arr.join(" | ");
+//          this.currentItem = {item: item, iitem: iitem, ii: ii};
         } else {
           if(ii.bookType == 6){
             //保养

src/views/order/memberOrderInfo/index.vue

@@ -20,7 +20,7 @@
 								<el-option :key="2" label="取消" :value="2"></el-option>
 								<el-option :key="3" label="待付款" :value="3"></el-option>
 								<el-option :key="6" label="已完成" :value="6"></el-option>
-								
+
 					    </el-select>
 					  </el-form-item>
 					</el-col>
@@ -45,7 +45,6 @@
 		  </el-form>
 		  <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
 			<el-button class="filter-item" type="primary" v-waves icon="delete" @click="clearSearch">清除搜索</el-button>
-		  </el-button>
 		</div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading"
               border fit highlight-current-row
@@ -55,12 +54,12 @@
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="订单号">
+      <el-table-column align="center" label="订单号">
         <template scope="scope">
           <span>{{scope.row.no}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="150" align="center" label="名称">
+      <el-table-column align="center" label="名称">
         <template scope="scope">
           <span>{{scope.row.name}}</span>
         </template>
@@ -92,7 +91,7 @@
 					<span v-if="scope.row.status == '6'">已完成</span>
 			  </template>
 			</el-table-column>
-			
+
 			<!-- <el-table-column width="150" align="center" label="手机号">
 			  <template scope="scope">
 			   <span>{{scope.row.telephone}}</span>
@@ -301,7 +300,7 @@
 				}
 				if(this.listQuery.name == '1') {
 					this.listQuery.name = "普通会员"
-				} else 
+				} else
 				if(this.listQuery.name == '2') {
 					this.listQuery.name = "黄金会员"
 				} else
@@ -309,7 +308,7 @@
 					this.listQuery.name = "钻石会员"
 				} else {
 					this.listQuery.name = null
-				}		
+				}
         page(this.listQuery)
           .then(response => {
             this.list = response.data.data;
@@ -317,7 +316,7 @@
             this.listLoading = false;
           })
       },
-		
+
       handleSizeChange(val) {
         this.listQuery.limit = val;
         this.getList();

src/views/order/rentVehicleInfo/index.vue

@@ -56,7 +56,7 @@
           <span>{{scope.row.no}}</span><br><span>{{scope.row.crtTime}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="180" align="center" label="名称/车牌号">
+      <el-table-column align="center" label="名称/车牌号">
         <template scope="scope">
           <span>{{scope.row.name}}</span><br/><span>{{scope.row.vehicleNumberPlat}}</span>
         </template>
@@ -90,7 +90,7 @@
         </template>
       </el-table-column>
 
-			<el-table-column width="110" align="center" label="订单状态">
+			<el-table-column align="center" label="订单状态">
 			  <template scope="scope">
 					<span v-if="scope.row.status == '2'">取消</span>
 					<span v-if="scope.row.status == '3'">待付款</span>
@@ -100,17 +100,17 @@
 			  </template>
 			</el-table-column>
 
-			<el-table-column width="110" align="center" label="订单详情" fixed="right">
+			<el-table-column width="100" align="center" label="订单详情" fixed="right">
 			  <template scope="scope">
 					<span style="color: #13CE66;cursor: pointer;" @click="handleOrderDetail(scope.row)">订单详情</span>
 			  </template>
 			</el-table-column>
-     <el-table-column align="center" label="操作" width="400" fixed="right">
+     <el-table-column align="center" label="操作" width="150" fixed="right">
           <template scope="scope">
-					 <el-button  size="small" v-if="scope.row.status >=4" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
-					 <el-button  size="small" v-if="scope.row.status == 6" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
-					 <el-button  size="small" v-if="scope.row.status > 3" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
-					 <el-button 	size="small" v-if="scope.row.status == 6&&order_btn_order_violcation_save" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
+					 <el-button  size="small" v-if="scope.row.status >=4" class="el-button el-button--text el-button--small" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
+					 <el-button  size="small" v-if="scope.row.status == 6" class="el-button el-button--text el-button--small" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
+					 <el-button  size="small" v-if="scope.row.status > 3" class="el-button el-button--text el-button--small" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
+					 <el-button 	size="small" v-if="scope.row.status == 6&&order_btn_order_violcation_save" class="el-button el-button--text el-button--small" @click="illegalInquiry(scope.row)">违章查询</el-button>
 					</template>
       </el-table-column>
     </el-table>

src/views/order/tourOrderInfo/index.vue

@@ -56,12 +56,12 @@
 				 <span>{{scope.row.crtTime}}</span>
        </template>
      </el-table-column>
-     <el-table-column width="200" align="center" label="名称">
+     <el-table-column align="center" label="名称">
        <template scope="scope">
          <span>{{scope.row.name}}</span>
        </template>
      </el-table-column>
-     <el-table-column width="150" align="center" label="用户ID/用户名">
+     <el-table-column  align="center" label="用户ID/用户名">
        <template scope="scope">
         <span>{{scope.row.username}}</span>/<span>{{scope.row.telephone}}</span>
        </template>
@@ -100,7 +100,7 @@
 					<span v-if="scope.row.status == '6'">已完成</span>
 			  </template>
 			</el-table-column>
-			<el-table-column width="110" align="center" label="订单详情">
+			<el-table-column width="110" align="center" label="订单详情" fixed="right">
 			  <template scope="scope">
 					<span style="color: #13CE66;cursor: pointer;" @click="handleBuy(scope.row)">订单详情</span>
 			  </template>

src/views/purseManage/discountRecord.vue

@@ -62,7 +62,7 @@
             <span>{{scope.row.finishTimeStr}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center" label="操作" width="100" fixed="right">
           <template scope="scope">
             <el-button size="small" type="primary" v-if="scope.row.stauts==0" @click="handleUpdate(scope.row)">审核</el-button>
           </template>

src/views/purseManage/gainRecord.vue

@@ -38,7 +38,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column width="200" align="center" label="姓名">
+        <el-table-column align="center" label="姓名">
           <template scope="scope">
             <span>{{scope.row.username}}</span>
           </template>

src/views/purseManage/incomeOverview.vue

@@ -15,12 +15,12 @@
               </el-form-item>
             </el-col>
             <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
-          </el-row> 
+          </el-row>
         </el-form>
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%;">
-        <el-table-column width="250" align="center" label="姓名" type="index">
+        <el-table-column width="150" align="center" label="姓名" type="index">
           <template scope="scope">
             <span>{{scope.row.username}}</span>
           </template>
@@ -58,7 +58,7 @@
             <span>{{scope.row.unbooked}}</span>
           </template>
         </el-table-column>
-        <el-table-column width="200" align="center" label="当前余额">
+        <el-table-column align="center" label="当前余额">
           <template scope="scope">
             <span>{{scope.row.balance}}</span>
           </template>

src/views/tourManage/index.vue

@@ -50,12 +50,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column width="100" align="center" label="销量">
+        <el-table-column align="center" label="销量">
           <template scope="scope">
             <span>{{scope.row.saleCount}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" width="300" label="操作">
+        <el-table-column align="center" width="200" fixed="right" label="操作">
           <template scope="scope">
             <el-button v-if="tourManage_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑
             </el-button>

src/views/tourManage/tourLabel.vue

@@ -6,17 +6,17 @@
       </el-button>
     </div>
     <el-table :key='tableKey' :data="list" border fit highlight-current-row
-              style="width: 1267px;">
+              style="width: 100%;">
       <el-table-column
         type="index"
         align="center" label="序号" width="65">
       </el-table-column>
-      <el-table-column width="100" align="center" label="标签名称">
+      <el-table-column align="center" label="标签名称">
         <template scope="scope">
           <span>{{scope.row.tourTagDTO.name}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="封面图">
+      <el-table-column align="center" label="封面图">
         <template scope="scope">
           <img :src="scope.row.tourTagDTO.img" style="width:100%;max-height:100px;">
         </template>
@@ -45,7 +45,7 @@
           <!--<el-icon v-else class="el-icon-star-off" @click="tourTagHotChange(scope.row)"></el-icon>-->
         </template>
       </el-table-column>
-      <el-table-column align="center" width="200" label="操作">
+      <el-table-column align="center" width="200" label="操作"  fixed="right">
         <template scope="scope">
           <el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑
           </el-button>

src/views/userManagement/memberEnter.vue

@@ -38,8 +38,10 @@
       </el-button>
     </div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
-              style="width: 100%;">
-      <el-table-column width="150" align="center" label="手机号">
+              style="width: 100%">
+    <!--<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row-->
+              <!--style="width: 100%">-->
+      <el-table-column width="200" align="center" label="手机号">
         <template scope="scope">
           <span>{{scope.row.username}}</span>
         </template>
@@ -64,7 +66,7 @@
           <span>{{scope.row.rentFreeDays}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="录入时间">
+      <el-table-column align="center" label="录入时间">
         <template scope="scope">
           <span>{{scope.row.crtTimeStr}}</span>
         </template>
@@ -74,12 +76,12 @@
           <span>{{scope.row.status==1?"已核销":"未核销"}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="110" align="center" label="操作人">
+      <el-table-column width="180" align="center" label="操作人">
         <template scope="scope">
           <span>{{scope.row.crtName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="100">
+      <el-table-column align="center" label="操作" width="100" fixed="right">
         <template scope="scope">
           <el-popover
             ref="popover5"

src/views/userManagement/memberManagement/index.vue

@@ -42,7 +42,7 @@
           <span>{{scope.row.endDate}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="212">
+      <el-table-column align="center" label="操作" width="212" fixed="right">
         <template scope="scope">
           <el-button size="small" type="danger" @click="delMembership(scope.row)" v-if="memberManagement_btn_del">删除
           </el-button>

src/views/userManagement/userList/index.vue

@@ -82,7 +82,7 @@
           <span>{{scope.row.userId}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="140" align="center" label="手机号">
+      <el-table-column align="center" label="手机号">
         <template scope="scope">
           <span>{{scope.row.username}}</span>
         </template>
@@ -127,13 +127,13 @@
       <!--          <span>{{scope.row.updName}}</span>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column align="center" label="操作" width="480">
+      <el-table-column align="center" label="操作" width="380" fixed="right">
         <template scope="scope">
-          <el-button size="small" type="success" @click="viewDetails(scope.row)">查看详情
+          <el-button size="small"  class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">查看详情
           </el-button>
-          <el-button v-if="scope.row.status!=1&&userList_btn_edit" size="small" type="success" @click=" setMember(scope.row)">设置会员信息
+          <el-button  class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit" size="small" @click=" setMember(scope.row)">设置会员信息
           </el-button>
-          <el-button v-if="scope.row.status!=1" size="small" type="success" @click="userOrder(scope.row)">用户订单
+          <el-button  class="el-button el-button--text el-button--small" v-if="scope.row.status!=1" size="small" @click="userOrder(scope.row)">用户订单
           </el-button>
           <el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small" type="danger" @click="disable(scope.row)">设为禁用
           </el-button>
@@ -143,6 +143,7 @@
             ref="popover5"
             placement="top"
             width="160"
+
             v-model="scope.row.visible2">
             <p>确定删除吗？</p>
             <div style="text-align: right; margin: 0">
@@ -720,7 +721,7 @@
             _this.setMemberLevelList.push({id:ele.id,name:ele.name})
           })
             // console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList))
-         } 
+         }
         )
       },
 

src/views/vehicle/bookRecord/index.vue

@@ -54,7 +54,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="申请状态" width="150">
+      <el-table-column align="center" label="申请状态">
         <template scope="scope">
           <span>{{getBookRecordStatus(scope.row.status)}}</span>
         </template>
@@ -65,7 +65,7 @@
           <span>{{scope.row.vehicleUsername}}/{{scope.row.vehicleUserPhone}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="出车用途" width="250">
+      <el-table-column align="center" label="出车用途" width="120">
         <template scope="scope">
           <span v-if="scope.row.bookType==1">租车</span>
           <span v-if="scope.row.bookType==2">用户租赁</span>
@@ -187,7 +187,7 @@
               <span style="color: #13CE66;cursor: pointer;" @click="handleDetail(scope.row)">订单详情</span>
             </template>
         </el-table-column>
-      <el-table-column align="center" label="操作" width="250" fixed="right">
+      <el-table-column align="center" label="操作" width="200" fixed="right">
         <template scope="scope">
           <!-- <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button> -->
           <el-button  size="small" type="success" v-if="scope.row.status==3" @click="illegalInquiry(scope.row)">违章记录</el-button>
@@ -574,7 +574,7 @@
 				allBranchCompany:[],
         state2: '',//搜索-分公司名称
         rules4Query: {
-          
+
         },
         list: null,
         total: null,
@@ -1229,4 +1229,4 @@
       background-color: #ccc;
       border: none;
     }
-</style>
+</style>
\ No newline at end of file

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -70,7 +70,7 @@
           <span>{{scope.row.numberPlate}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="250" align="center" label="出车时间">
+      <el-table-column width="200" align="center" label="出车时间">
               <template scope="scope">
                 <span>{{scope.row.departureTime}}</span>
               </template>
@@ -80,12 +80,12 @@
                  <span>{{scope.row.user}}</span>
                </template>
        </el-table-column>
-       <el-table-column width="250" align="center" label="出车地点">
+       <el-table-column width="200" align="center" label="出车地点">
                               <template scope="scope">
                                 <span>{{scope.row.departureName}}</span>
                               </template>
         </el-table-column>
-       <el-table-column width="250" align="center" label="还车时间">
+       <el-table-column width="200" align="center" label="还车时间">
                <template scope="scope">
                  <span>{{scope.row.arrivalTime}}</span>
                </template>
@@ -95,7 +95,7 @@
           <span>{{scope.row.recycleMan}}</span>
         </template>
       </el-table-column>
-        <el-table-column width="250" align="center" label="还车地点">
+        <el-table-column width="200" align="center" label="还车地点">
                        <template scope="scope">
                          <span>{{scope.row.arrivalName}}</span>
                        </template>
@@ -105,7 +105,7 @@
                   <span>{{scope.row.departureDay}}</span>
                 </template>
               </el-table-column>
-        <el-table-column width="130" align="center" label="本次出行公里">
+        <el-table-column width="150" align="center" label="本次出行公里">
                 <template scope="scope">
                   <span>{{scope.row.mileage}}</span>
                 </template>

src/views/vehicle/vehicleInfo/index.vue

@@ -218,7 +218,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="200" align="center" label="备注">
+      <el-table-column align="center" label="备注">
         <template scope="scope">
           <span>{{scope.row.remark}}</span>
         </template>
@@ -318,26 +318,26 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="操作" width="500">
+      <el-table-column align="center" label="操作" width="380" fixed="right">
         <template scope="scope">
-          <el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleInfo_btn_edit?"编辑":"查看"}}
+          <el-button size="small" class="el-button el-button--text el-button--small"@click="handleUpdate(scope.row)">{{vehicleInfo_btn_edit?"编辑":"查看"}}
           </el-button>
-          <el-button v-if="scope.row.status == 1&&vehicleInfo_btn_ride" size="small" type="success" @click="departureHandler(scope.row)">出车
+          <el-button v-if="scope.row.status == 1&&vehicleInfo_btn_ride" size="small" class="el-button el-button--text el-button--small" @click="departureHandler(scope.row)">出车
           </el-button>
-          <el-button v-if="scope.row.status == 4" size="small" type="success" @click="arrivalHandler(scope.row)">收车
+          <el-button v-if="scope.row.status == 4" size="small" class="el-button el-button--text el-button--small" @click="arrivalHandler(scope.row)">收车
           </el-button>
 
-          <el-button v-if="scope.row.status == 1" size="small" type="success" @click="upkeepHandler(scope.row)">保养
+          <el-button v-if="scope.row.status == 1" size="small" class="el-button el-button--text el-button--small" @click="upkeepHandler(scope.row)">保养
           </el-button>
-          <el-button v-if="scope.row.status == 5" size="small" type="success" @click="upkeepEndHandler(scope.row)">
+          <el-button v-if="scope.row.status == 5" size="small" class="el-button el-button--text el-button--small" @click="upkeepEndHandler(scope.row)">
             保养结束
           </el-button>
 
-          <el-button v-if="vehicleInfo_btn_apply && checkIfRuning(scope.row) " size="small" type="success"
+          <el-button v-if="vehicleInfo_btn_apply && checkIfRuning(scope.row) " size="small" class="el-button el-button--text el-button--small"
                      @click="handleApply(scope.row)">申请预订
           </el-button>
-          <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button>
-          <el-button size="small" type="success" @click="handleDepartureLog(scope.row)">出车记录</el-button>
+          <el-button size="small" class="el-button el-button--text el-button--small" @click="handleBookInfo(scope.row)">预订信息</el-button>
+          <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDepartureLog(scope.row)">出车记录</el-button>
           <el-popover
             ref="popover5"
             placement="top"

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -101,7 +101,7 @@
       </div>
       <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
                 style="width: 100%;cursor: pointer;" class="schedul-tb">
-        <el-table-column width="220" align="center" :label="firstTime">
+        <el-table-column width="220" align="center" :label="firstTime"  fixed>
           <template scope="scope">
             <div @click="toVehicleRecords(scope.row)">
               <div style="color: #bfcbd9;font-size: 14px;">

src/views/vehicle/vehicleUpkeepLog/index.vue

@@ -32,7 +32,7 @@
           <span>{{scope.row.amount}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="250" align="center" label="审批人">
+      <el-table-column  align="center" label="审批人">
         <template scope="scope">
           <span>{{scope.row.approvers}}</span>
         </template>
@@ -42,7 +42,7 @@
           <span>{{scope.row.branchCompanyName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="100">
+      <el-table-column align="center" label="操作" width="100" fixed="right">
         <template scope="scope">
           <el-button size="small" type="success" @click="getLogInfo(scope.row)">详情</el-button>
         </template>

src/views/vehicle/vehicleWarningMsg/index.vue

@@ -34,11 +34,16 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="120" align="center" label="请输入车牌号">
+      <el-table-column width="150" align="center" label="车牌号">
         <template scope="scope">
           <span>{{scope.row.numberPlate}}</span>
         </template>
       </el-table-column>
+      <el-table-column width="180" align="center" label="创建时间">
+        <template scope="scope">
+          <span>{{scope.row.createTime}}</span>
+        </template>
+      </el-table-column>
 
 
       <el-table-column width="150" align="center" label="预警消息类型">
@@ -47,25 +52,21 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="300" align="center" label="预警消息内容">
+      <el-table-column width="500" align="center" label="预警消息内容">
         <template scope="scope">
           <span>{{scope.row.msg}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="200" align="center" label="备注">
+      <el-table-column align="center" label="备注">
         <template scope="scope">
           <span>{{scope.row.remark}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="180" align="center" label="创建时间">
-        <template scope="scope">
-          <span>{{scope.row.createTime}}</span>
-        </template>
-      </el-table-column>
 
-      <el-table-column align="center" label="操作" width="100">
+
+      <el-table-column align="center" label="操作" width="100" fixed="right">
         <template scope="scope">
           <el-button  v-if="scope.row.status == 1&&vehicleInfo_btn_upkeep" size="small" type="success" @click="handleDeal(scope.row)">处理
           </el-button>

src/views/vehicleType/index.vue

@@ -40,7 +40,7 @@
           type="index"
           align="center" label="序号" width="65">
         </el-table-column>
-        <el-table-column width="400" align="center" label="车型名称/价格">
+        <el-table-column align="center" label="车型名称/价格">
           <template scope="scope">
             <img :src="scope.row.picture" style="width: 30px;"/>
             <span>{{scope.row.name}}</span><span style="color:red;">￥{{scope.row.price}}</span>
@@ -53,7 +53,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column width="200" align="center" label="品牌">
+        <el-table-column  align="center" label="品牌">
           <template scope="scope">
             <span>{{scope.row.brandName}}</span>
           </template>
@@ -74,7 +74,7 @@
             <span>{{scope.row.leasableQuantity}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" width="200" label="操作">
+        <el-table-column align="center" width="200" label="操作" fixed="right">
           <template scope="scope">
             <el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}}
             </el-button>

src/views/vehicleType/vehicleTypeLabel.vue

@@ -8,7 +8,7 @@
     <el-table
       :data="list"
       :row-key="getRowKeys" :expand-row-keys="expands"
-      style="width: 1350px;">
+      style="width: 100%;">
       <el-table-column type="expand">
         <template scope="scope">
           <el-form label-position="left" inline class="demo-table-expand">
@@ -19,12 +19,12 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="一级分类名称">
+      <el-table-column width="250" align="center" label="一级分类名称">
         <template scope="scope">
           <span>{{scope.row.parent.name}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="400" align="center" label="二级分类名称">
+      <el-table-column align="center" label="二级分类名称">
         <template scope="scope">
           <span>{{scope.row.childStr}}</span>
           <el-button size="mini" type="text" @click="showMore(scope.row)">查看更多</el-button>
@@ -35,10 +35,10 @@
           <el-button size="mini" type="text" @click="clickRank(scope.row)">{{scope.row.parent.rank?scope.row.parent.rank:0}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column width="200" align="center" label="筛选条件">
+      <el-table-column width="200" align="center" label="筛选条件" v-if="vehicleTypeLabel_btn_screen">
         <template scope="scope">
-          <el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==1&&vehicleTypeLabel_btn_screen" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
-          <el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==0&&vehicleTypeLabel_btn_screen" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
+          <el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==1" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
+          <el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==0" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
         </template>
       </el-table-column>
       <el-table-column width="200" align="center" label="是否多选">
@@ -47,7 +47,7 @@
           <el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==0&&vehicleTypeLabel_btn_multipleSelection" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" width="200" label="操作">
+      <el-table-column align="center" width="200" label="操作" fixed="right">
         <template scope="scope">
           <el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeLabel_btn_save?'编辑':'查看'}}
           </el-button>