Merge branch 'base-modify'

src/api/applyManagements.js

@@ -30,4 +30,79 @@ export function changeStatus(id) {
     url: '/api/app/admin/buy_vehicle/status/' + id,
     method: 'POST',
   });
+}
+
+// 报名列表
+export function applyList(params) {
+  return fetch({
+    url: 'api/activity/admin/activityLuckyDraw/page',
+    method: 'POST',
+    data: params
+  });
+}
+
+// 报名列表导出
+export function excel(query) {
+  return fetch({
+    url: 'api/activity/admin/activityLuckyDraw/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob'
+  });
+}
+
+// 中奖列表
+export function applyListWin(params) {
+  return fetch({
+    url: '/api/activity/admin/activityWinningRecord/page',
+    method: 'POST',
+    data: params
+  });
+}
+
+// 中奖列表导出
+export function excelWin(query) {
+  return fetch({
+    url: '/api/activity/admin/activityWinningRecord/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob'
+  });
+}
+
+// 活动数据
+export function applyListActive(params) {
+  return fetch({
+    url: '/api/activity/admin/activityAttendanceRecord/page',
+    method: 'POST',
+    data: params
+  });
+}
+
+// 活动数据
+export function excelActive(query) {
+  return fetch({
+    url: '/api/activity/admin/activityAttendanceRecord/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob'
+  });
+}
+
+// 奖品设置
+export function savePrize(query) {
+  return fetch({
+    url: '/api/activity/admin/activityPrize/save',
+    method: 'post',
+    data: query
+  });
+}
+
+// 奖品详情
+export function infoPrize(query) {
+  return fetch({
+    url: 'api/activity/admin/activityPrize/list',
+    method: 'get',
+    data: query
+  });
 }
\ No newline at end of file

src/api/vehicle/vehicleInfo/index.js

@@ -131,3 +131,11 @@ export function exportExcel(query) {
     responseType: 'blob'
   });
 }
+
+export function postponeApi(param) {
+  return fetch({
+    url: 'api/order/baseOrder/bg/delay-rent-order',
+    method: 'post',
+    data: param
+  });
+}

src/router/index.js

@@ -648,6 +648,39 @@ export const asyncRouterMap = [{
     }
   ]
 },
