Merge branch 'base-modify'

src/router/index.js

@@ -729,12 +729,7 @@ export const asyncRouterMap = [{
       component: _import('statistics/orderStatistics'),
       name: '订单统计',
       authority: 'orderStatistics'
-    }, {
-      path: 'vehicleStatistics',
-      component: _import('statistics/vehicleStatistics'),
-      name: '车辆统计',
-      authority: 'vehicleStatistics'
-		}
+    }
   ]
 },
 {
@@ -759,7 +754,12 @@ export const asyncRouterMap = [{
       component: _import('financial/branchCompany'),
       name: '总公司报表',
       authority: 'branchCompany'
-    }
+    }, {
+      path: 'vehicleStatistics',
+      component: _import('financial/vehicleStatistics'),
+      name: '车辆统计',
+      authority: 'vehicleStatistics'
+		}
   ]
 }
 ];

src/views/statistics/vehicleStatistics.vue → src/views/financial/vehicleStatistics.vue

@@ -34,7 +34,7 @@
 								filterable
 								placeholder="请选择"
 								getAllBranchCompanyChange
-							>
+							 >
 								<el-option :key="undefined" label="无" :value="undefined"></el-option>
 								<el-option
 									v-for="item in allBranchCompany"
@@ -65,7 +65,10 @@
 				</el-table-column>
 				<el-table-column align="center" label="停靠车辆数量">
 					<template scope="scope">
-						<span>{{scope.row.vehicleNum}}</span>
+<!-- 						<span>{{scope.row.vehicleNum}}</span>
+ -->					<span v-if="listQuery.type==1">{{scope.row.vehicleNum}}</span>
+						<span v-if="listQuery.type==2">{{Math.ceil(scope.row.vehicleNum/7)}}</span>
+						<span v-if="listQuery.type==3">{{Math.ceil(scope.row.vehicleNum/30)}}</span>
 					</template>
 				</el-table-column>
 			</el-table>

src/views/vehicle/bookInfoViewer.vue

@@ -26,13 +26,13 @@
           <th style="font-size: 30px">五</th>
           <th style="font-size: 30px">六</th>
         </tr>
-        <tr v-for=" row in getEevryDayThisMonth " class="el-date-table__row">
+        <!-- <tr v-for=" row in getEevryDayThisMonth " class="el-date-table__row">
           <td v-for=" col in row " :class="col.class" :style="col.style">
             {{col.day}}
             <span v-if=" col.isBooked === true "
                   :style="{position: 'relative', fontSize: 10+'px', color: 'rgba(15, 159, 214, 0.6)', float: 'right'}">订</span>
           </td>
-        </tr>
+        </tr> -->
         </tbody>
       </table> -->
       <div slot="footer" class="dialog-footer">

src/views/vehicle/vehicleInfo/index.vue

@@ -737,7 +737,7 @@
 						<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
 							<el-upload
 								class="avatar-uploader"
-								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
 								:show-file-list="false"
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccess"
@@ -763,7 +763,7 @@
 
 							<el-upload
 								class="avatar-uploader"
-								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
 								:show-file-list="false"
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccessF"
@@ -798,8 +798,8 @@
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click="cancel('form')">取 消</el-button>
-				<el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确 定</el-button>
+				<el-button @click="cancel('form')">取消</el-button>
+				<el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确定</el-button>
 				<el-button
 					type="primary"
 					@click="update('form')"
@@ -1182,7 +1182,8 @@ export default {
 								}
 							})
 						},
-						trigger: 'blur'
+						trigger: 'blur',
+						required: true
 					}
 				],
 				engineNum: [
@@ -2448,11 +2449,15 @@ export default {
 			this.dialogForm4LicenceVisible = true
 		},
 		getDrivingLicenseUrl(drivingLicensePath) {
-			return (
-				process.env.BASE_API +
-				'/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' +
-				encodeURI(drivingLicensePath)
-			)
+			if (drivingLicensePath.indexOf('https') > -1) {
+				return drivingLicensePath
+			}else{
+				return (
+					process.env.BASE_API +
+					'/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' +
+					encodeURI(drivingLicensePath)
+				)
+			}
 		},
 		handleAvatarSuccess(res, file) {
 			this.form.drivingLicensePath = res.data
@@ -2901,6 +2906,7 @@ export default {
 						}
 					})
 				} else {
+					this.$message('必填项不能为空')
 					return false
 				}
 			})