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
Expand all Show 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/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">
...@@ -8,7 +9,7 @@ ...@@ -8,7 +9,7 @@
<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"
...@@ -31,14 +32,7 @@ ...@@ -31,14 +32,7 @@
</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"
border
fit
highlight-current-row
style="width: 100%"
v-loading="loading"
>
<el-table-column align="center" label="时间"> <el-table-column align="center" label="时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.timeSlot}}</span> <span>{{scope.row.timeSlot}}</span>
...@@ -80,119 +74,145 @@ ...@@ -80,119 +74,145 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
style="margin-top:20px"
></el-pagination>
</div> </div>
</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,
total: null,
list: [], list: [],
// 统计时间筛选 // 统计时间筛选
listQuery: { listQuery: {
time: "null", time: 'null',
type: "1", type: '1',
startTime: null, startTime: null,
endTime: null endTime: null,
time: '',
limit: 10,
page: 1
}, },
//统计方式筛选 //统计方式筛选
way: [ way: [
{ {
label: "日统计", label: '日统计',
id: "1" id: '1'
}, },
{ {
label: "周统计", label: '周统计',
id: "2" id: '2'
}, },
{ {
label: "月统计", label: '月统计',
id: "3" id: '3'
} }
], ],
isactive: "日统计" isactive: '日统计'
}; }
}, },
methods: { methods: {
//统计时间筛选 //统计时间筛选
changeTime() { changeTime() {
!!this.listQuery.time[0] !!this.listQuery.time[0]
? (this.listQuery.startTime = this.listQuery.time[0].getTime()) ? (this.listQuery.startTime = this.listQuery.time[0].getTime())
: (this.listQuery.startTime = null); : (this.listQuery.startTime = null)
!!this.listQuery.time[1] !!this.listQuery.time[1]
? (this.listQuery.endTime = this.listQuery.time[1].getTime()) ? (this.listQuery.endTime = this.listQuery.time[1].getTime())
: (this.listQuery.endTime = null); : (this.listQuery.endTime = null)
this.getList(); this.getList()
}, },
//统计方式筛选 //统计方式筛选
changeWay(val) { changeWay(val) {
this.isactive = val.label; this.isactive = val.label
this.listQuery.type = val.id; this.listQuery.type = val.id
this.getList(); this.getList()
}, },
//导出 //导出
handleFilter() { handleFilter() {
downloadExcel(this.listQuery).then(res => { downloadExcel(this.listQuery).then(res => {
const content = res; const content = res
const blob = new Blob([content]); const blob = new Blob([content])
const fileName = "导出信息.xlsx"; const fileName = '导出信息.xlsx'
if ("download" in document.createElement("a")) { if ('download' in document.createElement('a')) {
// 非IE下载 // 非IE下载
const elink = document.createElement("a"); const elink = document.createElement('a')
elink.download = fileName; elink.download = fileName
elink.style.display = "none"; elink.style.display = 'none'
elink.href = URL.createObjectURL(blob); elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink); document.body.appendChild(elink)
elink.click(); elink.click()
URL.revokeObjectURL(elink.href); // 释放URL 对象 URL.revokeObjectURL(elink.href) // 释放URL 对象
document.body.removeChild(elink); document.body.removeChild(elink)
} else { } else {
// IE10+下载 // IE10+下载
navigator.msSaveBlob(blob, fileName); navigator.msSaveBlob(blob, fileName)
} }
}); })
},
handleSizeChange(val) {
this.listQuery.limit = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.page = val
this.getList()
}, },
//列表 //列表
getList() { getList() {
let params = {}; let params = {}
this.loading = true; this.loading = true
orderStatistics(this.listQuery).then(data => { orderStatistics(this.listQuery).then(data => {
console.log(data);
if (data.status == 200) { if (data.status == 200) {
data.data.forEach(element => { data.data.list.forEach(element => {
for (let i in element.members) { for (let i in element.members) {
if (element.members[i].level == 1) { if (element.members[i].level == 1) {
element.pAmount = element.members[i].amount; element.pAmount = element.members[i].amount
element.plevel = element.members[i].level; element.plevel = element.members[i].level
element.pMemberName = element.members[i].memberName; element.pMemberName =
element.pNumber = element.members[i].number; element.members[i].memberName
element.pNumber = element.members[i].number
} else if (element.members[i].level == 2) { } else if (element.members[i].level == 2) {
element.goldAmount = element.members[i].amount; element.goldAmount = element.members[i].amount
element.goldlevel = element.members[i].level; element.goldlevel = element.members[i].level
element.goldMemberName = element.members[i].memberName; element.goldMemberName =
element.goldNumber = element.members[i].number; element.members[i].memberName
element.goldNumber = element.members[i].number
} else if (element.members[i].level == 3) { } else if (element.members[i].level == 3) {
element.hAmount = element.members[i].amount; element.hAmount = element.members[i].amount
element.hlevel = element.members[i].level; element.hlevel = element.members[i].level
element.hMemberName = element.members[i].memberName; element.hMemberName =
element.hNumber = element.members[i].number; element.members[i].memberName
element.hNumber = element.members[i].number
} }
} }
}); })
this.list = data.data; this.total = data.data.total;
this.list = data.data.list
} }
setTimeout(() => { setTimeout(() => {
this.loading = false; this.loading = false
}, 300); }, 300)
}); })
} }
} }
}; }
</script> </script>
<style> <style>
.wayMsg span { .wayMsg span {
......
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
...@@ -15,14 +15,9 @@ ...@@ -15,14 +15,9 @@
@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"
:key="index"
:label="val.name"
:value="val.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -84,7 +79,7 @@ ...@@ -84,7 +79,7 @@
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"
...@@ -128,44 +123,40 @@ ...@@ -128,44 +123,40 @@
: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
}, },
...@@ -173,15 +164,15 @@ export default { ...@@ -173,15 +164,15 @@ 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: '已结束' }
], ],
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,
...@@ -189,21 +180,21 @@ export default { ...@@ -189,21 +180,21 @@ export default {
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: {
...@@ -212,85 +203,106 @@ export default { ...@@ -212,85 +203,106 @@ export default {
// 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(row) {
this.$confirm('此操作将删除该峰会, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
remove(row.id).then(data => {
if (data.status == 200) {
this.getList()
this.$message({
type: 'success',
message: '删除成功!'
})
} else {
this.$message({
type: 'error',
message: data.message
})
}
})
})
}, },
deleteSummit() {},
getStatusName(status) { getStatusName(status) {
return status + 1 ? this.statusNameList[status + 1] : ""; return status + 1 ? this.statusNameList[status + 1] : ''
}, },
summitDialogEvent(e) { summitDialogEvent(e) {
this.popupShow = false; this.popupShow = false
if (e) { if (e) {
this.getList(); this.getList()
} }
}, },
enrollDialogEvent(e) { enrollDialogEvent(e) {
this.enrollShow = false; this.enrollShow = false
}, },
reviewDialogEvent(e) { reviewDialogEvent(e) {
this.reviewShow = false; 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) {
if (res.status == 200) {
this.$notify({ this.$notify({
title: '成功', title: '提示',
message: res.message, message: '上传成功',
type: 'success', type: 'success'
duration: 2000
}) })
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
This diff is collapsed.
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 diff is collapsed.
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,15 +912,16 @@ ...@@ -911,15 +912,16 @@
min: 0, min: 0,
max: 200, max: 200,
message: '长度小于 200 个字符', message: '长度小于 200 个字符',
trigger: 'blur' trigger: 'blur',
} }
], ],
numberPlate: [ numberPlate: [
{ {
min: 0, min: 0,
max: 20, max: 20,
message: '长度小于 20 个字符', trigger: 'blur',
trigger: 'blur' message: '车牌不能为空且长度小于20个字符',
required: true
} }
], ],
remark: [ remark: [
...@@ -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