修复冲突

src/views/vehicle/bookRecord/index.vue

@@ -26,21 +26,12 @@
 							<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态">
 								<el-option :key="undefined" label="全部" :value="undefined"></el-option>
 								<!-- <el-option v-for="(val, key, index)   in statusList " :key="val.code" :label="val.val"
-<<<<<<< HEAD
 								:value="val.code"></el-option>-->
 								<el-option
 									v-for="(val, index)   in statusList "
 									:key="index"
 									:label="val.val"
 									:value="val.code"
-=======
-								:value="val.code"></el-option>-->
-								<el-option
-									v-for="(val, index)   in statusList "
-									:key="index"
-									:label="val.val"
-									:value="val.code"
->>>>>>> dev-loc
 								></el-option>
 							</el-select>
 						</el-form-item>
@@ -63,19 +54,11 @@
 					<el-col :span="5">
 						<el-form-item label="提车公司" prop="subordinateBranch">
 							<el-autocomplete
-<<<<<<< HEAD
 								class="inline-input"
 								v-model="listQuery.liftCompanyName"
 								:fetch-suggestions="querySearch"
 								placeholder="请输入内容"
 								@select="handleSelect"
-=======
-								class="inline-input"
-								v-model="listQuery.liftCompanyName"
-								:fetch-suggestions="querySearch"
-								placeholder="请输入内容"
-								@select="handleSelect"
->>>>>>> dev-loc
 							></el-autocomplete>
 						</el-form-item>
 					</el-col>
@@ -156,13 +139,9 @@
 			</el-table-column>
 			<el-table-column align="center" label="实际取/还时间" width="200">
 				<template scope="scope">
-<<<<<<< HEAD
-					<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
-=======
 					<span>{{scope.row.actualStartDate}}</span>
 					<br />
 					<span>{{scope.row.actualEndDate}}</span>
->>>>>>> dev-loc
 				</template>
 			</el-table-column>
 			<!-- <el-table-column align="center" label="预定时间" width="220">
@@ -445,14 +424,6 @@
 					</el-col>
 				</el-row>
 				<el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
-<<<<<<< HEAD
-					<el-col
-							:span="3"
-							v-for="(item, index) in departurePicList"
-							:key="index"
-							:offset="index%6 > 0 ? 1 : 0"
-							style="margin-bottom:10px"
-=======
 					<viewer :images="departurePicList">
 						<img v-for="src in departurePicList" :src="src" :key="src" class="voucher" />
 					</viewer>
@@ -463,7 +434,6 @@
 						:key="index"
 						:offset="index%6 > 0 ? 1 : 0"
 						style="margin-bottom:10px"
->>>>>>> dev-loc
 					>
 						<el-card>
 							<img :src="item" class="image" />
@@ -507,14 +477,6 @@
 					</el-col>
 				</el-row>
 				<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
-<<<<<<< HEAD
-					<el-col
-							:span="3"
-							v-for="(item, index) in arrivalPicList"
-							:key="index"
-							:offset="index%6 > 0 ? 1 : 0"
-							style="margin-bottom:10px"
-=======
 					<viewer :images="arrivalPicList">
 						<img v-for="src in arrivalPicList" :src="src" :key="src" class="voucher" />
 					</viewer>
@@ -524,7 +486,6 @@
 						:key="index"
 						:offset="index%6 > 0 ? 1 : 0"
 						style="margin-bottom:10px"
->>>>>>> dev-loc
 					>
 						<el-card>
 							<img :src="item" class="image" />
@@ -881,96 +842,8 @@
 					remark: '',
 					bookRecordId: null
 				},
-<<<<<<< HEAD
 				arrivalFormrules: {
 					recycleMan: {
-=======
-				{
-					id: '5',
-					name: '旅游'
-				},
-				{
-					id: '6',
-					name: '保养'
-				},
-				{
-					id: '7',
-					name: '预约中'
-				},
-				{
-					id: '8',
-					name: '禁用'
-				},
-				{
-					id: '9',
-					name: '客户用车'
-				},
-				{
-					id: '10',
-					name: '其他'
-				}
-			],
-			detailId: '',
-			illegalVisible: false,
-			price: undefined, //违章罚款金额
-			fileList2: [], //违章截图
-			detailItem: {},
-			dialogDetailVisible: false,
-			baranchQuery: {
-				zoneId: null
-			},
-			allZoneArr: [], //全部片区
-			allBranchCompany: [],
-			state2: '', //搜索-分公司名称
-			rules4Query: {},
-			list: null,
-			total: null,
-			listLoading: true,
-			listQuery: {
-				page: 1,
-				limit: 20,
-				flag: false,
-				zoneId: undefined,
-				liftCompany: undefined,
-				liftCompanyName: '',
-				numberPlate: undefined,
-				selectedMonth: undefined,
-				status: undefined,
-				bookType: undefined,
-				bookStartDate: undefined,
-				bookEndDate: undefined
-			},
-			inline: true,
-			dialogFormVisible: false,
-			dialogStatus: '',
-			bookRecord_btn_prove: false,
-			bookRecord_btn_unbook: false,
-			bookRecord_btn_reject: false,
-			bookRecord_btn_lift: false,
-			bookRecord_btn_ret: false,
-			dialogForm4LiftVisible: false,
-			dialogForm4RetVisible: false,
-			allCompanies: {},
-			tableKey: 0,
-			form4Lift: {
-				state1: '',
-				id: undefined,
-				mileageLift: undefined,
-				liftCompany: undefined,
-				liftRemark: undefined
-			},
-			rules4Lift: {
-				liftCompany: [
-					{
-						required: true,
-						message: '请选择提车分公司',
-						trigger: 'blur',
-						type: 'integer'
-					}
-				],
-				mileageLift: [
-					{
->>>>>>> dev-loc
 						required: true,
 						message: '请输入收车人',
 						trigger: 'blur'
@@ -1254,7 +1127,6 @@
 					if(queryJson.bookType){
 						t.listQuery.bookType = queryJson.bookType;
 					}
-<<<<<<< HEAD
 //          if(queryJson.liftCompany){
 //            t.allCompaniesArr.map(function (item) {
 //              if(item.id == queryJson.liftCompany){
@@ -1262,86 +1134,6 @@
 //              }
 //            });
 //          }
-=======
-				]
-			},
-			selectedAccItem: undefined
-		}
-	},
-	created() {
-		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
-				}
-				if (queryJson.limit) {
-					t.listQuery.limit = queryJson.limit
-				}
-				if (queryJson.flag) {
-					t.listQuery.flag = queryJson.flag
-				}
-				if (queryJson.zoneId) {
-					t.listQuery.zoneId = queryJson.zoneId
-				}
-				if (queryJson.liftCompany) {
-					t.listQuery.liftCompany = queryJson.liftCompany
-				}
-				if (queryJson.liftCompanyName) {
-					t.listQuery.liftCompanyName = queryJson.liftCompanyName
-				}
-				if (queryJson.numberPlate) {
-					t.listQuery.numberPlate = queryJson.numberPlate
-				}
-				if (queryJson.selectedMonth) {
-					t.listQuery.selectedMonth = queryJson.selectedMonth
-				}
-				if (queryJson.status) {
-					t.listQuery.status = queryJson.status
-				}
-				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;
-				//              }
-				//            });
-				//          }
-			}
-			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']
-		this.bookRecord_btn_lift = this.elements['bookRecord:btn_lift']
-		this.bookRecord_btn_ret = this.elements['bookRecord:btn_ret']
-	},
-	computed: {
-		...mapGetters(['elements', 'bookRecordStatus']),
-		getHeaderWithToken() {
-			return { Authorization: getToken() }
-		},
-		//获取大区列表
-		getAllZoneList() {
-			return getAllZone()
-		},
-		selectedMonth4Query: {
-			get: function() {
-				if (
-					this.$utils.isString(this.listQuery.selectedMonth) &&
-					this.listQuery.selectedMonth !== ''
-				) {
-					return toEast8Date(this.listQuery.selectedMonth)
->>>>>>> dev-loc
 				}
 				this.getList()
 			});
@@ -1474,7 +1266,6 @@
 						}
 					})
 				}
