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

@@ -40,7 +40,6 @@
 							class="filter-item"
 							v-model="listQuery.zoneId"
 							placeholder="请选择"
-							@change="getProvinceRegions()"
 						>
 							<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
 						</el-select>
@@ -54,12 +53,6 @@
 							@select="handleSelectProvince"
 						></el-autocomplete>
 					</el-form-item>
-					<!--<el-form-item label="省份" prop="addrProvince">-->
-					<!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">-->
-					<!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"-->
-					<!--:value="item.id"></el-option>-->
-					<!--</el-select>-->
-					<!--</el-form-item>-->
 					<el-form-item label="城市" prop="addrCity">
 						<el-autocomplete
 							class="inline-input"
@@ -69,12 +62,6 @@
 							@select="handleSelectCity"
 						></el-autocomplete>
 					</el-form-item>
-					<!--<el-form-item label="城市" prop="addrCity">-->
-					<!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
-					<!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
-					<!--:value="item.id"></el-option>-->
-					<!--</el-select>-->
-					<!--</el-form-item>-->
 					<el-form-item label="车型" prop="modelId">
 						<el-autocomplete
 							class="inline-input"
@@ -201,12 +188,6 @@
 				v-waves
 				@click="handleFilter('download')"
 			>下载车辆信息Excel表</el-button>
-			<el-button
-				class="filter-item"
-				type="primary"
-				v-waves
-				@click="handleFilter('export')"
-			>导出分公司车辆信息</el-button>
 		</div>
 
 		<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%">
@@ -737,7 +718,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 +744,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 +779,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 +1163,8 @@ export default {
 								}
 							})
 						},
-						trigger: 'blur'
+						trigger: 'blur',
+						required: true
 					}
 				],
 				engineNum: [
@@ -1674,14 +1656,10 @@ export default {
 			}
 			t.getAllVehicleType() //获取全部车型
 		})
-		getAllCompany(codeAndBranchCompany => {
-			this.allCompanies = codeAndBranchCompany
-		})
 		getUpkeepAll().then(response => {
 			this.allUpkeepItems = response.data
 		})
-		this.getAllProvinceRegions()
-		this.getAllCities()
+		
 		this.vehicleInfo_btn_edit = this.elements['vehicleInfo:btn_edit']
 		this.vehicleInfo_btn_add = this.elements['vehicleInfo:btn_add']
 		this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply']
@@ -1706,7 +1684,7 @@ export default {
 		getAllZoneList() {
 			let that = this
 			that.allZoneArr = getAllZone()
-			return getAllZone()
+			return that.allZoneArr
 		},
 
 		townRegions4Query() {
@@ -1862,43 +1840,7 @@ export default {
 		}
 	},
 	methods: {
-		/**
-		 * 根据片区获取省份数据
-		 * */
-		getProvinceRegions() {
-			let that = this
-			this.listQuery.addrCity = undefined
-			this.listQuery.addrProvince = undefined
-			if (!this.$utils.isInteger(this.listQuery.zoneId)) {
-				return that.getAllProvinceRegions()
-			}
-			this.allZoneArr.map(function(item) {
-				if (item.id == that.listQuery.zoneId) {
-					getSysRegionByIds(item.provinceIds).then(response => {
-						let listRs = undefined
-						if (!that.$utils.isEmpty(response.data)) {
-							listRs = response.data
-						}
-						that.provinceRegions = listRs
-					})
-				}
-			})
-		},
-		getAllProvinceRegions() {
-			let that = this
-			var zoneStr = ''
-			getAllZone().map(function(item) {
-				zoneStr = zoneStr + item.provinceIds + ','
-			})
-			let listRs = undefined
-			getSysRegionByIds(zoneStr).then(response => {
-				if (!that.$utils.isEmpty(response.data)) {
-					listRs = response.data
-				}
-				that.provinceRegions = listRs
-			})
-			return listRs
-		},
+		
 		cityRegions4Query() {
 			let that = this
 			if (!this.$utils.isInteger(this.listQuery.addrProvince)) {
@@ -2448,11 +2390,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 +2847,7 @@ export default {
 						}
 					})
 				} else {
+					this.$message('必填项不能为空')
 					return false
 				}
 			})