Skip to content

C
cloud-platform-ui
Commit c077c683 authored by denghaorong's avatar denghaorong
Browse files
Options

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

parents a4f0adef ad857653
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 58 deletions
src/router/index.js
View file @ c077c683
......@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
name: '车辆保养记录',
authority: 'vehicleUpkeepLog'
},
// {
// path: 'vehicleSchedulManage',
// component: _import('vehicle/vehicleSchedulManage/index'),
// name: '车辆排班管理',
// authority: 'vehicleSchedulManage'
// }
{
path: 'vehicleSchedulManage',
component: _import('vehicle/vehicleSchedulManage/index'),
name: '车辆排班管理',
authority: 'vehicleSchedulManage'
}
]
},
{
......
src/utils/dateUtils.js
View file @ c077c683
......@@ -41,3 +41,36 @@ export function timestamp2Date(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
/*
num 获取当天多少天后的日期
*/
export function getTimeByDay(num) {
const today = new Date().getTime()
const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
return formatDate(tempTime, 'dd');
}
/*
num 获取当天多少天后的日期 yyyy-MM-dd hh:mm
*/
export function getymdTimeByDay(num) {
const today = new Date().getTime()
const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
return formatDate(tempTime, 'yyyy-MM-dd');
}
/**
* 获取月份
* */
export function getMonth(num) {
const today = new Date().getTime()
const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
return formatDate(tempTime, 'MM');
}
/**
* 获取当前月
* */
export function getCurrentMonth() {
const today = new Date();
return formatDate(today, 'MM');
}
src/views/campsiteManage/modal/oneCampsiteModal.vue
View file @ c077c683
......@@ -225,11 +225,13 @@
},
},
mounted() {
this.cleanForm();
if(this.title == "编辑"){
let row = this.oneRow;
this.getOne(row.id);
} else {
this.activeName2 = "first";
}
this.cleanForm();
this.oneTourDialogVisible = true;
},
computed: {
......
src/views/order/rentVehicleInfo/index.vue
View file @ c077c683
......@@ -107,10 +107,10 @@
</el-table-column>
<el-table-column align="center" label="操作" width="400">
<template scope="scope">
<el-button size="small" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
<el-button size="small" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
<el-button size="small" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
<el-button size="small" v-if="scope.row.status == 6" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
<el-button size="small" v-if="scope.row.status >=4" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
<el-button size="small" v-if="scope.row.status == 6" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
<el-button size="small" v-if="scope.row.status > 3" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
<el-button size="small" v-if="scope.row.status == 6" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/tourManage/modal/oneTourModal.vue
View file @ c077c683
......@@ -274,12 +274,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本
childPrice: undefined,//儿童价
isOutside:"0",
tourDepartVo:undefined,//type：0出发地 1途径地 2目的地
content: undefined,//行程亮点
content: "",//行程亮点
cover:undefined,//封面图
describe: undefined,//描述
introduce: undefined,//行程介绍
introduce: "",//行程介绍
crtTime: undefined,
explain: undefined,//费用说明
explain: "",//费用说明
name: undefined,//旅行名称
price: undefined,//成人价
rank: undefined,
......@@ -348,11 +348,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本
},
},
mounted() {
this.cleanForm();
if(this.title == "编辑"){
let row = this.oneTourRow;
this.getOneGoods(row.id);
} else{
this.activeName2 = "first";
}
this.cleanForm();
this.oneTourDialogVisible = true;
},
computed: {
......@@ -863,7 +865,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
this.$emit("oneTourDialogEvent", false);
},
/**
* 富文本 营地详情
* 富文本 旅游
* */
editorReadyEvent(instance){
let t = this;
......@@ -943,14 +945,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
this.activeName2= '',//行程亮点
this.form= {
isOutside: "0",//省内、省外
childPrice: undefined,//儿童价
childPrice: undefined,//儿童价
tourDepartVo:undefined,//type：0出发地 1途径地 2目的地
content: undefined,//行程亮点
content: "",//行程亮点
cover:undefined,//封面图
describe: undefined,//描述
introduce: undefined,//行程介绍
introduce: "",//行程介绍
crtTime: undefined,
explain: undefined,//费用说明
explain: "",//费用说明
name: undefined,//旅行名称
price: undefined,//成人价
rank: undefined,
......@@ -966,9 +968,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本
bannerDTOS:[],//banner轮播
tourDepartTimeVo:[],//活动时间
},
this.showDestinationVisible= false,//编辑目的地
this.showPathWayVisible= false,//编辑途径地
this.showTimeVisible= false;//编辑时间
this.showDestinationVisible= false,//编辑目的地
this.showPathWayVisible= false,//编辑途径地
this.showTimeVisible= false;//编辑时间
this.activeName2 = "";
}
}
}
......
src/views/userManagement/userList/index.vue
View file @ c077c683
......@@ -26,18 +26,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="注册时间" prop="bookDateRange">
<el-col :span="8">
<!-- <el-form-item label="注册时间" prop="bookDateRange">-->
<!-- <el-date-picker-->
<!-- v-model="listQuery.registrationDate "-->
<!-- type="daterange"-->
<!-- :editable="true"-->
<!-- format="yyyy-MM-dd"-->
<!-- placeholder="请选择注册时间范围">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="导入时间">
<el-date-picker
v-model="listQuery.registrationTimeBegin"
type="date"
:editable="true"
format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>~
<el-date-picker
v-model="listQuery.registrationDate "
type="daterange"
v-model="listQuery.registrationTimeEnd"
type="date"
:editable="true"
format="yyyy-MM-dd"
placeholder="请选择注册时间范围">
</el-date-picker>
placeholder="选择日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="4">
<el-form-item label="用户来源">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
......@@ -301,7 +318,7 @@
<!-- 设置会员信息窗口-->
<el-dialog title="设置会员信息" :visible.sync="setMemberArea" class="member">
<el-dialog title="设置会员信息" @change="change" :visible.sync="setMemberArea" class="member">
<el-form :model="userMembershipInformation" ref="userMembership" label-width="100px">
<el-row>
<el-col :span="16">
......@@ -627,7 +644,7 @@
channel: undefined,
registrationTimeEnd: undefined,
registrationTimeBegin: undefined,
registrationDate: undefined
},
source: {
......@@ -688,8 +705,8 @@
},
watch: {
'userMembershipInformation.memberLevel'(newValue, oldValue) {
console.log('userMembershipInformation.memberLevel='+newValue)
console.log('userMembershipInformation.memberLevel=' + newValue)
}
},
methods: {
......@@ -775,7 +792,14 @@
let query = JSON.parse(JSON.stringify(this.listQuery))
query.source = query.source ? query.source - 1 : ''
JSON.stringify(query)
console.log('handleFilterStatus:this.listQuery=' + JSON.stringify(this.listQuery))
query.registrationTimeBegin =this.listQuery.registrationTimeBegin
?(new Date(query.registrationTimeBegin).getTime()) / 1000:undefined
query.registrationTimeEnd = this.listQuery.registrationTimeEnd
? (new Date( query.registrationTimeEnd).getTime()) / 1000:undefined
console.log('handleFilterEnd:this.listQuery=' + JSON.stringify(this.listQuery))
console.log('query================' + JSON.stringify(query))
appPage(query)
.then(response => {
for (let listKey of response.data.list) {
......@@ -794,7 +818,7 @@
listKey.timeOfMembership = listKey.timeOfMembership ? timestamp2Date(listKey.timeOfMembership) : '';
listKey.recentRecharge = listKey.recentRecharge ? timestamp2Date(listKey.recentRecharge) : '';
listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime) : '';
listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime*1000) : '';
listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
listKey.channel = this.terminal[listKey.channel];
listKey.source = this.source[listKey.source];
......@@ -805,9 +829,6 @@
*查询
*/
handleFilter() {
this.listQuery.registrationTimeBegin = this.listQuery.registrationDate ? (new Date(this.listQuery.registrationDate[0]).getTime()) / 1000 : null
this.listQuery.registrationTimeEnd = this.listQuery.registrationDate ? (new Date(this.listQuery.registrationDate[1]).getTime()) / 1000 : null
this.getList();
}
,
......@@ -841,10 +862,19 @@
*/
setMember(row) {
this.userMembershipInformation = {}
this.userMembershipInformation = {
memberLevel: undefined,
validTime: '',
buyCount: undefined,
totalNumber: undefined,
rentFreeDays: undefined,
id: undefined,
userId: row.userId
}
this.saveUserId = row.userId
getUserMemberByUserId(row.userId).then(response => {
console.log(JSON.stringify(response))
if (response.data){
if (response.data.validTime == 0) {
this.validityType = '永久'
} else if (response.data.validTime) {
......@@ -853,11 +883,13 @@
} else {
this.validityType = '无'
}
this.userMembershipInformation = response.data
this.validTime = response.data.validTime
console.log(this.userMembershipInformation)
this.validTime = response.data.validTime
this.userMembershipInformation = response.data
// this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined
}
this.setMemberArea = true
})
console.log('this.userMembershipInformation:'+JSON.stringify(this.userMembershipInformation))
this.userMembershipInformation.userId = this.saveUserId
},
/**
......@@ -1073,24 +1105,23 @@
},
setDate() {
if (!this.validTime) {
let date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000
let date = new Date();
this.validTime = formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
},
cleaningQuery() {
this.listQuery = {
page: 1,
limit: 20,
mobileList: undefined,
mobile: undefined,
memberLevel: undefined,
source: undefined,
channel: undefined,
registrationTimeEnd: undefined,
registrationTimeBegin: undefined,
registrationDate: undefined
}
this.listQuery.page = 1
this.listQuery.limit = 20
this.listQuery.mobileList = undefined
this.listQuery.mobile = undefined
this.listQuery.memberLevel = undefined
this.listQuery.source = undefined
this.listQuery.channel = undefined
this.listQuery.registrationTimeEnd = undefined
this.listQuery.registrationTimeBegin = undefined
},
change() {
this.$forceUpdate()
}
}
}
......
src/views/vehicleType/modal/oneType.vue
View file @ c077c683
......@@ -350,6 +350,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
let row = this.oneRow;
this.getOne(row.id);
} else {
this.activeName2 = "first";
let tagArr = [];
this.labelList.map(function(iitem){
if(iitem.children.length >0){
......@@ -778,6 +779,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
* 清空旅游弹框数据
*/
cleanForm() {
this.activeName2 = "";
this.form = {
name: undefined,//房车名称
config: "",//房车配置
......
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