-<<<<<<< HEAD
 			},
 			/**
 			 * 确定
@@ -1483,45 +1274,6 @@
 				let arr = []
 				this.fileList2.map(function(item) {
 					arr.push(item.url)
-=======
-			}
-		}
-	},
-	methods: {
-		/**
-		 * 重置
-		 * */
-		reloadPage() {
-			this.listQuery = {
-				page: 1,
-				limit: 20,
-				flag: false,
-				zoneId: undefined,
-				liftCompany: undefined,
-				liftCompanyName: '',
-				numberPlate: undefined,
-				selectedMonth: undefined,
-				status: undefined,
-				bookType: undefined,
-				bookStartDate: undefined,
-				bookEndDate: undefined
-			}
-			if (this.listQuery) {
-				localStorage.setItem(
-					'bookRecord',
-					JSON.stringify(this.listQuery)
-				)
-			}
-			this.getList()
-		},
-		confirm() {
-			if (this.returnForm.retCompany == '') {
-				this.$notify({
-					title: '失败',
-					message: '还车地点不能为空',
-					type: 'error',
-					duration: 2000
->>>>>>> dev-loc
 				})
 				let params = {
 					illegalPic: arr.join(','),
@@ -1536,12 +1288,7 @@
 							type: 'success',
 							duration: 2000
 						})
-<<<<<<< HEAD
 						this.illegalVisible = false
-=======
-						this.resetReturn = false
-						this.dialogDetailVisible = false
->>>>>>> dev-loc
 						this.getList()
 					} else {
 						this.$notify({
@@ -1663,7 +1410,6 @@
 					t.departurePicList = []
 					t.arrivalPicList = []
 				}
-<<<<<<< HEAD
 				this.dialogDetailVisible = true
 			},
 			//监听change事件
@@ -1719,74 +1465,6 @@
 				this.dialogForm4RetVisible = false
 				this.$refs[formName].resetFields()
 			},