+{
+  path: '/casual',
+  component: Layout,
+  name: '发布会现金活动',
+  icon: 'setting',
+  authority: 'casual',
+  children: [
+    {
+      path: 'index',
+      component: _import('conference/activeData/index'),
+      name: '活动数据',
+      authority: 'index'
+    },
+    {
+      path: 'prizeLists',
+      component: _import('conference/prizeList/prizeLists'),
+      name: '中奖列表',
+      authority: 'prizeLists'
+    },
+    {
+      path: 'applyList',
+      component: _import('conference/apply/applyList'),
+      name: '报名列表',
+      authority: 'applyList'
+    },
+    {
+      path: 'awardSet',
+      component: _import('conference/award/awardSet'),
+      name: '奖品设置',
+      authority: 'awardSet'
+    }
+  ]
+},
 {
   path: '/applyManagements',
   component: Layout,

src/views/conference/activeData/index.vue

+<template>
+	<div class="app-container calendar-list-container">
+		<el-form :inline="true" label-width="100px" label-position="right">
+			<el-form-item label="选择日期">
+				<el-date-picker v-model="time" type="daterange" placeholder="选择日期范围" @change="changeTime"></el-date-picker>
+			</el-form-item>
+
+			<el-form-item label="手机号">
+				<el-input v-model="listQuery.phone" placeholder="请输入手机号" clearable style="width:200px"></el-input>
+			</el-form-item>
+			<el-form-item label="状态">
+				<el-select v-model="listQuery.status" clearable placeholder="请选择状态" @change="changeClass">
+					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+				</el-select>
+			</el-form-item>
+
+			<el-button type="primary" @click="search">搜索</el-button>
+			<el-button type="primary" @click="clearSearch">清空搜索</el-button>
+			<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出</el-button>
+		</el-form>
+		<div class="information">
+			<h4>数据概况.</h4>
+			<ul>
+				<li>
+					<p>{{information.attendNum}}</p>
+					<p>参与人数(次)</p>
+				</li>
+				<li>
+					<p>{{information.finishNum}}</p>
+					<p>完成任务数(个)</p>
+				</li>
+				<li>
+					<p>{{information.amount}}</p>
+					<p>已发放现金总额(次)</p>
+				</li>
+			</ul>
+		</div>
+		<el-table
+			:data="tableData"
+			border
+			header-align="center"
+			v-loading="loadingTab"
+			style="margin-top:20px"
+		>
+			<el-table-column label="序号" align="center" width="70">
+				<template scope="scope">
+					<span>{{scope.$index+(listQuery.page - 1) * listQuery.limit + 1}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="userName" label="用户名" align="center"></el-table-column>
+			<el-table-column prop="phone" label="电话" align="center"></el-table-column>
+			<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
+			<el-table-column prop="status" label="状态" align="center">
+				<template scope="scope">
+					<span>{{scope.row.status == 1 ? '未完成' : '已完成'}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="amount" label="当前金额(元)" align="center"></el-table-column>
+			<el-table-column prop="crtTime" label="邀请人数" align="center"></el-table-column>
+			<el-table-column prop="prizes" label="抽奖礼品" align="center"></el-table-column>
+			<el-table-column prop="attendTime" label="参加时间" align="center">
+				<template scope="scope">
+					<span>{{timeChange(scope.row.attendTime)}}</span>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<el-pagination
+			@size-change="handleSizeChange"
+			@current-change="handleCurrentChange"
+			:current-page.sync="listQuery.page"
+			:page-sizes="[10,20,30, 50]"
+			:page-size="listQuery.limit"
+			layout="total, sizes, prev, pager, next, jumper"
+			:total="total"
+			style="margin-top:20px"
+		></el-pagination>
+	</div>
+</template>
+<script>
+import { formatDate } from 'utils/dateFormattor'
+import { applyListActive, excelActive } from 'api/applyManagements'
+export default {
+	created() {
+		this.getList()
+	},
+	data() {
+		return {
+			information: {},
+			excelLoading: false,
+			loadingTab: false,
+			tableData: [],
+			time: '',
+			total: null, //总页数
+			options: [
+				{
+					id: '',
+					name: '全部'
+				},
+				{
+					id: 0,
+					name: '未完成'
+				},
+				{
+					id: 1,
+					name: '已完成'
+				}
+			],
+			listQuery: {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 2,
+				status: ''
+			}
+		}
+	},
+	methods: {
+		//时间戳
+		timeChange(val) {
+			return formatDate(new Date(val), 'yyyy-MM-dd hh:mm:ss')
+		},
+		//列表
+		getList() {
+			this.loadingTab = true
+			applyListActive(this.listQuery).then(data => {
+				if (data.status == 200) {
+					this.tableData = data.data.activityAttendanceRecordVos
+					this.total = data.data.totalCount
+					this.information = data.data.activityAttendanceRecordTotalVo
+				} else {
+					this.$message(data.message)
+				}
+			})
+			setTimeout(() => {
+				this.loadingTab = false
+			}, 300)
+		},
+		//是否中奖筛选
+		changeWin() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//搜索
+		search() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//抽奖类型筛选
+		changeClass() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//清空搜索
+		clearSearch() {
+			this.listQuery = {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 2
+			}
+		},
+		//导出
+		downloadExcel() {
+			this.excelLoading = true
+			var u = navigator.userAgent,
+				app = navigator.appVersion
+			excelActive(this.listQuery, {
+				responseType: 'arraybuffer'
+			}).then(res => {
+				const content = res
+				const blob = new Blob([content], {
+					type: 'application/vnd.ms-excel'
+				})
+				const fileName = '活动数据.xlsx'
+				if (u.indexOf('Edge') > -1) {
+					window.navigator.msSaveBlob(blob, fileName)
+				} else {
+					const elink = document.createElement('a')
+					elink.download = fileName
+					elink.style.display = 'none'
+					elink.href = URL.createObjectURL(blob)
+					document.body.appendChild(elink)
+					elink.click()
+					URL.revokeObjectURL(elink.href) // 释放URL 对象
+					document.body.removeChild(elink)
+				}
+				this.excelLoading = false
+			})
+		},
+		//时间筛选
+		changeTime(val) {
+			this.listQuery.page = 1
+			if (!!val) {
+				let value = val.split(' - ')
+				this.listQuery.startDate = value[0] + ' 00:00:00'
+				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.getList()
+			} else {
+				this.listQuery.startDate = null
+				this.listQuery.endDate = null
+				this.getList()
+			}
+		},
+		//页码
+		handleSizeChange(val) {
+			this.listQuery.limit = val
+			this.getList()
+		},
+		//分页
+		handleCurrentChange(val) {
+			this.listQuery.page = val
+			this.getList()
+		}
+	}
+}
+</script>
+<style scoped>
+.information {
+	border: 1px solid #ccc;
+	margin: 20px 0;
+	padding: 10px 20px;
+}
+.information h4 {
+	color: #333;
+	font-size: 16px;
+	font-weight: normal;
+}
+.information ul {
+	padding: 0;
+	border-top: 1px solid #eee;
+	padding: 10px 30px;
+	overflow: hidden;
+}
+.information li {
+	list-style: none;
+	text-align: center;
+	float: left;
+	width: 33.33%;
+	border-right: 1px solid #eee;
+}
+.information li:last-child {
+	border: none;
+}
+</style>
\ No newline at end of file

src/views/conference/apply/applyList.vue

+<template>
+	<div class="app-container calendar-list-container">
+		<el-form :inline="true" label-width="100px" label-position="right">
+			<el-form-item label="日期">
+				<el-date-picker v-model="time" type="daterange" placeholder="选择日期范围" @change="changeTime"></el-date-picker>
+			</el-form-item>
+			<el-form-item label="手机号">
+				<el-input v-model="listQuery.phone" placeholder="请输入手机号" clearable style="width:200px"></el-input>
+			</el-form-item>
+
+			<el-button type="primary" @click="search">搜索</el-button>
+			<el-button type="primary" @click="clearSearch">清空搜索</el-button>
+			<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出</el-button>
+		</el-form>
+
+		<el-table
+			:data="tableData"
+			border
+			header-align="center"
+			v-loading="loadingTab"
+			style="margin-top:20px"
+		>
+			<el-table-column label="序号" align="center" width="70">
+				<template scope="scope">
+					<span>{{scope.$index+(listQuery.page - 1) * listQuery.limit + 1}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="userName" label="姓名" align="center"></el-table-column>
+			<el-table-column prop="phone" label="电话" align="center"></el-table-column>
+			<el-table-column prop="ticketNum" label="人数" align="center"></el-table-column>
+			<el-table-column prop="crtTime" label="报名时间" align="center"></el-table-column>
+		</el-table>
+
+		<el-pagination
+			@size-change="handleSizeChange"
+			@current-change="handleCurrentChange"
+			:current-page.sync="listQuery.page"
+			:page-sizes="[10,20,30, 50]"
+			:page-size="listQuery.limit"
+			layout="total, sizes, prev, pager, next, jumper"
+			:total="total"
+			style="margin-top:20px"
+		></el-pagination>
+	</div>
+</template>
+<script>
+import { applyList, excel } from 'api/applyManagements'
+export default {
+	created() {
+		this.getList()
+	},
+	data() {
+		return {
+			excelLoading: false,
+			loadingTab: false,
+			tableData: [],
+			time: '',
+			total: null, //总页数
+			listQuery: {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 2
+			}
+		}
+	},
+	methods: {
+		//列表
+		getList() {
+			this.loadingTab = true
+			applyList(this.listQuery).then(data => {
+				if (data.status == 200) {
+					this.tableData = data.data.data
+					this.total = data.data.totalCount
+				} else {
+					this.$message(data.message)
+				}
+			})
+			setTimeout(() => {
+				this.loadingTab = false
+			}, 300)
+		},
+		//搜索
+		search() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//清空搜索
+		clearSearch() {
+			this.listQuery = {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 2
+			}
+		},
+		//导出
+		downloadExcel() {
+			this.excelLoading = true
+			var u = navigator.userAgent,
+				app = navigator.appVersion
+			excel(this.listQuery, { responseType: 'arraybuffer' }).then(res => {
+				const content = res
+				const blob = new Blob([content], {
+					type: 'application/vnd.ms-excel'
+				})
+				const fileName = '报名列表.xlsx'
+				if (u.indexOf('Edge') > -1) {
+					window.navigator.msSaveBlob(blob, fileName)
+				} else {
+					const elink = document.createElement('a')
+					elink.download = fileName
+					elink.style.display = 'none'
+					elink.href = URL.createObjectURL(blob)
+					document.body.appendChild(elink)
+					elink.click()
+					URL.revokeObjectURL(elink.href) // 释放URL 对象
+					document.body.removeChild(elink)
+				}
+				this.excelLoading = false
+			})
+		},
+		//时间筛选
+		changeTime(val) {
+			this.listQuery.page = 1
+			if (!!val) {
+				let value = val.split(' - ')
+				this.listQuery.startDate = value[0] + ' 00:00:00'
+				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.getList()
+			} else {
+				this.listQuery.startDate = null
+				this.listQuery.endDate = null
+				this.getList()
+			}
+		},
+		//页码
+		handleSizeChange(val) {
+			this.listQuery.limit = val
+			this.getList()
+		},
+		//分页
+		handleCurrentChange(val) {
+			this.listQuery.page = val
+			this.getList()
+		}
+	}
+}
+</script>

src/views/conference/prizeList/prizeLists.vue

+<template>
+	<div class="app-container calendar-list-container">
+		<el-form :inline="true" label-width="100px" label-position="right">
+			<el-form-item label="日期">
+				<el-date-picker v-model="time" type="daterange" placeholder="选择日期范围" @change="changeTime"></el-date-picker>
+			</el-form-item>
+			<el-form-item label="手机号">
+				<el-input v-model="listQuery.phone" placeholder="请输入手机号" clearable style="width:200px"></el-input>
+			</el-form-item>
+			<el-form-item label="类型">
+				<el-select v-model="listQuery.prizeType" clearable placeholder="请选择抽奖类型" @change="changeClass">
+					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+				</el-select>
+			</el-form-item>
+
+			<el-button type="primary" @click="search">搜索</el-button>
+			<el-button type="primary" @click="clearSearch">清空搜索</el-button>
+			<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出</el-button>
+		</el-form>
+
+		<div class="information">
+			<h4>数据概况.</h4>
+			<ul>
+				<li>
+					<p>{{information.onLineNum}}</p>
+					<p>线上抽奖触发(次)</p>
+				</li>
+				<li>
+					<p>{{information.onLineWineNum}}</p>
+					<p>线上中奖个数(个)</p>
+				</li>
+				<li>
+					<p>{{information.localeNum}}</p>
+					<p>现场抽奖触发(次)</p>
+				</li>
+				<li>
+					<p>{{information.localeWineNum}}</p>
+					<p>现场中奖个数(个)</p>
+				</li>
+			</ul>
+		</div>
+
+		<el-table
+			:data="tableData"
+			border
+			header-align="center"
+			v-loading="loadingTab"
+			style="margin-top:20px"
+		>
+			<el-table-column label="序号" align="center" width="70">
+				<template scope="scope">
+					<span>{{scope.$index+(listQuery.page - 1) * listQuery.limit + 1}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="userName" label="用户名" align="center"></el-table-column>
+			<el-table-column prop="phone" label="电话" align="center"></el-table-column>
+			<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
+			<el-table-column label="发放类型" align="center">
+				<template scope="scope">
+					<span>{{scope.row.prizeType == 1 ? '线上' : '现场'}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="prizeName" label="抽奖礼品" align="center"></el-table-column>
+			<el-table-column prop="expiryDateCode" label="兑换码" align="center">
+				<template scope="scope">
+					<span>{{scope.row.expiryDateCode || '无'}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="lotteryTime" label="中奖时间" align="center"></el-table-column>
+		</el-table>
+
+		<el-pagination
+			@size-change="handleSizeChange"
+			@current-change="handleCurrentChange"
+			:current-page.sync="listQuery.page"
+			:page-sizes="[10,20,30, 50]"
+			:page-size="listQuery.limit"
+			layout="total, sizes, prev, pager, next, jumper"
+			:total="total"
+			style="margin-top:20px"
+		></el-pagination>
+	</div>
+</template>
+<script>
+import { applyListWin, excelWin } from 'api/applyManagements'
+export default {
+	created() {
+		this.getList()
+	},
+	data() {
+		return {
+			information: {},
+			excelLoading: false,
+			loadingTab: false,
+			tableData: [],
+			time: '',
+			total: null, //总页数
+			options: [
+				{
+					id: '',
+					name: '全部'
+				},
+				{
+					id: 1,
+					name: '线上'
+				},
+				{
+					id: 2,
+					name: '现场'
+				}
+			],
+			listQuery: {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 2,
+				prizeType: null,
+				hasWinning: 2
+			}
+		}
+	},
+	methods: {
+		//列表
+		getList() {
+			this.loadingTab = true
+			applyListWin(this.listQuery).then(data => {
+				if (data.status == 200) {
+					this.tableData = data.data.activityWinningRecords
+					this.total = data.data.totalCount
+					if (this.listQuery.page == 1) {
+						this.information =
+							data.data.activityWinningRecordTotalVo
+					}
+				} else {
+					this.$message(data.message)
+				}
+			})
+			setTimeout(() => {
+				this.loadingTab = false
+			}, 300)
+		},
+		//搜索
+		search() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//抽奖类型筛选
+		changeClass() {
+			this.listQuery.page = 1
+			this.getList()
+		},
+		//清空搜索
+		clearSearch() {
+			this.listQuery = {
+				page: 1,
+				limit: 10,
+				startTime: null,
+				endTime: null,
+				phone: null,
+				activityId: 1
+			}
+		},
+		//导出
+		downloadExcel() {
+			this.excelLoading = true
+			var u = navigator.userAgent,
+				app = navigator.appVersion
+			excelWin(this.listQuery, { responseType: 'arraybuffer' }).then(
+				res => {
+					const content = res
+					const blob = new Blob([content], {
+						type: 'application/vnd.ms-excel'
+					})
+					const fileName = '中奖列表.xlsx'
+					if (u.indexOf('Edge') > -1) {
+						window.navigator.msSaveBlob(blob, fileName)
+					} else {
+						const elink = document.createElement('a')
+						elink.download = fileName
+						elink.style.display = 'none'
+						elink.href = URL.createObjectURL(blob)
+						document.body.appendChild(elink)
+						elink.click()
+						URL.revokeObjectURL(elink.href) // 释放URL 对象
+						document.body.removeChild(elink)
+					}
+					this.excelLoading = false
+				}
+			)
+		},
+		//时间筛选
+		changeTime(val) {
+			this.listQuery.page = 1
+			if (!!val) {
+				let value = val.split(' - ')
+				this.listQuery.startDate = value[0] + ' 00:00:00'
+				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.getList()
+			} else {
+				this.listQuery.startDate = null
+				this.listQuery.endDate = null
+				this.getList()
+			}
+		},
+		//页码
+		handleSizeChange(val) {
+			this.listQuery.limit = val
+			this.getList()
+		},
+		//分页
+		handleCurrentChange(val) {
+			this.listQuery.page = val
+			this.getList()
+		}
+	}
+}
+</script>
+<style scoped>
+.information {
+	border: 1px solid #ccc;
+	margin: 20px 0;
+	padding: 10px 20px;
+}
+.information h4 {
+	color: #333;
+	font-size: 16px;
+	font-weight: normal;
+}
+.information ul {
+	padding: 0;
+	border-top: 1px solid #eee;
+	padding: 10px 30px;
+	overflow: hidden;
+}
+.information li {
+	list-style: none;
+	text-align: center;
+	float: left;
+	width: 25%;
+	border-right: 1px solid #eee;
+}
+.information li:last-child {
+	border: none;
+}
+</style>
\ No newline at end of file

src/views/order/modal/rentOrderDetailModal.vue

@@ -67,7 +67,7 @@
 					<td>
 						<p>取:{{timestamp(new Date(orderDetailInfo.orderRentVehicleDetail.startTime))}}</p>
 						<p>还:{{timestamp(new Date(orderDetailInfo.orderRentVehicleDetail.endTime))}}</p>
-						<p v-show="orderDetailInfo.orderRentVehicleDetail.dayNum">租借天数{{orderDetailInfo.orderRentVehicleDetail.dayNum}}天</p>
+						<p v-show="orderDetailInfo.orderRentVehicleDetail.dayNum">租借天数{{orderDetailInfo.orderRentVehicleDetail.dayNum+orderDetailInfo.orderRentVehicleDetail.delayAddDays}}天</p>
 					</td>
 					<td>{{orderDetailInfo.startCompanyName}}</td>
 					<td>{{orderDetailInfo.endCompanyName}}</td>
@@ -123,7 +123,9 @@
 					<td>
 						<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
 					</td>
-					<td></td>
+					<td>
+						<el-button size="small" type="text" v-if="orderDetailInfo.status==5 || orderDetailInfo.status==4" @click="postponePop = true">延期还车</el-button>
+					</td>
 					<td></td>
 					<td>
 						<el-button
@@ -202,6 +204,20 @@
 				<el-button style="margin-top:20px" type="primary" @click="confirm('returnForm')">确定</el-button>
 			</el-form>
 		</el-dialog>
+
+		<!-- 延期还车 -->
+		<div class="modal_modal" v-show="postponePop"></div>
+		<el-dialog title="延期还车" :visible.sync="postponePop" :append-to-body="true" :modal="false" @close="closePostpone">
+			 <el-date-picker
+				v-model="delayEndTime"
+				type="datetime"
+				placeholder="选择日期时间">
+			</el-date-picker>
+			
+			 <el-checkbox v-model="needDamageSafe" label="1" border>不计免赔</el-checkbox>
+			 <p><el-button style="margin-top:20px" type="primary" @click="postponeBtn">确定</el-button></p>
+			
+		</el-dialog>
 	</el-dialog>
 </template>
 
@@ -211,7 +227,7 @@ import ElInput from '../../../../node_modules/element-ui/packages/input/src/inpu
 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'
-import { editObj } from 'api/vehicle/vehicleInfo'
+import { editObj,postponeApi} from 'api/vehicle/vehicleInfo'
 import { getAll, updateEndCompany } from 'api/base_info/branch_company'
 import {getYMD} from 'src/utils/dateUtils'
 export default {
@@ -225,6 +241,9 @@ export default {
 	},
 	data() {
 		return {
+			needDamageSafe:null,
+			delayEndTime:null,//延期还车时间
+			postponePop:false,
 			returnForm: {
 				endCompanyId: ''
 			},
@@ -271,7 +290,34 @@ export default {
 		this.getAllFn()
 	},
 	methods: {
-
+		//延期还车弹窗关闭
+		closePostpone(){
+			this.delayEndTime = null
+		},
+		//延期还车
+		postponeBtn(){
+			if (!this.delayEndTime) {
+				this.$message.error("延期时间不能为空")
+					return false
+				}else{
+					let time = new Date(this.delayEndTime).getTime()
+					let params = {
+						no:this.orderDetailInfo.no,
+						delayEndTime:time,
+						needDamageSafe:this.needDamageSafe ? 1 : null
+					}
+					postponeApi(params).then(data=>{
+						if (data.status == 200) {
+							this.$message.success('操作成功')
+							this.postponePop = false
+							this.dialogVisible = false
+							this.$emit('rentOrderDetailDialogEvent', true)
+						}else{
+							this.$message.error(data.message)
+						}
+					})
+			}
+		},
 		orderInfo(val) {
 		  if (this.orderDetailInfo.costDetail.children) {
         let info = this.orderDetailInfo.costDetail.children.filter(item=>item.key == val)

src/views/vehicleType/mockSun.vue

@@ -239,8 +239,12 @@ export default {
 							delete this.ruleForm.id
 							this.successApi()
 						} else {
-							this.ruleForm.startDate = this.ruleForm.date[0]
-							this.ruleForm.endDate = this.ruleForm.date[1]
+							this.ruleForm.startDate = this.format(
+								this.ruleForm.date[0]
+							)
+							this.ruleForm.endDate = this.format(
+								this.ruleForm.date[1]
+							)
 							!this.activeId
 								? ''
 								: (this.ruleForm.id = this.activeId)