Skip to content

C
cloud-platform-ui
Commit 850c58f9 authored by jiaorz's avatar jiaorz
Browse files
Options

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

parents 3c4f23bf 1549e381
Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 303 deletions
config/dev.env.js
View file @ 850c58f9
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/summit/activity.js
View file @ 850c58f9
...@@ -32,3 +32,10 @@ export function add(obj) { ...@@ -32,3 +32,10 @@ export function add(obj) {
data:obj data:obj
}) })
} }
export function activityIds() {
return fetch({
url: '/api/summit/imxr/ids',
method: 'get'
})
}
\ No newline at end of file
src/views/order/modal/rentOrderDetailModal.vue
View file @ 850c58f9
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="还车公司:"> <el-form-item label="还车公司:">
<span>{{form.endCompanyName}}</span> <span>{{form.endCompanyName}}</span>
<el-button size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button> <el-button v-show="form.status == 4 || form.status == 5" size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -205,7 +205,6 @@ export default { ...@@ -205,7 +205,6 @@ export default {
}, },
mounted() { mounted() {
console.log(this.form) console.log(this.form)
this.dialogVisible = true this.dialogVisible = true
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = '取消' this.form.ststusName = '取消'
...@@ -246,24 +245,25 @@ export default { ...@@ -246,24 +245,25 @@ export default {
} else { } else {
this.returnForm.id = this.form.detailId this.returnForm.id = this.form.detailId
updateEndCompany(this.returnForm).then(data => { updateEndCompany(this.returnForm).then(data => {
console.log(data.status);
if (data.status == 200) { if (data.status == 200) {
this.$notify({ this.$notify({
title: '成功', title: '成功',
message: '修改还车地点成功', message: '修改还车地点成功',
type: 'success', type: 'success',
duration: 3000 duration: 3000
}) })
this.resetReturn = false this.resetReturn = false;
}else{ this.dialogVisible = false;
this.$notify({ this.$emit('rentOrderDetailDialogEvent', true)
} else {
this.$notify({
title: '失败', title: '失败',
message: data.message, message: data.message,
type: 'error', type: 'error',
duration:3000 duration: 3000
}) })
} }
}) })
} }
}, },
......
src/views/order/orderStatistics/index.vue
View file @ 850c58f9
<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 @ 850c58f9
...@@ -775,7 +775,7 @@ export default { ...@@ -775,7 +775,7 @@ export default {
illegalEvent(params) { illegalEvent(params) {
this.illegalVisible = false; this.illegalVisible = false;
if (params) { if (params) {
console.log(params); // console.log(params);
} }
}, },
/** /**
...@@ -784,11 +784,11 @@ export default { ...@@ -784,11 +784,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) {
...@@ -837,7 +837,7 @@ export default { ...@@ -837,7 +837,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 {
...@@ -851,7 +851,7 @@ export default { ...@@ -851,7 +851,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) {
...@@ -899,7 +899,7 @@ export default { ...@@ -899,7 +899,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 = [];
...@@ -947,7 +947,7 @@ export default { ...@@ -947,7 +947,7 @@ export default {
} }
that.depositRefundRecord = arr; that.depositRefundRecord = arr;
console.log(that.depositRefundRecord); // console.log(that.depositRefundRecord);
} }
}); });
}); });
...@@ -1068,7 +1068,7 @@ export default { ...@@ -1068,7 +1068,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 = "取消";
} }
...@@ -1106,6 +1106,7 @@ export default { ...@@ -1106,6 +1106,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 @ 850c58f9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
@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" v-for="(val,index) in status"
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
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: "已结束" }
...@@ -274,6 +274,7 @@ export default { ...@@ -274,6 +274,7 @@ export default {
review(row) { review(row) {
this.reviewRow = row; this.reviewRow = row;
this.reviewShow = true; this.reviewShow = true;
console.log(this.reviewRow);
}, },
deleteSummit() {}, deleteSummit() {},
getStatusName(status) { getStatusName(status) {
......
src/views/summit/model/reviewPopup.vue
View file @ 850c58f9
...@@ -142,32 +142,31 @@ export default { ...@@ -142,32 +142,31 @@ 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()
}, },
methods: { methods: {
vidioSuccess(res) { vidioSuccess(res) {
console.log(res)
this.$notify({ this.$notify({
title: '成功', title: '提示',
message: res.message, message: res.message,
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const zip = file.type === 'application/zip' // const zip = file.type === 'application/zip'
if (!zip) { // if (!zip) {
this.$message.error('上传头像图片只能是 zip 格式!') // this.$message.error('上传头像图片只能是 zip 格式!')
} // }
return zip // return zip
}, },
videoUpload(file) { videoUpload(file) {
console.log(file.type) console.log(file.type)
...@@ -249,7 +248,7 @@ export default { ...@@ -249,7 +248,7 @@ export default {
handlePictureCardPreview(res, file) { handlePictureCardPreview(res, file) {
this.$notify({ this.$notify({
title: '成功', title: '提示',
message: res.message, message: res.message,
type: 'success', type: 'success',
duration: 2000 duration: 2000
......
src/views/summit/model/summitPopup.vue
View file @ 850c58f9
<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,6 @@ ...@@ -165,12 +170,6 @@
<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
v-model="item.time"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择时间"
></el-date-picker>-->
<el-time-select <el-time-select
v-model="item.time" v-model="item.time"
:picker-options="{ :picker-options="{
...@@ -222,7 +221,7 @@ import ElRow from 'element-ui/packages/row/src/row' ...@@ -222,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富文本
...@@ -239,6 +238,9 @@ export default { ...@@ -239,6 +238,9 @@ export default {
}, },
data() { data() {
return { return {
optionsId: [],
statusRadio: '0',
activeNameTab: 'first',
fileList2: [], fileList2: [],
config: { config: {
initialFrameWidth: null, initialFrameWidth: null,
...@@ -271,16 +273,24 @@ export default { ...@@ -271,16 +273,24 @@ export default {
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']),
...@@ -316,6 +326,7 @@ export default { ...@@ -316,6 +326,7 @@ export default {
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(',')
this.statusRadio = res.data.status
introduce.forEach(element => { introduce.forEach(element => {
this.fileList2.push({ name: '峰会介绍', url: element }) this.fileList2.push({ name: '峰会介绍', url: element })
}) })
...@@ -373,6 +384,7 @@ export default { ...@@ -373,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 {
...@@ -428,9 +440,15 @@ export default { ...@@ -428,9 +440,15 @@ export default {
duration: 2000 duration: 2000
}) })
} else { } else {
typeof(this.form.endTime) == 'number' ? this.form.endTime = this.form.endTime : this.form.endTime = this.form.endTime.getTime(); typeof this.form.endTime == 'number'
typeof(this.form.startTime) == 'number' ? this.form.startTime = this.form.startTime : this.form.startTime = this.form.startTime.getTime(); ? (this.form.endTime = this.form.endTime)
typeof(this.form.bmCloseTime) == 'number' ? this.form.bmCloseTime = this.form.bmCloseTime : this.form.bmCloseTime = this.form.bmCloseTime.getTime(); : (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 = [] let pic = []
if (!!this.form.vehicleImgs) { if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => { this.form.vehicleImgs.forEach(element => {
...@@ -478,6 +496,7 @@ export default { ...@@ -478,6 +496,7 @@ export default {
duration: 2000 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()
...@@ -488,18 +507,17 @@ export default { ...@@ -488,18 +507,17 @@ export default {
}) })
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
this.dataProcessing()
this.form.processJson = this.processJson
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)
}, },
...@@ -554,7 +572,8 @@ export default { ...@@ -554,7 +572,8 @@ export default {
contentFirm: '', contentFirm: '',
actDesc: '', // 诚邀莅临 actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章 companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍 vehicleImgs: [], // 房车介绍
processJson: []
} }
} }
} }
......
src/views/userManagement/memberManagement/index.vue
View file @ 850c58f9
...@@ -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 @ 850c58f9
...@@ -415,6 +415,7 @@ ...@@ -415,6 +415,7 @@
type="primary" type="primary"
style="padding: 7px 9px;" style="padding: 7px 9px;"
@click="resetReturn = true" @click="resetReturn = true"
v-show="detailItem.status == 2 || detailItem.status == 5"
>更换</el-button> >更换</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1113,8 +1114,10 @@ export default { ...@@ -1113,8 +1114,10 @@ export default {
message: '修改还车地点成功', message: '修改还车地点成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.resetReturn = false this.resetReturn = false;
this.dialogDetailVisible = false;
this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 850c58f9
...@@ -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>
...@@ -894,7 +894,8 @@ ...@@ -894,7 +894,8 @@
return callback(new Error('编码合法范围：[1 - 9999999999]')); return callback(new Error('编码合法范围：[1 - 9999999999]'));
} }
//检验code码 //检验code码
checkCode(value, this.form.code).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 {
...@@ -2029,6 +2030,10 @@ ...@@ -2029,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