Skip to content

C
cloud-platform-ui
Commit 1915df9b authored by xiaosl's avatar xiaosl
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parent 7430439e
Hide whitespace changes
Inline Side-by-side
Showing with 2908 additions and 2507 deletions
config/dev.env.js
View file @ 1915df9b
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威) BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/api/base_info/branch_company/index.js
View file @ 1915df9b
...@@ -155,7 +155,22 @@ export function stockSearchPage(query) { ...@@ -155,7 +155,22 @@ export function stockSearchPage(query) {
}); });
} }
// 修改订单还车公司
export function updateEndCompany(params) {
return fetch({
url: '/api/order/baseOrder/updateEndCompany',
method: 'post',
data: params
});
}
// 修改预定订单还车公司
export function updateById(params) {
return fetch({
url: '/vehicle/vehicleInfo/bookRecord/updateById',
method: 'post',
data: params
});
}
export function delObj(id) { export function delObj(id) {
return fetch({ return fetch({
url: '/vehicle/branchCompany/' + id, url: '/vehicle/branchCompany/' + id,
...@@ -184,6 +199,7 @@ export function getDetail(id) { ...@@ -184,6 +199,7 @@ export function getDetail(id) {
method: 'get' method: 'get'
}) })
} }
/** /**
* 获取所有公司信息 * 获取所有公司信息
* @returns {null|*} * @returns {null|*}
......
src/api/summit/activity.js
View file @ 1915df9b
...@@ -32,3 +32,17 @@ export function add(obj) { ...@@ -32,3 +32,17 @@ export function add(obj) {
data:obj data:obj
}) })
} }
export function activityIds() {
return fetch({
url: '/api/summit/imxr/ids',
method: 'get'
})
}
export function remove(id) {
return fetch({
url: '/api/summit/activity/remove/' + id,
method: 'delete'
})
}
\ No newline at end of file
src/views/order/modal/rentOrderDetailModal.vue
View file @ 1915df9b
<template> <template>
<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details"> <el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="90px"> <el-form :model="form" ref="form" label-width="90px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单号:"> <el-form-item label="订单号:">
<span>{{form.no}}</span> <span>{{form.no}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="支付时间:"> <el-form-item label="支付时间:">
<span>{{form.crtTime}}</span> <span>{{form.crtTime}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单状态:"> <el-form-item label="订单状态:">
<span>{{form.ststusName}}</span> <span>{{form.ststusName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<span>{{form.realName}}</span> <span>{{form.realName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机号:"> <el-form-item label="手机号:">
<span>{{form.telephone}}</span> <span>{{form.telephone}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="配车:"> <el-form-item label="配车:">
<span style="margin-right: 10px;">{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span><el-button size="small" type="primary" icon="edit" v-if="form.status==4" @click="resetCar">重新配车</el-button> <span
</el-form-item> style="margin-right: 10px;"
</el-col> >{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span>
</el-row> <el-button
<el-row> size="small"
<el-col :span="8"> type="primary"
<el-form-item label="取车:"> icon="edit"
<span>{{form.orderRentVehicleDetail.startTime}}</span> v-if="form.status==4"
</el-form-item> @click="resetCar"
</el-col> >重新配车</el-button>
<el-col :span="8"> </el-form-item>
<el-form-item label="" label-width="10px"> </el-col>
<span>{{form.orderRentVehicleDetail.startAddr}}</span> </el-row>
</el-form-item> <el-row>
</el-col> <el-col :span="8">
<el-col :span="8"> <el-form-item label="取车:">
<el-form-item label="交车公司:"> <span>{{form.orderRentVehicleDetail.startTime}}</span>
<span>{{form.startCompanyName}}</span> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="8">
</el-row> <el-form-item label label-width="10px">
<el-row> <span>{{form.orderRentVehicleDetail.startAddr}}</span>
<el-col :span="8"> </el-form-item>
<el-form-item label="还车:"> </el-col>
<span>{{form.orderRentVehicleDetail.endTime}}</span> <el-col :span="8">
</el-form-item> <el-form-item label="交车公司:">
</el-col> <span>{{form.startCompanyName}}</span>
<el-col :span="8"> </el-form-item>
<el-form-item label="" label-width="10px"> </el-col>
<span>{{form.orderRentVehicleDetail.endAddr}}</span> </el-row>
</el-form-item> <el-row>
</el-col> <el-col :span="8">
<el-col :span="8"> <el-form-item label="还车:">
<el-form-item label="交车公司:"> <span>{{form.orderRentVehicleDetail.endTime}}</span>
<span>{{form.endCompanyName}}</span> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="8">
</el-row> <el-form-item label label-width="10px">
<table class="orderDetail"> <span>{{form.orderRentVehicleDetail.endAddr}}</span>
<tr><th>房车</th><th>租借天数</th><th>费用明细</th> </el-form-item>
</tr> </el-col>
<tr> <el-col :span="8">
<td>{{form.name}}{{rentCostDetail}}</td> <el-form-item label="还车公司:">
<td>{{form.orderRentVehicleDetail.dayNum}}天</td> <span>{{form.endCompanyName}}</span>
<td>{{rentCostDetail}}</td> <el-button v-show="form.status == 4 || form.status == 5" size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button>
</tr> </el-form-item>
<tr> </el-col>
<td ></td> </el-row>
<td ></td> <table class="orderDetail">
<td >共计:￥{{form.realAmount}}</td> <tr>
</tr> <th>房车</th>
</table> <th>租借天数</th>
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">驾驶人信息</span></div> <th>费用明细</th>
<table class="orderDetail" v-if="form.orderVehicleCrosstownDto"> </tr>
<tr><th>姓名</th><th>手机号</th><th>身份证号</th><!-- <th>驾照</th>--></tr> <tr>
<td>{{form.name}}{{rentCostDetail}}</td>
<td>{{form.orderRentVehicleDetail.dayNum}}天</td>
<td>{{rentCostDetail}}</td>
</tr>
<tr>
<td></td>
<td></td>
<td>共计:￥{{form.realAmount}}</td>
</tr>
</table>
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
<span style="font-size: 18px;font-weight: bold;">驾驶人信息</span>
</div>
<table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
<tr>
<th>姓名</th>
<th>手机号</th>
<th>身份证号</th>
<!-- <th>驾照</th>-->
</tr>
<tr> <tr>
<td>{{form.orderVehicleCrosstownDto.licenseName}}</td> <td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
<td>{{form.orderVehicleCrosstownDto.licensePhone}}</td> <td>{{form.orderVehicleCrosstownDto.licensePhone}}</td>
<td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td> <td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td>
<!-- <td><img style="width: 140px;height: 140px;" :src="form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"></td>--> <!-- <td><img style="width: 140px;height: 140px;" :src="form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"></td>-->
</tr> </tr>
</table> </table>
</el-form> </el-form>
<div class="modal_modal" v-show="resetCarVisible"></div> <div class="modal_modal" v-show="resetCarVisible"></div>
<!-- 重新配车 --> <!-- 重新配车 -->
<el-dialog title="重新配车" :visible.sync="resetCarVisible" :append-to-body='true' :modal="false"> <el-dialog title="重新配车" :visible.sync="resetCarVisible" :append-to-body="true" :modal="false">
<el-form :model="resetCarForm" ref="carForm" :rules="rules" label-width="90px"> <el-form :model="resetCarForm" ref="carForm" :rules="rules" label-width="90px">
<el-form-item label="车牌号:" prop="numberPlate"> <el-form-item label="车牌号:" prop="numberPlate">
<el-input v-model="resetCarForm.numberPlate" placeholder="请输入重配的车牌号"></el-input> <el-input v-model="resetCarForm.numberPlate" placeholder="请输入重配的车牌号"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelResetCar">取消</el-button> <el-button @click="cancelResetCar">取消</el-button>
<el-button type="primary" @click="update('carForm')">确定</el-button> <el-button type="primary" @click="update('carForm')">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-dialog>
<!-- 更改还车地点 -->
<div class="modal_modal" v-show="resetReturn"></div>
<el-dialog title="更改还车地点" :visible.sync="resetReturn" :append-to-body="true" :modal="false">
<el-form :model="returnForm" ref="returnForm" label-width="90px">
<el-form-item label="还车地点:" prop="endCompanyId">
<el-select clearable v-model="returnForm.endCompanyId" filterable placeholder="请选择/搜索还车地点">
<el-option v-for="item in allCompaniesArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-button style="margin-top:20px" type="primary" @click="confirm('returnForm')">确定</el-button>
</el-form>
</el-dialog>
</el-dialog>
</template> </template>
<script> <script>
import ElRow from "element-ui/packages/row/src/row"; import ElRow from 'element-ui/packages/row/src/row'
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue"; import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from "element-ui/packages/col/src/col"; import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue"; 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 ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
import {editObj} from 'api/vehicle/vehicleInfo'; import { editObj } from 'api/vehicle/vehicleInfo'
export default { import { getAll, updateEndCompany } from 'api/base_info/branch_company'
props: ["form", "rentCostDetail"], export default {
name: 'rentOrderDetailModal', props: ['form', 'rentCostDetail'],
components: { name: 'rentOrderDetailModal',
ElFormItem, components: {
ElCol, ElFormItem,
ElInput, ElCol,
ElRow ElInput,
}, ElRow
data() { },
return { data() {
updateNumberPlat:false,//是否重新配车 return {
dialogVisible: false, returnForm: {
resetCarVisible:false, endCompanyId: ''
resetCarForm:{ },
no:'', allCompaniesArr: [],
numberPlate:'',//重新配车车牌号 resetReturn: false, //更改换成地点loading
}, updateNumberPlat: false, //是否重新配车
rules: { dialogVisible: false,
numberPlate: [ resetCarVisible: false,
{ resetCarForm: {
type: 'string', no: '',
required: true, numberPlate: '' //重新配车车牌号
message: '请输入车牌号', },
trigger: 'blur' rules1: {
} endCompanyId: [
] {
}, required: true,
} message: '请选择更换地点',
}, trigger: 'change'
watch: { }
dialogVisible(newValue, oldValue){ ]
if(!newValue){ },
this.$emit("rentOrderDetailDialogEvent", this.updateNumberPlat); rules: {
} numberPlate: [
}, {
}, type: 'string',
mounted() { required: true,
this.dialogVisible = true; message: '请输入车牌号',
if (this.form.status == 2) { trigger: 'blur'
this.form.ststusName = '取消'; }
} ]
if (this.form.status == 3) { }
this.form.ststusName = '待付款'; }
} },
if (this.form.status == 4) { watch: {
this.form.ststusName = '待出行'; dialogVisible(newValue, oldValue) {
} if (!newValue) {
if (this.form.status == 5) { this.$emit('rentOrderDetailDialogEvent', this.updateNumberPlat)
this.form.ststusName = '出行中'; }
} }
if (this.form.status == 6) { },
this.form.ststusName = '已完成'; mounted() {
} console.log(this.form)
}, this.dialogVisible = true
methods: { if (this.form.status == 2) {
resetCar(){ this.form.ststusName = '取消'
this.clearFrom(); }
this.resetCarVisible = true if (this.form.status == 3) {
this.resetCarForm.no = this.form.no this.form.ststusName = '待付款'
}, }
cancelResetCar(){ if (this.form.status == 4) {
this.resetCarVisible = false this.form.ststusName = '待出行'
}, }
clearFrom(){ if (this.form.status == 5) {
this.resetCarForm = { this.form.ststusName = '出行中'
no:'', }
numberPlate:'',//重新配车车牌号 if (this.form.status == 6) {
} this.form.ststusName = '已完成'
}, }
/** this.getAllFn()
* 重新配车 },
* */ methods: {
update(formName) { getAllFn() {
let that = this; let _this = this
const set = this.$refs; getAll().then(data => {
set[formName].validate(valid => { _this.allCompaniesArr = []
if (valid) { data.data.map(function(item) {
editObj(this.resetCarForm).then(response => { item.value = item.name
if (response.status === 200) { _this.allCompaniesArr.push(item)
this.$notify({ })
title: '成功', })
message: '修改成功', },
type: 'success', confirm(formName) {
duration: 2000 if (this.returnForm.endCompanyId == '') {
}); this.$notify({
this.resetCarVisible = false title: '失败',
this.form.vehicleNumberPlat = this.resetCarForm.numberPlate message: '还车地点不能为空',
this.updateNumberPlat = true type: 'error',
} else { duration: 2000
this.$notify({ })
title: '失败', } else {
message: response.message, this.returnForm.id = this.form.detailId
type: 'error', updateEndCompany(this.returnForm).then(data => {
duration: 2000 if (data.status == 200) {
}); this.$notify({
} title: '成功',
}); message: '修改还车地点成功',
} else { type: 'success',
return false; duration: 3000
} })
}); this.resetReturn = false;
}, this.dialogVisible = false;
} this.$emit('rentOrderDetailDialogEvent', true)
}
} else {
this.$notify({
title: '失败',
message: data.message,
type: 'error',
duration: 3000
})
}
})
}
},
resetCar() {
this.clearFrom()
this.resetCarVisible = true
this.resetCarForm.no = this.form.no
},
cancelResetCar() {
this.resetCarVisible = false
},
clearFrom() {
this.resetCarForm = {
no: '',
numberPlate: '' //重新配车车牌号
}
},
/**
* 重新配车
* */
update(formName) {
let that = this
const set = this.$refs
set[formName].validate(valid => {
if (valid) {
editObj(this.resetCarForm).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '修改成功',
type: 'success',
duration: 2000
})
this.resetCarVisible = false
this.form.vehicleNumberPlat = this.resetCarForm.numberPlate
this.updateNumberPlat = true
} else {
this.$notify({
title: '失败',
message: response.message,
type: 'error',
duration: 2000
})
}
})
} else {
return false
}
})
}
}
}
</script> </script>
<style> <style>
.label-text{ .label-text {
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
} }
.label-title{ .label-title {
margin-top: 10px; margin-top: 10px;
} }
.orderDetail tr th{ .orderDetail tr th {
background: #eef1f6; background: #eef1f6;
} }
.orderDetail tr td, .orderDetail tr th{ .orderDetail tr td,
width: 500px; .orderDetail tr th {
text-align: center; width: 500px;
border: 1px solid #dfe6ec; text-align: center;
margin-left: 100px; border: 1px solid #dfe6ec;
margin-right: 100px; margin-left: 100px;
padding: 10px; margin-right: 100px;
} padding: 10px;
.label-value{ }
margin-left: 80px; .label-value {
margin-right: 100px; margin-left: 80px;
} margin-right: 100px;
#license-img{ }
width: 50px; #license-img {
height: 50px; width: 50px;
} height: 50px;
.order-details .el-form-item{ }
margin-bottom: 10px !important; .order-details .el-form-item {
} margin-bottom: 10px !important;
.modal_modal{ }
position: fixed; .modal_modal {
left: 0; position: fixed;
top: 0; left: 0;
width: 100%; top: 0;
height: 100%; width: 100%;
opacity: .5; height: 100%;
background: #000; opacity: 0.5;
z-index: 2000; background: #000;
} z-index: 2000;
}
</style> </style>
src/views/order/orderStatistics/index.vue
View file @ 1915df9b
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="统计时间:"> <el-form-item label="统计时间:">
<el-date-picker <el-date-picker
v-model="listQuery.time" v-model="listQuery.time"
type="daterange" type="daterange"
range-separator="至" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="changeTime" @change="changeTime"
placeholder="请选择统计时间" placeholder="请选择统计时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="统计方式:" class="wayMsg"> <el-form-item label="统计方式:" class="wayMsg">
<span <span
v-for="(item,index) in way" v-for="(item,index) in way"
:key="index" :key="index"
:class="{active:isactive==item.label}" :class="{active:isactive==item.label}"
@click="changeWay(item)" @click="changeWay(item)"
>{{item.label}}</span> >{{item.label}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" style="float:right;text-align:right"> <el-col :span="5" style="float:right;text-align:right">
<el-button class="filter-item" type="primary" v-waves @click="handleFilter">导出为Excel</el-button> <el-button class="filter-item" type="primary" v-waves @click="handleFilter">导出为Excel</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table :data="list" border fit highlight-current-row style="width: 100%" v-loading="loading">
:data="list" <el-table-column align="center" label="时间">
border <template scope="scope">
fit <span>{{scope.row.timeSlot}}</span>
highlight-current-row </template>
style="width: 100%" </el-table-column>
v-loading="loading" <el-table-column align="center" label="普通会员购买量">
> <template scope="scope">
<el-table-column align="center" label="时间"> <span>{{scope.row.pNumber}}</span>
<template scope="scope"> </template>
<span>{{scope.row.timeSlot}}</span> </el-table-column>
</template> <el-table-column align="center" label="支付金额(普通会员)">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="普通会员购买量"> <span>{{scope.row.pAmount}}</span>
<template scope="scope"> </template>
<span>{{scope.row.pNumber}}</span> </el-table-column>
</template> <el-table-column align="center" label="黄金会员购买量">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="支付金额(普通会员)"> <span>{{scope.row.goldNumber}}</span>
<template scope="scope"> </template>
<span>{{scope.row.pAmount}}</span> </el-table-column>
</template> <el-table-column align="center" label="支付金额(黄金会员)">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="黄金会员购买量"> <span>{{scope.row.goldAmount}}</span>
<template scope="scope"> </template>
<span>{{scope.row.goldNumber}}</span> </el-table-column>
</template> <el-table-column align="center" label="钻石会员购买量">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="支付金额(黄金会员)"> <span>{{scope.row.hNumber}}</span>
<template scope="scope"> </template>
<span>{{scope.row.goldAmount}}</span> </el-table-column>
</template> <el-table-column align="center" label="支付金额(钻石会员)">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="钻石会员购买量"> <span>{{scope.row.hAmount}}</span>
<template scope="scope"> </template>
<span>{{scope.row.hNumber}}</span> </el-table-column>
</template> <el-table-column align="center" label="总支付金额">
</el-table-column> <template scope="scope">
<el-table-column align="center" label="支付金额(钻石会员)"> <span>{{scope.row.totalPayment}}</span>
<template scope="scope"> </template>
<span>{{scope.row.hAmount}}</span> </el-table-column>
</template> </el-table>
</el-table-column>
<el-table-column align="center" label="总支付金额"> <el-pagination
<template scope="scope"> @size-change="handleSizeChange"
<span>{{scope.row.totalPayment}}</span> @current-change="handleCurrentChange"
</template> :current-page.sync="listQuery.page"
</el-table-column> :page-sizes="[10,20,30, 50]"
</el-table> :page-size="listQuery.limit"
</div> layout="total, sizes, prev, pager, next, jumper"
</div> :total="total"
style="margin-top:20px"
></el-pagination>
</div>
</div>
</template> </template>
<script> <script>
import { orderStatistics, downloadExcel } from "api/order/rentVehicle"; import { orderStatistics, downloadExcel } from 'api/order/rentVehicle'
export default { export default {
created() { created() {
this.getList(); this.getList()
}, },
data() { data() {
return { return {
loading: false, loading: false,
list: [], total: null,
// 统计时间筛选 list: [],
listQuery: { // 统计时间筛选
time: "null", listQuery: {
type: "1", time: 'null',
startTime: null, type: '1',
endTime: null startTime: null,
}, endTime: null,
//统计方式筛选 time: '',
way: [ limit: 10,
{ page: 1
label: "日统计", },
id: "1" //统计方式筛选
}, way: [
{ {
label: "周统计", label: '日统计',
id: "2" id: '1'
}, },
{ {
label: "月统计", label: '周统计',
id: "3" id: '2'
} },
], {
isactive: "日统计" label: '月统计',
}; id: '3'
}, }
methods: { ],
//统计时间筛选 isactive: '日统计'
changeTime() { }
!!this.listQuery.time[0] },
? (this.listQuery.startTime = this.listQuery.time[0].getTime()) methods: {
: (this.listQuery.startTime = null); //统计时间筛选
!!this.listQuery.time[1] changeTime() {
? (this.listQuery.endTime = this.listQuery.time[1].getTime()) !!this.listQuery.time[0]
: (this.listQuery.endTime = null); ? (this.listQuery.startTime = this.listQuery.time[0].getTime())
this.getList(); : (this.listQuery.startTime = null)
}, !!this.listQuery.time[1]
//统计方式筛选 ? (this.listQuery.endTime = this.listQuery.time[1].getTime())
changeWay(val) { : (this.listQuery.endTime = null)
this.isactive = val.label; this.getList()
this.listQuery.type = val.id; },
this.getList(); //统计方式筛选
}, changeWay(val) {
//导出 this.isactive = val.label
handleFilter() { this.listQuery.type = val.id
downloadExcel(this.listQuery).then(res => { this.getList()
const content = res; },
const blob = new Blob([content]); //导出
const fileName = "导出信息.xlsx"; handleFilter() {
if ("download" in document.createElement("a")) { downloadExcel(this.listQuery).then(res => {
// 非IE下载 const content = res
const elink = document.createElement("a"); const blob = new Blob([content])
elink.download = fileName; const fileName = '导出信息.xlsx'
elink.style.display = "none"; if ('download' in document.createElement('a')) {
elink.href = URL.createObjectURL(blob); // 非IE下载
document.body.appendChild(elink); const elink = document.createElement('a')
elink.click(); elink.download = fileName
URL.revokeObjectURL(elink.href); // 释放URL 对象 elink.style.display = 'none'
document.body.removeChild(elink); elink.href = URL.createObjectURL(blob)
} else { document.body.appendChild(elink)
// IE10+下载 elink.click()
navigator.msSaveBlob(blob, fileName); URL.revokeObjectURL(elink.href) // 释放URL 对象
} document.body.removeChild(elink)
}); } else {
}, // IE10+下载
//列表 navigator.msSaveBlob(blob, fileName)
getList() { }
let params = {}; })
this.loading = true; },
orderStatistics(this.listQuery).then(data => { handleSizeChange(val) {
console.log(data); this.listQuery.limit = val
if (data.status == 200) { this.getList()
data.data.forEach(element => { },
for (let i in element.members) { handleCurrentChange(val) {
if (element.members[i].level == 1) { this.listQuery.page = val
element.pAmount = element.members[i].amount; this.getList()
element.plevel = element.members[i].level; },
element.pMemberName = element.members[i].memberName; //列表
element.pNumber = element.members[i].number; getList() {
} else if (element.members[i].level == 2) { let params = {}
element.goldAmount = element.members[i].amount; this.loading = true
element.goldlevel = element.members[i].level; orderStatistics(this.listQuery).then(data => {
element.goldMemberName = element.members[i].memberName; if (data.status == 200) {
element.goldNumber = element.members[i].number; data.data.list.forEach(element => {
} else if (element.members[i].level == 3) { for (let i in element.members) {
element.hAmount = element.members[i].amount; if (element.members[i].level == 1) {
element.hlevel = element.members[i].level; element.pAmount = element.members[i].amount
element.hMemberName = element.members[i].memberName; element.plevel = element.members[i].level
element.hNumber = element.members[i].number; element.pMemberName =
} element.members[i].memberName
} element.pNumber = element.members[i].number
}); } else if (element.members[i].level == 2) {
this.list = data.data; element.goldAmount = element.members[i].amount
} element.goldlevel = element.members[i].level
setTimeout(() => { element.goldMemberName =
this.loading = false; element.members[i].memberName
}, 300); element.goldNumber = element.members[i].number
}); } else if (element.members[i].level == 3) {
} element.hAmount = element.members[i].amount
} element.hlevel = element.members[i].level
}; element.hMemberName =
element.members[i].memberName
element.hNumber = element.members[i].number
}
}
})
this.total = data.data.total;
this.list = data.data.list
}
setTimeout(() => {
this.loading = false
}, 300)
})
}
}
}
</script> </script>
<style> <style>
.wayMsg span { .wayMsg span {
margin: 10px; margin: 10px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
color: #409eff; color: #409eff;
font-weight: bold; font-weight: bold;
} }
</style> </style>
\ No newline at end of file
src/views/order/rentVehicleInfo/index.vue
View file @ 1915df9b
...@@ -136,14 +136,14 @@ ...@@ -136,14 +136,14 @@
<template scope="scope"> <template scope="scope">
<span>{{scope.row.startCompanyName}}</span> <span>{{scope.row.startCompanyName}}</span>
<br /> <br />
<span>({{scope.row.orderRentVehicleDetail.startCityName}}{{scope.row.orderRentVehicleDetail.startAddr}})</span> <span>({{scope.row.orderRentVehicleDetail.startAddr}})</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="收车公司"> <el-table-column width="200" align="center" label="收车公司">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.endCompanyName}}</span> <span>{{scope.row.endCompanyName}}</span>
<br /> <br />
<span>({{scope.row.orderRentVehicleDetail.endCityName}}{{scope.row.orderRentVehicleDetail.endAddr}})</span> <span>({{scope.row.orderRentVehicleDetail.endAddr}})</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="订单金额"> <el-table-column width="110" align="center" label="订单金额">
...@@ -398,8 +398,9 @@ ...@@ -398,8 +398,9 @@
<span class="label-text">拍照取证*:</span> <span class="label-text">拍照取证*:</span>
<br /> <br />
<img <img
v-for="item in otherImg" v-for="(item,index) in otherImg"
:src="item" :src="item"
:key="index"
style="width: 100px; height: 100px;margin-left:110px;" style="width: 100px; height: 100px;margin-left:110px;"
/> />
<!-- <img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/> <!-- <img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>
...@@ -697,7 +698,6 @@ export default { ...@@ -697,7 +698,6 @@ export default {
}); });
}, },
handleOrderDetail(row) { handleOrderDetail(row) {
debugger
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = "取消"; this.form.ststusName = "取消";
...@@ -776,7 +776,7 @@ export default { ...@@ -776,7 +776,7 @@ export default {
illegalEvent(params) { illegalEvent(params) {
this.illegalVisible = false; this.illegalVisible = false;
if (params) { if (params) {
console.log(params); // console.log(params);
} }
}, },
/** /**
...@@ -785,11 +785,11 @@ export default { ...@@ -785,11 +785,11 @@ export default {
detailEvent(params) { detailEvent(params) {
this.detailVisible = false; this.detailVisible = false;
if (params) { if (params) {
console.log(params); // console.log(params);
} }
}, },
handleHandoverOrderVehicle(row) { handleHandoverOrderVehicle(row) {
console.log(row); // console.log(row);
this.modalTitle = "交车记录"; this.modalTitle = "交车记录";
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
...@@ -838,7 +838,7 @@ export default { ...@@ -838,7 +838,7 @@ export default {
}, },
getAllOrderVehicleCrosstown() { getAllOrderVehicleCrosstown() {
getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => { getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => {
console.log(response); // console.log(response);
if (response.data.length <= 0) { if (response.data.length <= 0) {
alert("交还车记录不存在"); alert("交还车记录不存在");
} else { } else {
...@@ -852,7 +852,7 @@ export default { ...@@ -852,7 +852,7 @@ export default {
}, },
handleReturnOrderVehicle(row) { handleReturnOrderVehicle(row) {
console.log(row); // console.log(row);
this.modalTitle = "还车记录"; this.modalTitle = "还车记录";
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
...@@ -900,7 +900,7 @@ export default { ...@@ -900,7 +900,7 @@ export default {
this.depositDetail = false; this.depositDetail = false;
}, },
handleRefundVehicle(row) { handleRefundVehicle(row) {
console.log(row); // console.log(row);
var that = this; var that = this;
that.pictureList = []; that.pictureList = [];
that.dedDetail = []; that.dedDetail = [];
...@@ -948,7 +948,7 @@ export default { ...@@ -948,7 +948,7 @@ export default {
} }
that.depositRefundRecord = arr; that.depositRefundRecord = arr;
console.log(that.depositRefundRecord); // console.log(that.depositRefundRecord);
} }
}); });
}); });
...@@ -1069,7 +1069,7 @@ export default { ...@@ -1069,7 +1069,7 @@ export default {
page(this.listQuery).then(response => { page(this.listQuery).then(response => {
if (response.data.data) { if (response.data.data) {
response.data.data.map(function(el) { response.data.data.map(function(el) {
console.log(el); // console.log(el);
if (el.status == 2) { if (el.status == 2) {
el.ststusName = "取消"; el.ststusName = "取消";
} }
...@@ -1107,6 +1107,7 @@ export default { ...@@ -1107,6 +1107,7 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
}, },
templateModel() { templateModel() {
this.costDetail = { this.costDetail = {
......
src/views/summit/index.vue
View file @ 1915df9b
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :inline="inline" :model="query" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="query" label-width="100px">
<el-row> <el-row>
<el-form-item label="峰会名称"> <el-form-item label="峰会名称">
<el-input v-model="query.title" placeholder="请输入峰会名称"></el-input> <el-input v-model="query.title" placeholder="请输入峰会名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="开始时间"> <el-form-item label="开始时间">
<el-date-picker <el-date-picker
v-model="query.startTime" v-model="query.startTime"
type="datetime" type="datetime"
format="yyyy-MM-dd HH" format="yyyy-MM-dd HH"
placeholder="报名截止时间" placeholder="报名截止时间"
@change="changeTime" @change="changeTime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="用户来源"> <el-form-item label="峰会状态">
<el-select class="filter-item" v-model="query.status" placeholder="状态"> <el-select class="filter-item" v-model="query.status" placeholder="状态">
<el-option <el-option v-for="(val,index) in status" :key="index" :label="val.name" :value="val.id"></el-option>
v-for="(val,index) in status" </el-select>
:key="index" </el-form-item>
:label="val.name" </el-row>
:value="val.id" </el-form>
></el-option> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-select> <el-button class="filter-item" type="primary" v-waves icon="search" @click="createSummit">创建峰会</el-button>
</el-form-item> </div>
</el-row> <el-table
</el-form> :key="tableKey"
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> :data="list"
<el-button class="filter-item" type="primary" v-waves icon="search" @click="createSummit">创建峰会</el-button> v-loading="listLoading"
</div> border
<el-table fit
:key="tableKey" highlight-current-row
:data="list" style="width: 100%"
v-loading="listLoading" >
border <el-table-column align="center" width="150px" label="id">
fit <template scope="scope">
highlight-current-row <span>{{scope.row.id}}</span>
style="width: 100%" </template>
> </el-table-column>
<el-table-column align="center" width="150px" label="id"> <el-table-column align="center" width="500px" label="标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.id}}</span> <span>{{scope.row.title}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="500px" label="标题"> <el-table-column align="center" width="400" label="开始-结束时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{timestamp2Date(scope.row.startTime)}}</span>
</template> <span>-</span>
</el-table-column> <span>{{timestamp2Date(scope.row.endTime)}}</span>
<el-table-column align="center" width="400" label="开始-结束时间"> </template>
<template scope="scope"> </el-table-column>
<span>{{timestamp2Date(scope.row.startTime)}}</span> <el-table-column align="center" label="当前状态">
<span>-</span> <template scope="scope">
<span>{{timestamp2Date(scope.row.endTime)}}</span> <span>{{getStatusName(scope.row.status)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="当前状态"> <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<span>{{getStatusName(scope.row.status)}}</span> <el-button
</template> size="small"
</el-table-column> class="el-button el-button--text el-button--small"
<el-table-column align="center" label="操作" fixed="right"> v-if="scope.row.isPublish===1"
<template scope="scope"> @click="viewDetails({id:scope.row.id,isPublish:0})"
<el-button >取消发布</el-button>
size="small" <el-button
class="el-button el-button--text el-button--small" size="small"
v-if="scope.row.isPublish===1" class="el-button el-button--text el-button--small"
@click="viewDetails({id:scope.row.id,isPublish:0})" v-if="scope.row.isPublish===0"
>取消发布</el-button> @click="viewDetails({id:scope.row.id,isPublish:1})"
<el-button >发布</el-button>
size="small" <el-button
class="el-button el-button--text el-button--small" size="small"
v-if="scope.row.isPublish===0" class="el-button el-button--text el-button--small"
@click="viewDetails({id:scope.row.id,isPublish:1})" @click="enrollData(scope.row)"
>发布</el-button> >报名信息</el-button>
<el-button <!-- <el-button
size="small"
class="el-button el-button--text el-button--small"
@click="enrollData(scope.row)"
>报名信息</el-button>
<!-- <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="applyPage(scope.row)" @click="applyPage(scope.row)"
>报名页面</el-button> --> >报名页面</el-button>-->
<el-button <el-button
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
size="small" size="small"
@click="edit(scope.row)" @click="edit(scope.row)"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="review(scope.row)" @click="review(scope.row)"
>回顾页面</el-button> >回顾页面</el-button>
<el-button <el-button
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
style="color:red" style="color:red"
size="small" size="small"
v-if="scope.row.isPublish==0" v-if="scope.row.isPublish==0"
@click="deleteSummit(scope.row)" @click="deleteSummit(scope.row)"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="query.page" :current-page.sync="query.page"
:page-sizes="[10,20,30, 50]" :page-sizes="[10,20,30, 50]"
:page-size="query.limit" :page-size="query.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
<summitPopup <summitPopup
v-if="popupShow" v-if="popupShow"
:popupRow="popupRow" :popupRow="popupRow"
:titleNme="titleNme" :titleNme="titleNme"
v-on:summitDialogEvent="summitDialogEvent" v-on:summitDialogEvent="summitDialogEvent"
/> />
<enrollDataPopup <enrollDataPopup
v-if="enrollShow" v-if="enrollShow"
:enrollRow="enrollRow" :enrollRow="enrollRow"
v-on:enrollDialogEvent="enrollDialogEvent" v-on:enrollDialogEvent="enrollDialogEvent"
/> />
<reviewPopup <reviewPopup v-if="reviewShow" :reviewRow="reviewRow" v-on:reviewDialogEvent="reviewDialogEvent" />
v-if="reviewShow"
:reviewRow="reviewRow"
v-on:reviewDialogEvent="reviewDialogEvent"
/>
<!-- <applyPage :applyInfo='applyInfo'></applyPage> --> <!-- <applyPage :applyInfo='applyInfo'></applyPage> -->
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex'
import { timestamp2Date } from "src/utils/dateUtils"; import { timestamp2Date } from 'src/utils/dateUtils'
import { page, update } from "src/api/summit/activity"; import { page, update, remove } from 'src/api/summit/activity'
import summitPopup from "src/views/summit/model/summitPopup"; import summitPopup from 'src/views/summit/model/summitPopup'
import enrollDataPopup from "src/views/summit/model/enrollDataPopup"; import enrollDataPopup from 'src/views/summit/model/enrollDataPopup'
import reviewPopup from "src/views/summit/model/reviewPopup"; import reviewPopup from 'src/views/summit/model/reviewPopup'
// import applyPage from "src/views/summit/model/applyPage"; // import applyPage from "src/views/summit/model/applyPage";
import { getToken } from "src/utils/auth"; import { getToken } from 'src/utils/auth'
export default { export default {
name: "summitList", name: 'summitList',
components: { components: {
summitPopup, summitPopup,
enrollDataPopup, enrollDataPopup,
reviewPopup, reviewPopup
// applyPage // applyPage
}, },
data() { data() {
return { return {
applyInfo:{ applyInfo: {
dialogVisible:false, dialogVisible: false
}, },
query: { query: {
page: 1, page: 1,
limit: 10, limit: 10,
title: "", title: '',
startTime: "", startTime: '',
status: undefined, status: undefined,
type: 1 type: 1
}, },
tableKey: 0, tableKey: 0,
list: [], list: [],
listLoading: true, listLoading: true,
status: [ status: [
{ id: 0, name: "默认" }, { id: 0, name: '全部' },
{ id: 1, name: "报名中" }, { id: 1, name: '报名中' },
{ id: 2, name: "进行中" }, { id: 2, name: '进行中' },
{ id: 3, name: "已结束" } { id: 3, name: '已结束' }
], ],
total: 0, total: 0,
inline: true, inline: true,
popupShow: false, popupShow: false,
titleNme: "创建峰会", titleNme: '创建峰会',
popupRow: undefined, popupRow: undefined,
enrollRow: undefined, enrollRow: undefined,
enrollShow: false, enrollShow: false,
reviewRow: undefined, reviewRow: undefined,
reviewShow: false, reviewShow: false,
statusNameList: { statusNameList: {
1: "默认", 1: '默认',
2: "报名中", 2: '报名中',
3: "进行中", 3: '进行中',
4: "已结束" 4: '已结束'
} }
}; }
}, },
created() { created() {
this.getList(); this.getList()
}, },
computed: { computed: {
...mapGetters(["elements"]), ...mapGetters(['elements']),
getHeaderWithToken() { getHeaderWithToken() {
return { Authorization: getToken() }; return { Authorization: getToken() }
} }
}, },
methods: { methods: {
//报名页面 //报名页面
// applyPage(){ // applyPage(){
// this.applyInfo.dialogVisible = true; // this.applyInfo.dialogVisible = true;
// }, // },
getList() { getList() {
this.listLoading = true; this.listLoading = true
page(this.query).then(res => { page(this.query).then(res => {
this.list = res.data.list; this.list = res.data.list
this.total = res.data.total; this.total = res.data.total
}); })
setTimeout(() => { setTimeout(() => {
this.listLoading = false; this.listLoading = false
}, 500); }, 500)
}, },
changeTime(val) { changeTime(val) {
!!val !!val
? (this.query.startTime = Date.now(val)) ? (this.query.startTime = Date.now(val))
: this.query.startTime == ""; : this.query.startTime == ''
}, },
handleFilter() { handleFilter() {
this.getList(); this.getList()
}, },
viewDetails(row) { viewDetails(row) {
update(row).then(res => { update(row).then(res => {
if (res.rel) { if (res.rel) {
this.$notify.success({ this.$notify.success({
title: "编辑成功", title: '编辑成功',
message: `success` message: `success`
}); })
this.getList(); this.getList()
} else { } else {
this.$notify.warning({ this.$notify.warning({
title: "编辑失败", title: '编辑失败',
message: `failed` message: `failed`
}); })
} }
}); })
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.query.limit = val; this.query.limit = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.query.page = val; this.query.page = val
this.getList(); this.getList()
}, },
timestamp2Date(timeStamp) { timestamp2Date(timeStamp) {
return timestamp2Date(timeStamp); return timestamp2Date(timeStamp)
}, },
enrollData(row) { enrollData(row) {
this.enrollRow = row; this.enrollRow = row
this.enrollShow = true; this.enrollShow = true
}, },
edit(row) { edit(row) {
// debugger; // debugger;
this.popupRow = row; this.popupRow = row
this.titleNme = "编辑峰会"; this.titleNme = '编辑峰会'
this.popupShow = true; this.popupShow = true
}, },
createSummit() { createSummit() {
this.popupRow = {}; this.popupRow = {}
this.titleNme = "创建峰会"; this.titleNme = '创建峰会'
this.popupShow = true; this.popupShow = true
}, },
review(row) { review(row) {
this.reviewRow = row; this.reviewRow = row
this.reviewShow = true; this.reviewShow = true
}, },
deleteSummit() {}, deleteSummit(row) {
getStatusName(status) { this.$confirm('此操作将删除该峰会, 是否继续?', '提示', {
return status + 1 ? this.statusNameList[status + 1] : ""; confirmButtonText: '确定',
}, cancelButtonText: '取消',
summitDialogEvent(e) { type: 'warning'
this.popupShow = false; }).then(() => {
if (e) { remove(row.id).then(data => {
this.getList(); if (data.status == 200) {
} this.getList()
}, this.$message({
enrollDialogEvent(e) { type: 'success',
this.enrollShow = false; message: '删除成功!'
}, })
reviewDialogEvent(e) { } else {
this.reviewShow = false; this.$message({
} type: 'error',
} message: data.message
}; })
}
})
})
},
getStatusName(status) {
return status + 1 ? this.statusNameList[status + 1] : ''
},
summitDialogEvent(e) {
this.popupShow = false
if (e) {
this.getList()
}
},
enrollDialogEvent(e) {
this.enrollShow = false
},
reviewDialogEvent(e) {
this.reviewShow = false
}
}
}
</script> </script>
src/views/summit/model/reviewPopup.vue
View file @ 1915df9b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
list-type="picture-card" list-type="picture-card"
:file-list="list" :file-list="list"
:on-success="handlePictureCardPreview" :on-success="handlePictureCardPreview"
:on-remove="handleRemove" :on-remove="handleRemoveZip"
:before-upload="beforeAvatarUpload" :before-upload="beforeAvatarUpload"
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
<video <!-- <video
v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag" v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag"
:src="form.videoPath" :src="form.videoPath"
style="width:300px;max-height:300px;" style="width:300px;max-height:300px;"
/> />-->
<!-- <i <!-- <i
v-else-if="!imgFlag" v-else-if="!imgFlag"
class="el-icon-plus avatar-uploader-icon" class="el-icon-plus avatar-uploader-icon"
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</el-col> </el-col>
<el-col> <el-col>
<el-form-item> <el-form-item>
<el-button class="button" type="primary" @click="cre">确 定</el-button>
<el-button class="button" @click="cancelHandel">取 消</el-button> <el-button class="button" @click="cancelHandel">取 消</el-button>
<!-- <el-button class="button" type="primary" @click="cre">确 定</el-button> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -117,12 +117,14 @@ export default { ...@@ -117,12 +117,14 @@ export default {
imgFlag: false, imgFlag: false,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
percent: 0, //上传进度 percent: 0, //上传进度
list: [], list: [], //压缩包
oldList: '',
oldVadio: '',
vadio: [], //视频
activeId: '', //峰会id
form: { form: {
id: undefined, id: undefined,
banner: undefined, banner: undefined,
activityId: undefined,
banner: undefined,
videoPath: undefined, videoPath: undefined,
picturePath: undefined picturePath: undefined
} }
...@@ -142,54 +144,82 @@ export default { ...@@ -142,54 +144,82 @@ export default {
return { Authorization: getToken() } return { Authorization: getToken() }
} }
}, },
watch: { // watch: {
dialogVisible(newValue, oldValue) { // dialogVisible(newValue, oldValue) {
if (!newValue) { // if (!newValue) {
this.$emit('summitDialogEvent', this.result) // this.$emit('summitDialogEvent', this.result)
} // }
} // }
}, // },
mounted() { mounted() {
this.getOrderInfo() this.getOrderInfo()
console.log(this.reviewRow)
}, },
methods: { methods: {
vidioSuccess(res) { vidioSuccess(res, file, fileList) {
console.log(res) if (res.status == 200) {
this.$notify({ this.$notify({
title: '成功', title: '提示',
message: res.message, message: res.message,
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.vadio = fileList
}
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const zip = file.type === 'application/zip' var index = file.name.lastIndexOf('.')
if (!zip) { var ext = file.name.substr(index + 1)
this.$message.error('上传头像图片只能是 zip 格式!') console.log(ext)
if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!')
return false
} }
return zip return true
}, },
videoUpload(file) { videoUpload(file) {
console.log(file.type)
const isJPG = file.type === 'video/mp4' const isJPG = file.type === 'video/mp4'
if (!isJPG) { if (!isJPG) {
this.$message.error('上传头像图片只能是 mp4 格式!') this.$message.error('上传压缩包只能是 mp4 格式!')
} }
return isJPG return isJPG
}, },
getOrderInfo() { getOrderInfo() {
console.log(this.reviewRow.id)
one(this.reviewRow.id).then(res => { one(this.reviewRow.id).then(res => {
this.form = res.data this.form = res.data
this.activeId = res.data.id //峰会id
this.oldList = res.data.picturePath || '' //压缩包
this.oldVadio = res.data.videoPath || '' //视频
this.dialogVisible = true this.dialogVisible = true
this.imgDialogVisible = true this.imgDialogVisible = true
}) })
}, },
cre() { cre() {
console.log(this.form.picturePath) let zipPic = []
save(this.form).then(res => { this.list.forEach(element => {
zipPic.push(element.url)
})
let mp4Vadio = []
this.vadio.forEach(element => {
mp4Vadio.push(element.response.data)
})
let params = {
id: this.activeId, //回顾id
banner: this.form.banner,
activityId: this.reviewRow.id, //峰会id
videoPath: this.oldVadio
? mp4Vadio == ''
? this.oldVadio
: mp4Vadio.join(',') + ',' + this.oldVadio
: mp4Vadio.join(','),
picturePath: this.oldList
? zipPic == ''
? this.oldList
: zipPic.join(',') + ',' + this.oldList
: zipPic.join(',')
}
save(params).then(res => {
this.responseResult(res) this.responseResult(res)
}) })
}, },
...@@ -242,20 +272,22 @@ export default { ...@@ -242,20 +272,22 @@ export default {
this.form.videoPath = file.data this.form.videoPath = file.data
this.imgDialogVisible = true this.imgDialogVisible = true
}, },
handleRemoveZip(file, fileList) {
this.list = fileList
},
handleRemove(file, fileList) { handleRemove(file, fileList) {
// console.log(file) this.vadio = fileList
console.log(file, fileList)
}, },
handlePictureCardPreview(res, file) { handlePictureCardPreview(res, file, fileList) {
this.$notify({ if (res.status == 200) {
title: '成功', this.$notify({
message: res.message, title: '提示',
type: 'success', message: '上传成功',
duration: 2000 type: 'success'
}) })
this.list.push({ url: res.data }) this.list = fileList
// this.imgDialogVisible = true; }
}, },
cleanForm() { cleanForm() {
this.form = { this.form = {
......
src/views/summit/model/summitPopup.vue
View file @ 1915df9b
<template> <template>
<el-dialog :title="title" :visible.sync="dialogVisible" class="order-details"> <el-dialog
:title="title"
:visible.sync="dialogVisible"
class="order-details"
:close-on-click-modal="false"
>
<div> <div>
<!-- <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="100px" class="demo-ruleForm"> --> <!-- <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="100px" class="demo-ruleForm"> -->
<el-form :model="form" ref="form" :rules="rules" label-width="120px"> <el-form :model="form" ref="form" :rules="rules" label-width="120px">
<div> <div>
<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">基础信息</p>
<div class="steLine"> <div class="steLine">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -77,11 +81,6 @@ ...@@ -77,11 +81,6 @@
<el-form-item style="display:inline-block;margin-left:-120px"> <el-form-item style="display:inline-block;margin-left:-120px">
<el-input class="content" v-model="form.latitude" placeholder="纬度" style="width:100px"></el-input> <el-input class="content" v-model="form.latitude" placeholder="纬度" style="width:100px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-col :span="6" class="content">
<el-form-item>
<el-input class="content" v-model="form.latitude" placeholder="纬度"></el-input>
</el-form-item>
</el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -93,7 +92,7 @@ ...@@ -93,7 +92,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9" v-if="form.state==='自定义'"> <el-col :span="9" v-if="form.state==='自定义'">
<el-radio-group v-model="form.status"> <el-radio-group v-model="statusRadio">
<el-radio class="status" :label="0">默认</el-radio> <el-radio class="status" :label="0">默认</el-radio>
<el-radio class="status" :label="1">报名中</el-radio> <el-radio class="status" :label="1">报名中</el-radio>
<el-radio class="status" :label="2">进行中</el-radio> <el-radio class="status" :label="2">进行中</el-radio>
...@@ -102,48 +101,54 @@ ...@@ -102,48 +101,54 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="活动id:"> <el-form-item label="活动id:">
<el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> <!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
<el-option
v-for="(item,index) in optionsId"
:key="index"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-tabs v-model="activeNameTab">
<el-tab-pane label="峰会主题" name="first">
<UE
:editorId="activeName"
:defaultMsg="form.content"
:config="config"
ref="ue"
@ready="editorReadyEvent"
></UE>
</el-tab-pane>
<el-tab-pane label="诚邀莅临" name="second">
<UE
:editorId="activeNameShare"
:defaultMsg="form.actDesc "
:config="config"
ref="ue"
@ready="editorReadyEventShare"
></UE>
</el-tab-pane>
<el-tab-pane label="公司简章" name="third">
<UE
:editorId="activeNameFirm"
:defaultMsg="form.companyDesc"
:config="config"
ref="ue"
@ready="editorReadyEventFirm"
></UE>
</el-tab-pane>
</el-tabs>
</div> </div>
</div> </div>
<div> <div>
<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">报名页面</p>
<div> <div>
<el-row>
<el-col>
<el-form-item label="峰会主题：">
<UE
:editorId="activeName"
:defaultMsg="form.content"
:config="config"
ref="ue"
@ready="editorReadyEvent"
></UE>
</el-form-item>
<el-form-item label="诚邀莅临：" prop="name">
<UE
:editorId="activeNameShare"
:defaultMsg="form.actDesc "
:config="config"
ref="ue"
@ready="editorReadyEventShare"
></UE>
</el-form-item>
<el-form-item label="公司简章：" prop="name">
<UE
:editorId="activeNameFirm"
:defaultMsg="form.companyDesc"
:config="config"
ref="ue"
@ready="editorReadyEventFirm"
></UE>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="房车介绍:"> <el-form-item label="房车介绍:">
...@@ -165,12 +170,15 @@ ...@@ -165,12 +170,15 @@
<el-form-item label="峰会流程:"> <el-form-item label="峰会流程:">
<el-row class="height" v-for="(item, index) in processJson" :key="index"> <el-row class="height" v-for="(item, index) in processJson" :key="index">
<el-col :span="6"> <el-col :span="6">
<el-date-picker <el-time-select
v-model="item.time" v-model="item.time"
type="datetime" :picker-options="{
format="yyyy-MM-dd HH:mm:ss" start: '06:00',
placeholder="请选择时间" step: '00:15',
></el-date-picker> end: '23:59'
}"
placeholder="选择/输入时间"
></el-time-select>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input> <el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input>
...@@ -213,7 +221,7 @@ import ElRow from 'element-ui/packages/row/src/row' ...@@ -213,7 +221,7 @@ import ElRow from 'element-ui/packages/row/src/row'
import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue' import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from 'element-ui/packages/col/src/col' import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue' import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import { getOne, update, add } from 'src/api/summit/activity' import { getOne, update, add, activityIds } from 'src/api/summit/activity'
import { getToken } from 'src/utils/auth' import { getToken } from 'src/utils/auth'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import UE from '../../modal/Ueditor' // 百度ue富文本 import UE from '../../modal/Ueditor' // 百度ue富文本
...@@ -230,6 +238,9 @@ export default { ...@@ -230,6 +238,9 @@ export default {
}, },
data() { data() {
return { return {
optionsId: [],
statusRadio: '0',
activeNameTab: 'first',
fileList2: [], fileList2: [],
config: { config: {
initialFrameWidth: null, initialFrameWidth: null,
...@@ -256,21 +267,30 @@ export default { ...@@ -256,21 +267,30 @@ export default {
longitude: undefined, longitude: undefined,
latitude: undefined, latitude: undefined,
state: '默认', state: '默认',
status: 0,
rid: undefined, rid: undefined,
content: '', // 峰会主题 content: '', // 峰会主题
contentFirm: '', contentFirm: '',
actDesc: '', // 诚邀莅临 actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章 companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍 vehicleImgs: [], // 房车介绍
processJson: []
}, },
result: false, result: false,
processJson: [] processJson: [{ time: undefined, content: '' }]
} }
}, },
mounted() { mounted() {
this.cleanForm() this.cleanForm()
this.getOrderInfo() this.getOrderInfo()
}, },
created() {
activityIds().then(data => {
if (data.status == 200) {
this.optionsId = data.data;
}
})
},
computed: { computed: {
...mapGetters(['elements']), ...mapGetters(['elements']),
...@@ -303,12 +323,13 @@ export default { ...@@ -303,12 +323,13 @@ export default {
getOne(this.popupRow.id).then(res => { getOne(this.popupRow.id).then(res => {
res.data.state = this.getState(res.data.status) res.data.state = this.getState(res.data.status)
this.form = res.data this.form = res.data
this.form.bmCloseTime = Number(res.data.bmCloseTime) this.form.bmCloseTime = Number(res.data.bmCloseTime)
let introduce = this.form.vehicleImgs.split(','); let introduce = this.form.vehicleImgs.split(',')
introduce.forEach(element => { this.statusRadio = res.data.status
this.fileList2.push({name:'峰会介绍',url:element}) introduce.forEach(element => {
}); this.fileList2.push({ name: '峰会介绍', url: element })
})
if (res.data.processJson) { if (res.data.processJson) {
this.processJson = JSON.parse(res.data.processJson) this.processJson = JSON.parse(res.data.processJson)
} }
...@@ -363,6 +384,7 @@ export default { ...@@ -363,6 +384,7 @@ export default {
}, },
getState(status) { getState(status) {
if (this.$utils.isInteger(status)) { if (this.$utils.isInteger(status)) {
console.log(status);
if (status == 0) { if (status == 0) {
return '默认' return '默认'
} else { } else {
...@@ -378,7 +400,7 @@ export default { ...@@ -378,7 +400,7 @@ export default {
}, },
addTag() { addTag() {
const t = { const t = {
time: undefined, time: null,
content: '' content: ''
} }
this.processJson.push(t) this.processJson.push(t)
...@@ -388,53 +410,114 @@ export default { ...@@ -388,53 +410,114 @@ export default {
* *
* */ * */
update1() { update1() {
this.dataProcessing() if (!this.form.title) {
update(this.form).then(res => { this.$notify({
this.responseResult(res) title: '失败',
}) message: '标题不能为空',
type: 'error',
duration: 2000
})
return false
} else if (!this.form.startTime) {
this.$notify({
title: '失败',
message: '开始时间不能为空',
type: 'error',
duration: 2000
})
} else if (!this.form.endTime) {
this.$notify({
title: '失败',
message: '结束时间不能为空',
type: 'error',
duration: 2000
})
} else if (!this.form.bmCloseTime) {
this.$notify({
title: '失败',
message: '报名截止时间不能为空',
type: 'error',
duration: 2000
})
} else {
typeof this.form.endTime == 'number'
? (this.form.endTime = this.form.endTime)
: (this.form.endTime = this.form.endTime.getTime())
typeof this.form.startTime == 'number'
? (this.form.startTime = this.form.startTime)
: (this.form.startTime = this.form.startTime.getTime())
typeof this.form.bmCloseTime == 'number'
? (this.form.bmCloseTime = this.form.bmCloseTime)
: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
let pic = []
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
this.form.vehicleImgs = pic.join(',')
}
this.form.processJson = this.processJson
update(this.form).then(res => {
this.responseResult(res)
})
this.dataProcessing()
}
}, },
create(formName) { create() {
if ( if (!this.form.title) {
!this.form.title ||
!this.form.startTime ||
!this.form.endTime
) {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: '必填项不能为空', message: '标题不能为空',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}) })
return false return false
} else if (!this.form.startTime) {
this.$notify({
title: '失败',
message: '开始时间不能为空',
type: 'error',
duration: 2000
})
} else if (!this.form.endTime) {
this.$notify({
title: '失败',
message: '结束时间不能为空',
type: 'error',
duration: 2000
})
} else if (!this.form.bmCloseTime) {
this.$notify({
title: '失败',
message: '报名截止时间不能为空',
type: 'error',
duration: 2000
})
} else { } else {
// this.form.processJson = this.processJson
this.form.endTime = this.form.endTime.getTime() this.form.endTime = this.form.endTime.getTime()
this.form.startTime = this.form.startTime.getTime() this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime() this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = [] let pic = []
this.form.vehicleImgs.forEach(element => { if (!!this.form.vehicleImgs) {
pic.push(element.url) this.form.vehicleImgs.forEach(element => {
}) pic.push(element.url)
this.form.vehicleImgs = pic.join(',')
let demo = []
this.processJson.forEach(element => {
demo.push({
time:
formatDate(element.time, 'yyyy-MM-dd hh') +
':00:00',
content: element.content
}) })
}) this.form.vehicleImgs = pic.join(',')
this.form.processJson = demo }
this.dataProcessing()
add(this.form).then(res => { add(this.form).then(res => {
this.responseResult(res) this.responseResult(res)
}) })
this.dataProcessing()
} }
}, },
dataProcessing() { dataProcessing() {
if (this.form.state === '默认') { if (this.form.state === '默认') {
this.form.status = 0 this.form.status = '0'
}else{
this.form.status = this.statusRadio
} }
this.form.processJson = JSON.stringify(this.processJson) this.form.processJson = JSON.stringify(this.processJson)
}, },
...@@ -489,7 +572,8 @@ export default { ...@@ -489,7 +572,8 @@ export default {
contentFirm: '', contentFirm: '',
actDesc: '', // 诚邀莅临 actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章 companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍 vehicleImgs: [], // 房车介绍
processJson: []
} }
} }
} }
......
src/views/userManagement/memberManagement/index.vue
View file @ 1915df9b
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
<img class="image" :src="scope.row.bigIcon" /> <img class="image" :src="scope.row.bigIcon" />
</span> </span>
</template> </template>
</el-table-column>
<el-table-column align="center" label="商品图片">
<template scope="scope">
<span>
<img class="image" :src="scope.row.itemImg" />
</span>
</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="折扣"> <el-table-column align="center" label="折扣">
<template scope="scope"> <template scope="scope">
...@@ -210,6 +217,29 @@ ...@@ -210,6 +217,29 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row>
<el-form-item label="商品图片" :style="{display:'block'}">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:on-success="product"
list-type="picture"
>
<img
v-if="$utils.isString(add.itemImg) && !$utils.isEmpty(add.itemImg)"
:src="add.itemImg"
style="width:300px;max-height:300px;"
/>
<i
v-else
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>
</el-upload>
</el-form-item>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelSetMemberArea('membershipGrade')">取消</el-button> <el-button @click="cancelSetMemberArea('membershipGrade')">取消</el-button>
...@@ -250,7 +280,8 @@ export default { ...@@ -250,7 +280,8 @@ export default {
price: undefined, price: undefined,
endDate: undefined, endDate: undefined,
icon: undefined, icon: undefined,
bigIcon: null bigIcon: null,
itemImg:null
}, },
endDatelist: [ endDatelist: [
{ id: 0, name: "永久" }, { id: 0, name: "永久" },
...@@ -336,7 +367,8 @@ export default { ...@@ -336,7 +367,8 @@ export default {
price: row.price, price: row.price,
endDate: row.endDate, endDate: row.endDate,
icon: row.icon, icon: row.icon,
bigIcon: row.bigIcon bigIcon: row.bigIcon,
itemImg:row.itemImg
}; };
this.activeId = row.id this.activeId = row.id
}, },
...@@ -445,6 +477,10 @@ export default { ...@@ -445,6 +477,10 @@ export default {
//大图标 //大图标
handleAvatarSuccessBig(res) { handleAvatarSuccessBig(res) {
this.add.bigIcon = res.data; this.add.bigIcon = res.data;
},
//商品展示
product(res) {
this.add.itemImg = res.data;
} }
} }
}; };
......
src/views/vehicle/bookRecord/index.vue
View file @ 1915df9b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/vehicle/vehicleInfo/index.vue
View file @ 1915df9b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-form-item label="车辆状态"> <el-form-item label="车辆状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllVehicleStatus() " :key="val.code" :label="val.val" <el-option v-for="(val,index) in getAllVehicleStatus() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<el-form-item label="保险公司" prop="insuranceCompany"> <el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司"> <el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllInsuranceCompany() " :key="val.code" :label="val.val" <el-option v-for="(val, index ) in getAllInsuranceCompany() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
<!-- 对话框相关html元素 --> <!-- 对话框相关html元素 -->
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close='closePop'>
<el-form :model="form" :rules="rules" ref="form" label-width="90px"> <el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-row> <el-row>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆状态" prop="status"> <el-form-item label="车辆状态" prop="status">
<el-select class="filter-item" v-model="form.status" placeholder="请选择车辆状态"> <el-select class="filter-item" v-model="form.status" placeholder="请选择车辆状态">
<el-option v-for="(val, key, index) in getAllVehicleStatus() " :key="val.code" :label="val.val" <el-option v-for="(val,index ) in getAllVehicleStatus() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属人"> <el-form-item label="所属人">
<el-select v-model.number="form.belongTo" placeholder="请选择所属人"> <el-select v-model.number="form.belongTo" placeholder="请选择所属人">
<el-option v-for="(val, key, index) in getAllBelong2Type() " :key="val.code" :label="val.val" <el-option v-for="(val,index ) in getAllBelong2Type() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
<el-input v-if="typeof(form.belongTo) !== 'undefined' && form.belongTo != 1" v-model="form.belongToName" <el-input v-if="typeof(form.belongTo) !== 'undefined' && form.belongTo != 1" v-model="form.belongToName"
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
<el-form-item label="保险公司" prop="insuranceCompany"> <el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="form.insuranceCompany" placeholder="请选择保险公司"> <el-select class="filter-item" v-model="form.insuranceCompany" placeholder="请选择保险公司">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in getAllInsuranceCompany() " :key="val.code" :label="val.val" <el-option v-for="(val, index) in getAllInsuranceCompany() " :key="index" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -638,7 +638,7 @@ ...@@ -638,7 +638,7 @@
<el-form-item label="用途" prop="bookType"> <el-form-item label="用途" prop="bookType">
<el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途"> <el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途">
<el-option :key="undefined" label="" :value="undefined"></el-option> <el-option :key="undefined" label="" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in book_type_list " :key="val.id" :label="val.name" <el-option v-for="(val, index) in book_type_list " :key="index" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -895,6 +895,7 @@ ...@@ -895,6 +895,7 @@
} }
//检验code码 //检验code码
checkCode(value, this.form.id).then(response => { checkCode(value, this.form.id).then(response => {
// console.log(response.data);
if (response.data === true) { if (response.data === true) {
return callback(new Error("该车辆编码已经被占用，请重新输入")); return callback(new Error("该车辆编码已经被占用，请重新输入"));
} else { } else {
...@@ -911,17 +912,18 @@ ...@@ -911,17 +912,18 @@
min: 0, min: 0,
max: 200, max: 200,
message: '长度小于 200 个字符', message: '长度小于 200 个字符',
trigger: 'blur' trigger: 'blur',
}
],
numberPlate: [
{
min: 0,
max: 20,
message: '长度小于 20 个字符',
trigger: 'blur'
} }
], ],
numberPlate: [
{
min: 0,
max: 20,
trigger: 'blur',
message: '车牌不能为空且长度小于20个字符',
required: true
}
],
remark: [ remark: [
{ {
min: 0, min: 0,
...@@ -1241,7 +1243,8 @@ ...@@ -1241,7 +1243,8 @@
return getSonRegionByCodes(this.listQuery.addrProvince); return getSonRegionByCodes(this.listQuery.addrProvince);
}, },
getAllZoneList() { getAllZoneList() {
this.allZoneArr = getAllZone(); let that = this;
that.allZoneArr = getAllZone();
return getAllZone(); return getAllZone();
}, },
townRegions4Query() { townRegions4Query() {
...@@ -1455,11 +1458,11 @@ ...@@ -1455,11 +1458,11 @@
}, },
queryVehicleModelSearch(queryString, cb) { queryVehicleModelSearch(queryString, cb) {
let selectArry = []; let selectArry = [];
let iitem = { // let iitem = {
value: "全部", // value: "全部",
name: "全部" // name: "全部"
}; // };
selectArry.push(iitem); // selectArry.push(iitem);
this.allVehicleList.map(function (item) { this.allVehicleList.map(function (item) {
item.value = item.name; item.value = item.name;
selectArry.push(item); selectArry.push(item);
...@@ -2027,6 +2030,10 @@ ...@@ -2027,6 +2030,10 @@
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.dialogForm4ApplyVisible = false; this.dialogForm4ApplyVisible = false;
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
// this.listQuery.code = ''
},
closePop(formName){
this.$refs.form.resetFields();
}, },
cancel4Apply(formName) { cancel4Apply(formName) {
this.dialogForm4ApplyVisible = false; this.dialogForm4ApplyVisible = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment