后台优化

src/views/order/rentVehicleInfo/detail.vue

@@ -28,7 +28,8 @@
 			<el-row>
 				<el-col :span="24">
 					<el-form-item label="用户ID/实名">
-            <span>{{row.userId}}</span>/<span>{{row.username}}</span>
+						<span>{{row.userId}}</span>/
+						<span>{{row.username}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -88,27 +89,18 @@
 	</el-dialog>
 </template>
 <script>
-  import {
-    page,
-    saveOrderViolation
-  } from 'api/order/rentVehicle';
-  import {mapGetters} from 'vuex';
-  import {
-    formatDate
-  } from '../../../utils/dateFormattor';
-  import {
-    getToken
-  } from '../../../utils/auth';
-  import {
-    getOneIllegalRow
-  } from 'api/order/rentVehicle';
-  import ElRow from "element-ui/packages/row/src/row";
-  import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
-  import ElCol from "element-ui/packages/col/src/col";
-  import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
-  import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
-  export default {
-    props: ["row"],
+import { page, saveOrderViolation } from 'api/order/rentVehicle'
+import { mapGetters } from 'vuex'
+import { formatDate } from '../../../utils/dateFormattor'
+import { getToken } from '../../../utils/auth'
+import { getOneIllegalRow } from 'api/order/rentVehicle'
+import ElRow from 'element-ui/packages/row/src/row'
+import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
+import ElCol from 'element-ui/packages/col/src/col'
+import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
+import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
+export default {
+	props: ['row'],
 	name: 'illegalDialog',
 	components: {
 		ElForm,
@@ -120,30 +112,27 @@
 	data() {
 		return {
 			isVisible: false,
-        tableData:[],
+			tableData: []
 		}
 	},
 	created() {
 		console.log(JSON.stringify(this.row))
-
 	},
 	watch: {
-      isVisible(newValue, oldValue){
-        if(!newValue){
-          this.$emit('detailEvent', false);
+		isVisible(newValue, oldValue) {
+			if (!newValue) {
+				this.$emit('detailEvent', false)
+			}
 		}
-      },
 	},
 	mounted() {
-      let that = this;
-      this.isVisible = true;
+		let that = this
+		this.isVisible = true
 	},
 	computed: {
-      ...mapGetters([
-        'elements',
-      ]),
+		...mapGetters(['elements']),
 		getHeaderWithToken() {
-        return {Authorization: getToken()};
+			return { Authorization: getToken() }
 		}
 	},
 	methods: {
@@ -151,10 +140,10 @@
 		 * 弹框-取消
 		 * */
 		cancel() {
-        this.$emit('detailEvent', false);
+			this.$emit('detailEvent', false)
 		},
-      sure:function(){
-          this.$emit('detailEvent', false);
+		sure: function() {
+			this.$emit('detailEvent', false)
 		},
 		/**
 		 * 格式化时间
@@ -162,14 +151,14 @@
 		 * @returns {*}
 		 */
 		dateFormat(timestamp) {
-        let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-        return formatDate(date, 'yyyy-MM-dd hh:mm');
-      },
+			let date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+			return formatDate(date, 'yyyy-MM-dd hh:mm')
 		}
 	}
+}
 </script>
 <style>
-  .el-form-item__content{
+.el-form-item__content {
 	display: inline-block;
-  }
+}
 </style>

src/views/vehicle/bookRecord/index.vue

@@ -38,7 +38,7 @@
 						<el-option :key="undefined" label="全部" :value="undefined"></el-option>
 						<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
 					</el-select>
-				</el-form-item> -->
+				</el-form-item>-->
 				<el-form-item label="提车公司" prop="subordinateBranch">
 					<el-autocomplete
 						class="inline-input"
@@ -115,12 +115,16 @@
 			</el-table-column>
 			<el-table-column align="center" label="预定取/还时间" width="200">
 				<template scope="scope">
-					<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
+					<span>{{scope.row.bookStartDate}}</span>
+					<br />
+					<span>{{scope.row.bookEndDate}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="实际取/还时间" width="200">
 				<template scope="scope">
-			    <span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
+					<span>{{scope.row.actualStartDate}}</span>
+					<br />
+					<span>{{scope.row.actualEndDate}}</span>
 				</template>
 			</el-table-column>
 			<!-- <el-table-column align="center" label="预定时间" width="220">
@@ -411,7 +415,7 @@
 						style="margin-bottom:10px"
 					>
 						<el-card>
-							<img :src="item" class="image" />
+							<img :src="item" class="image"  @click="lookPic(item)" />
 						</el-card>
 					</el-col>
 				</el-row>
@@ -425,7 +429,14 @@
 								type="primary"
 								style="padding: 7px 9px;"
 								@click="resetReturn = true"
-								v-show="detailItem.status == 2 || detailItem.status == 5"
+								v-if="detailItem.status == 2 && !detailItem.vehicleDepartureLogVo"
+							>更换</el-button>
+							<el-button
+								size="mini"
+								type="primary"
+								style="padding: 7px 9px;"
+								@click="resetReturn = true"
+								v-if="detailItem.status == 2 && !!detailItem.vehicleDepartureLogVo && detailItem.vehicleDepartureLogVo.state == 0"
 							>更换</el-button>
 						</el-form-item>
 					</el-col>
@@ -460,7 +471,7 @@
 						style="margin-bottom:10px"
 					>
 						<el-card>
-							<img :src="item" class="image" />
+							<img :src="item" class="image" @click="lookPic(item)" />
 						</el-card>
 					</el-col>
 				</el-row>
@@ -484,6 +495,10 @@
 			</div>
 		</el-dialog>
 
+		<el-dialog :title="bigPicTitle" :visible.sync="bigPicPop" :append-to-body="true" :modal="false" top='0'>
+			<img :src="priceUrl" alt style='width:100%'/>
+		</el-dialog>
+
 		<!-- 更改还车地点 -->
 		<div class="modal_modal" v-show="resetReturn"></div>
 		<el-dialog title="更改还车地点" :visible.sync="resetReturn" :append-to-body="true" :modal="false">
@@ -738,6 +753,9 @@ export default {
 	},
 	data() {
 		return {
+			priceUrl: '',
+			bigPicPop: false,
+			bigPicTitle: '',
 			returnForm: {
 				retCompany: ''
 			},
@@ -929,7 +947,7 @@ export default {
 				flag: false,
 				zoneId: undefined,
 				liftCompany: undefined,
-        liftCompanyName: "",
+				liftCompanyName: '',
 				numberPlate: undefined,
 				selectedMonth: undefined,
 				status: undefined,
@@ -1061,56 +1079,56 @@ export default {
 		}
 	},
 	created() {
-	  let t = this;
+		let t = this
 		getAll().then(response => {
-			this.allCompaniesArr = response.data;
-      let query =  localStorage.getItem("bookRecord");
-        if(query !="null" && query){
-          let queryJson = JSON.parse(query);
-          if(queryJson.page){
-            t.listQuery.page = queryJson.page;
+			this.allCompaniesArr = response.data
+			let query = localStorage.getItem('bookRecord')
+			if (query != 'null' && query) {
+				let queryJson = JSON.parse(query)
+				if (queryJson.page) {
+					t.listQuery.page = queryJson.page
 				}
-          if(queryJson.limit){
-            t.listQuery.limit = queryJson.limit;
+				if (queryJson.limit) {
+					t.listQuery.limit = queryJson.limit
 				}
-          if(queryJson.flag){
-            t.listQuery.flag = queryJson.flag;
+				if (queryJson.flag) {
+					t.listQuery.flag = queryJson.flag
 				}
-          if(queryJson.zoneId){
-            t.listQuery.zoneId = queryJson.zoneId;
+				if (queryJson.zoneId) {
+					t.listQuery.zoneId = queryJson.zoneId
 				}
-          if(queryJson.liftCompany){
-            t.listQuery.liftCompany = queryJson.liftCompany;
+				if (queryJson.liftCompany) {
+					t.listQuery.liftCompany = queryJson.liftCompany
 				}
-          if(queryJson.liftCompanyName){
-            t.listQuery.liftCompanyName = queryJson.liftCompanyName;
+				if (queryJson.liftCompanyName) {
+					t.listQuery.liftCompanyName = queryJson.liftCompanyName
 				}
-          if(queryJson.numberPlate){
-            t.listQuery.numberPlate = queryJson.numberPlate;
+				if (queryJson.numberPlate) {
+					t.listQuery.numberPlate = queryJson.numberPlate
 				}
-          if(queryJson.selectedMonth){
-            t.listQuery.selectedMonth = queryJson.selectedMonth;
+				if (queryJson.selectedMonth) {
+					t.listQuery.selectedMonth = queryJson.selectedMonth
 				}
-          if(queryJson.status){
-            t.listQuery.status = queryJson.status;
+				if (queryJson.status) {
+					t.listQuery.status = queryJson.status
 				}
-          if(queryJson.bookType){
-            t.listQuery.bookType = queryJson.bookType;
+				if (queryJson.bookType) {
+					t.listQuery.bookType = queryJson.bookType
 				}
-//          if(queryJson.liftCompany){
-//            t.allCompaniesArr.map(function (item) {
-//              if(item.id == queryJson.liftCompany){
-//                t.listQuery.liftCompanyName = item.name;
-//              }
-//            });
-//          }
+				//          if(queryJson.liftCompany){
+				//            t.allCompaniesArr.map(function (item) {
+				//              if(item.id == queryJson.liftCompany){
+				//                t.listQuery.liftCompanyName = item.name;
+				//              }
+				//            });
+				//          }
 			}
 			this.getList()
-		});
+		})
 		getAllCompany(codeAndBranchCompany => {
 			//初始化公司列表
 			this.allCompanies = codeAndBranchCompany
-		});
+		})
 		this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove']
 		this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject']
 		this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook']
@@ -1146,6 +1164,12 @@ export default {
 		}
 	},
 	methods: {
+		//查看大图
+		lookPic(val) {
+			this.priceUrl = val;
+			this.bigPicPop = true;
+			this.bigPicTitle = '图片放大'
+		},
 		/**
 		 * 重置
 		 * */
@@ -1156,16 +1180,19 @@ export default {
 				flag: false,
 				zoneId: undefined,
 				liftCompany: undefined,
-        liftCompanyName: "",
+				liftCompanyName: '',
 				numberPlate: undefined,
 				selectedMonth: undefined,
 				status: undefined,
 				bookType: undefined
-      };
-      if(this.listQuery){
-        localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
 			}
-      this.getList();
+			if (this.listQuery) {
+				localStorage.setItem(
+					'bookRecord',
+					JSON.stringify(this.listQuery)
+				)
+			}
+			this.getList()
 		},
 		confirm() {
 			if (this.returnForm.retCompany == '') {
@@ -1185,9 +1212,9 @@ export default {
 							type: 'success',
 							duration: 2000
 						})
-						this.resetReturn = false;
-						this.dialogDetailVisible = false;
-						this.getList();
+						this.resetReturn = false
+						this.dialogDetailVisible = false
+						this.getList()
 					} else {
 						this.$notify({
 							title: '失败',
@@ -1348,10 +1375,10 @@ export default {
 		getProvinceRegions(item) {
 			this.listQuery.zoneId = item
 			this.baranchQuery.zoneId = item
-//			this.listQuery.liftCompany = undefined
-//			getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
-//				this.allBranchCompany = response.data
-//			})
+			//			this.listQuery.liftCompany = undefined
+			//			getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
+			//				this.allBranchCompany = response.data
+			//			})
 		},
 		getAllBranchCompanyChange(item) {
 			this.listQuery.liftCompany = item
@@ -1383,12 +1410,12 @@ export default {
 		 * 提车分公司
 		 * */
 		handleSelect(item) {
-      if (item.value == "全部") {
-        this.listQuery.liftCompany = undefined;
+			if (item.value == '全部') {
+				this.listQuery.liftCompany = undefined
 			} else {
-        this.listQuery.liftCompany = item.id;
+				this.listQuery.liftCompany = item.id
 			}
-      console.log(item);
+			console.log(item)
 		},
 		cancelDialog4Lift(formName) {
 			this.dialogForm4LiftVisible = false
@@ -1597,8 +1624,11 @@ export default {
 			this.listQuery.page = 1
 			this.$refs.queryForm.validate(valid => {
 				if (valid) {
-          if(this.listQuery){
-            localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
+					if (this.listQuery) {
+						localStorage.setItem(
+							'bookRecord',
+							JSON.stringify(this.listQuery)
+						)
 					}
 					this.getList()
 				} else {

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -130,7 +130,7 @@
               <div style="color: #bfcbd9;font-size: 14px;">
                 现在位置：{{scope.row.parkCompanyName}}
               </div>
-              <div>{{scope.row.numberPlate}}<img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div>
+              <div>{{scope.row.numberPlate}}<span style='color:red'>({{scope.row.code}})</span><img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div>
               <div style="color: #bfcbd9;font-size: 14px;">{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div>
             </div>
           </template>