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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 303 deletions
config/dev.env.js
View file @ 850c58f9
module.exports = {
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"'
}
src/api/summit/activity.js
View file @ 850c58f9
......@@ -32,3 +32,10 @@ export function add(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 @@
<el-col :span="8">
<el-form-item label="还车公司:">
<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-col>
</el-row>
......@@ -205,7 +205,6 @@ export default {
},
mounted() {
console.log(this.form)
this.dialogVisible = true
if (this.form.status == 2) {
this.form.ststusName = '取消'
......@@ -246,24 +245,25 @@ export default {
} else {
this.returnForm.id = this.form.detailId
updateEndCompany(this.returnForm).then(data => {
console.log(data.status);
if (data.status == 200) {
this.$notify({
title: '成功',
message: '修改还车地点成功',
type: 'success',
duration: 3000
})
this.resetReturn = false
}else{
this.$notify({
})
this.resetReturn = false;
this.dialogVisible = false;
this.$emit('rentOrderDetailDialogEvent', true)
} else {
this.$notify({
title: '失败',
message: data.message,
type: 'error',
duration:3000
duration: 3000
})
}
}
})
}
},
......
src/views/order/orderStatistics/index.vue
View file @ 850c58f9
This diff is collapsed.
src/views/order/rentVehicleInfo/index.vue
View file @ 850c58f9
......@@ -775,7 +775,7 @@ export default {
illegalEvent(params) {
this.illegalVisible = false;
if (params) {
console.log(params);
// console.log(params);
}
},
/**
......@@ -784,11 +784,11 @@ export default {
detailEvent(params) {
this.detailVisible = false;
if (params) {
console.log(params);
// console.log(params);
}
},
handleHandoverOrderVehicle(row) {
console.log(row);
// console.log(row);
this.modalTitle = "交车记录";
this.form = row;
if (this.form.status == 2) {
......@@ -837,7 +837,7 @@ export default {
},
getAllOrderVehicleCrosstown() {
getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => {
console.log(response);
// console.log(response);
if (response.data.length <= 0) {
alert("交还车记录不存在");
} else {
......@@ -851,7 +851,7 @@ export default {
},
handleReturnOrderVehicle(row) {
console.log(row);
// console.log(row);
this.modalTitle = "还车记录";
this.form = row;
if (this.form.status == 2) {
......@@ -899,7 +899,7 @@ export default {
this.depositDetail = false;
},
handleRefundVehicle(row) {
console.log(row);
// console.log(row);
var that = this;
that.pictureList = [];
that.dedDetail = [];
......@@ -947,7 +947,7 @@ export default {
}
that.depositRefundRecord = arr;
console.log(that.depositRefundRecord);
// console.log(that.depositRefundRecord);
}
});
});
......@@ -1068,7 +1068,7 @@ export default {
page(this.listQuery).then(response => {
if (response.data.data) {
response.data.data.map(function(el) {
console.log(el);
// console.log(el);
if (el.status == 2) {
el.ststusName = "取消";
}
......@@ -1106,6 +1106,7 @@ export default {
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
},
templateModel() {
this.costDetail = {
......
src/views/summit/index.vue
View file @ 850c58f9
......@@ -15,7 +15,7 @@
@change="changeTime"
></el-date-picker>
</el-form-item>
<el-form-item label="用户来源">
<el-form-item label="峰会状态">
<el-select class="filter-item" v-model="query.status" placeholder="状态">
<el-option
v-for="(val,index) in status"
......@@ -173,7 +173,7 @@ export default {
list: [],
listLoading: true,
status: [
{ id: 0, name: "默认" },
{ id: 0, name: "全部" },
{ id: 1, name: "报名中" },
{ id: 2, name: "进行中" },
{ id: 3, name: "已结束" }
......@@ -274,6 +274,7 @@ export default {
review(row) {
this.reviewRow = row;
this.reviewShow = true;
console.log(this.reviewRow);
},
deleteSummit() {},
getStatusName(status) {
......
src/views/summit/model/reviewPopup.vue
View file @ 850c58f9
......@@ -142,32 +142,31 @@ export default {
return { Authorization: getToken() }
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit('summitDialogEvent', this.result)
}
}
},
// watch: {
// dialogVisible(newValue, oldValue) {
// if (!newValue) {
// this.$emit('summitDialogEvent', this.result)
// }
// }
// },
mounted() {
this.getOrderInfo()
},
methods: {
vidioSuccess(res) {
console.log(res)
this.$notify({
title: '成功',
title: '提示',
message: res.message,
type: 'success',
duration: 2000
})
},
beforeAvatarUpload(file) {
const zip = file.type === 'application/zip'
if (!zip) {
this.$message.error('上传头像图片只能是 zip 格式!')
}
return zip
// const zip = file.type === 'application/zip'
// if (!zip) {
// this.$message.error('上传头像图片只能是 zip 格式!')
// }
// return zip
},
videoUpload(file) {
console.log(file.type)
......@@ -249,7 +248,7 @@ export default {
handlePictureCardPreview(res, file) {
this.$notify({
title: '成功',
title: '提示',
message: res.message,
type: 'success',
duration: 2000
......
src/views/summit/model/summitPopup.vue
View file @ 850c58f9
<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>
<!-- <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">
<div>
<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">基础信息</p>
<div class="steLine">
<el-row>
<el-col :span="12">
......@@ -77,11 +81,6 @@
<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-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-col :span="8">
......@@ -93,7 +92,7 @@
</el-form-item>
</el-col>
<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="1">报名中</el-radio>
<el-radio class="status" :label="2">进行中</el-radio>
......@@ -102,48 +101,54 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<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-col>
</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>
<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">报名页面</p>
<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-col>
<el-form-item label="房车介绍:">
......@@ -165,12 +170,6 @@
<el-form-item label="峰会流程:">
<el-row class="height" v-for="(item, index) in processJson" :key="index">
<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
v-model="item.time"
:picker-options="{
......@@ -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 ElCol from 'element-ui/packages/col/src/col'
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 { mapGetters } from 'vuex'
import UE from '../../modal/Ueditor' // 百度ue富文本
......@@ -239,6 +238,9 @@ export default {
},
data() {
return {
optionsId: [],
statusRadio: '0',
activeNameTab: 'first',
fileList2: [],
config: {
initialFrameWidth: null,
......@@ -271,16 +273,24 @@ export default {
contentFirm: '',
actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍
vehicleImgs: [], // 房车介绍
processJson: []
},
result: false,
processJson: []
processJson: [{ time: undefined, content: '' }]
}
},
mounted() {
this.cleanForm()
this.getOrderInfo()
},
created() {
activityIds().then(data => {
if (data.status == 200) {
this.optionsId = data.data;
}
})
},
computed: {
...mapGetters(['elements']),
......@@ -316,6 +326,7 @@ export default {
this.form = res.data
this.form.bmCloseTime = Number(res.data.bmCloseTime)
let introduce = this.form.vehicleImgs.split(',')
this.statusRadio = res.data.status
introduce.forEach(element => {
this.fileList2.push({ name: '峰会介绍', url: element })
})
......@@ -373,6 +384,7 @@ export default {
},
getState(status) {
if (this.$utils.isInteger(status)) {
console.log(status);
if (status == 0) {
return '默认'
} else {
......@@ -428,9 +440,15 @@ export default {
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();
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 => {
......@@ -478,6 +496,7 @@ export default {
duration: 2000
})
} else {
// this.form.processJson = this.processJson
this.form.endTime = this.form.endTime.getTime()
this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime()
......@@ -488,18 +507,17 @@ export default {
})
this.form.vehicleImgs = pic.join(',')
}
this.form.processJson = this.processJson
this.dataProcessing()
add(this.form).then(res => {
this.responseResult(res)
})
this.dataProcessing()
}
},
dataProcessing() {
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)
},
......@@ -554,7 +572,8 @@ export default {
contentFirm: '',
actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍
vehicleImgs: [], // 房车介绍
processJson: []
}
}
}
......
src/views/userManagement/memberManagement/index.vue
View file @ 850c58f9
......@@ -42,6 +42,13 @@
<img class="image" :src="scope.row.bigIcon" />
</span>
</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 align="center" label="折扣">
<template scope="scope">
......@@ -210,6 +217,29 @@
</el-upload>
</el-form-item>
</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>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSetMemberArea('membershipGrade')">取消</el-button>
......@@ -250,7 +280,8 @@ export default {
price: undefined,
endDate: undefined,
icon: undefined,
bigIcon: null
bigIcon: null,
itemImg:null
},
endDatelist: [
{ id: 0, name: "永久" },
......@@ -336,7 +367,8 @@ export default {
price: row.price,
endDate: row.endDate,
icon: row.icon,
bigIcon: row.bigIcon
bigIcon: row.bigIcon,
itemImg:row.itemImg
};
this.activeId = row.id
},
......@@ -445,6 +477,10 @@ export default {
//大图标
handleAvatarSuccessBig(res) {
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 @@
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
v-show="detailItem.status == 2 || detailItem.status == 5"
>更换</el-button>
</el-form-item>
</el-col>
......@@ -1113,8 +1114,10 @@ export default {
message: '修改还车地点成功',
type: 'success',
duration: 2000
})
this.resetReturn = false
})
this.resetReturn = false;
this.dialogDetailVisible = false;
this.getList();
} else {
this.$notify({
title: '失败',
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 850c58f9
......@@ -17,7 +17,7 @@
<el-form-item label="车辆状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in 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>
</el-select>
</el-form-item>
......@@ -92,7 +92,7 @@
<el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司">
<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>
</el-select>
</el-form-item>
......@@ -345,7 +345,7 @@
<!-- 对话框相关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-row>
......@@ -369,7 +369,7 @@
<el-col :span="12">
<el-form-item label="车辆状态" prop="status">
<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>
</el-select>
</el-form-item>
......@@ -396,7 +396,7 @@
<el-col :span="12">
<el-form-item label="所属人">
<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>
</el-select>
<el-input v-if="typeof(form.belongTo) !== 'undefined' && form.belongTo != 1" v-model="form.belongToName"
......@@ -409,7 +409,7 @@
<el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="form.insuranceCompany" placeholder="请选择保险公司">
<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>
</el-select>
</el-form-item>
......@@ -638,7 +638,7 @@
<el-form-item label="用途" prop="bookType">
<el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途">
<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>
</el-select>
</el-form-item>
......@@ -894,7 +894,8 @@
return callback(new Error('编码合法范围：[1 - 9999999999]'));
}
//检验code码
checkCode(value, this.form.code).then(response => {
checkCode(value, this.form.id).then(response => {
// console.log(response.data);
if (response.data === true) {
return callback(new Error("该车辆编码已经被占用，请重新输入"));
} else {
......@@ -2029,6 +2030,10 @@
this.dialogFormVisible = false;
this.dialogForm4ApplyVisible = false;
this.$refs[formName].resetFields();
// this.listQuery.code = ''
},
closePop(formName){
this.$refs.form.resetFields();
},
cancel4Apply(formName) {
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