-			/**
-			 * 出车弹框-确定
-			 * */
-			liftOk(formName) {
-				const set = this.$refs
-				set[formName].validate(valid => {
-					if (valid) {
-						if (Number(this.departureForm.mileage) > 999999) {
-=======
-			} else {
-				t.departurePicList = []
-				t.arrivalPicList = []
-			}
-			this.dialogDetailVisible = true
-		},
-		//监听change事件
-		getProvinceRegions(item) {
-			this.listQuery.zoneId = item
-			this.baranchQuery.zoneId = item
-			//			this.listQuery.liftCompany = undefined
-			//			getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
-			//				this.allBranchCompany = response.data
-			//			})
-		},
-		getAllBranchCompanyChange(item) {
-			this.listQuery.liftCompany = item
-		},
-		querySearch(queryString, cb) {
-			let selectArry = []
-			let iitem = {
-				value: '全部',
-				name: '全部'
-			}
-			selectArry.push(iitem)
-			this.allCompaniesArr.map(function(item) {
-				item.value = item.name
-				selectArry.push(item)
-			})
-			this.selectArry = selectArry
-			var results = queryString
-				? selectArry.filter(this.createFilter(queryString))
-				: selectArry
-			// 调用 callback 返回建议列表的数据
-			cb(results)
-		},
-		createFilter(queryString) {
-			return restaurant => {
-				return restaurant.name.indexOf(queryString.toLowerCase()) != -1
-			}
-		},
-		/**
-		 * 提车分公司
-		 * */
-		handleSelect(item) {
-			if (item.value == '全部') {
-				this.listQuery.liftCompany = undefined
-			} else {
-				this.listQuery.liftCompany = item.id
-			}
-		},
-		cancelDialog4Lift(formName) {
-			this.dialogForm4LiftVisible = false
-			this.$refs[formName].resetFields()
-		},
-		cancelDialog4Ret(formName) {
-			this.dialogForm4RetVisible = false
-			this.$refs[formName].resetFields()
-		},
 			/**
 			 * 出车弹框-确定
 			 * */
@@ -1820,32 +1498,6 @@
 								this.cleanDepartureForm()
 								this.getList()
 							} else {
->>>>>>> dev-loc
-							this.$notify({
-								title: '警告',
-								message: '公里数不能大于999999',
-								type: 'warning',
-								duration: 2000
-							})
-							return false
-						}
-						var arr = []
-						this.departurePicList.map(function(item) {
-							arr.push(item.url)
-						})
-						this.departureForm.departurePic = arr.join(',')
-						departureVehicle(this.departureForm).then(response => {
-							if (response.status == 200) {
-								this.dialogForm4LiftVisible = false
-								this.$notify({
-									title: '成功',
-									message: '出车成功',
-									type: 'success',
-									duration: 2000
-								})
-								this.cleanDepartureForm()
-								this.getList()
-							} else {
 								this.$notify({
 									title: '失败',
 									message: response.message,
@@ -1989,68 +1641,6 @@
 					remark: null,
 					bookStartDate: null
 				}
-<<<<<<< HEAD
-			},
-			cleanArrivalForm() {
-				this.arrivalForm = {
-					vehicleId: null,
-					numberPlate: null,
-					arrivalDate: null,
-					recycleMan: null,
-					recycleManTel: null,
-					mileage: null,
-					arrivalBranchCompanyId: null,
-					arrivalBranchCompanyName: '',
-					arrivalPic: '',
-					remark: '',
-					bookRecordId: null
-=======
-				return this.bookRecordStatus[data.status + ''].val
-			}
-			return ''
-		},
-		getAllBookRecordStatus: function() {
-			console.log(this.bookRecordStatus)
-
-			return this.bookRecordStatus
-		},
-		getDatePeriodStr([startDate, endDate]) {
-			if (
-				this.$utils.isString(startDate) &&
-				startDate !== '' &&
-				this.$utils.isString(endDate) &&
-				endDate !== ''
-			) {
-				return (
-					formatDate(toEast8Date(startDate), 'yyyy-MM-dd') +
-					' 至 ' +
-					formatDate(toEast8Date(endDate), 'yyyy-MM-dd')
-				)
-			}
-			return '未知'
-		},
-		/**
-		 * 清空出车弹框数据
-		 */
-		cleanDepartureForm() {
-			this.departureForm = {
-				vehicleId: null,
-				departureBranchCompanyId: null, //出发地分公司id
-				departureBranchCompanyName: '', //出发地分公司名称
-				use: null,
-				user: null,
-				userTel: null,
-				checkMan: null,
-				checkManTel: null,
-				mileage: null,
-				numberPlate: null,
-				expectArrivalBranchCompanyId: null, //目的地分公司id
-				expectArrivalBranchCompanyName: '', //目的地分公司名称
-				bookRecordId: null,
-				departurePic: '',
-				remark: null,
-				bookStartDate: null
-			}
 			},
 			cleanArrivalForm() {
 				this.arrivalForm = {
@@ -2067,25 +1657,6 @@
 					bookRecordId: null
 				}
 			},
-		/**
-		 * 搜索按钮
-		 * */
-		handleFilter() {
-			this.listQuery.page = 1
-			this.$refs.queryForm.validate(valid => {
-				if (valid) {
-					if (this.listQuery) {
-						localStorage.setItem(
-							'bookRecord',
-							JSON.stringify(this.listQuery)
-						)
-					}
-					this.getList()
-				} else {
-					return false
->>>>>>> dev-loc
-				}
-			},
 			/**
 			 * 搜索按钮
 			 * */
@@ -2342,7 +1913,6 @@
 </script>
 
 <style scoped>
-<<<<<<< HEAD
 	.order-details .el-form-item {
 		margin-bottom: 0px !important;
 	}
@@ -2372,41 +1942,4 @@
 		background: #000;
 		z-index: 2001;
 	}
-=======
-.order-details .el-form-item {
-	margin-bottom: 0px !important;
-}
-.order-details hr {
-	height: 1px;
-	background-color: #ccc;
-	border: none;
-}
-.image {
-	width: 100%;
-	height: 110px;
-	display: block;
-}
-.el-card__body,
-.el-card {
-	padding: 0px !important;
-	width: 150px;
-	text-align: center;
-}
-.modal_modal {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	opacity: 0.5;
-	background: #000;
-	z-index: 2001;
-}
-.voucher {
-	width: 100px;
-	height: 100px;
-	border: 1px solid #d9d9d9;
-	margin-right:20px;
-}
->>>>>>> dev-loc
 </style>