Commit ad857653 authored by lixy's avatar lixy

添加时、富文本问题修复

parent 0dfa885b
...@@ -336,12 +336,12 @@ export const asyncRouterMap = [{ ...@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
name: '车辆保养记录', name: '车辆保养记录',
authority: 'vehicleUpkeepLog' authority: 'vehicleUpkeepLog'
}, },
// { {
// path: 'vehicleSchedulManage', path: 'vehicleSchedulManage',
// component: _import('vehicle/vehicleSchedulManage/index'), component: _import('vehicle/vehicleSchedulManage/index'),
// name: '车辆排班管理', name: '车辆排班管理',
// authority: 'vehicleSchedulManage' authority: 'vehicleSchedulManage'
// } }
] ]
}, },
{ {
......
...@@ -41,3 +41,36 @@ export function timestamp2Date(timestamp) { ...@@ -41,3 +41,36 @@ export function timestamp2Date(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000 let date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss'); 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');
}
...@@ -225,11 +225,13 @@ ...@@ -225,11 +225,13 @@
}, },
}, },
mounted() { mounted() {
this.cleanForm();
if(this.title == "编辑"){ if(this.title == "编辑"){
let row = this.oneRow; let row = this.oneRow;
this.getOne(row.id); this.getOne(row.id);
} else {
this.activeName2 = "first";
} }
this.cleanForm();
this.oneTourDialogVisible = true; this.oneTourDialogVisible = true;
}, },
computed: { computed: {
......
...@@ -274,12 +274,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -274,12 +274,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本
childPrice: undefined,//儿童价 childPrice: undefined,//儿童价
isOutside:"0", isOutside:"0",
tourDepartVo:undefined,//type:0出发地 1途径地 2目的地 tourDepartVo:undefined,//type:0出发地 1途径地 2目的地
content: undefined,//行程亮点 content: "",//行程亮点
cover:undefined,//封面图 cover:undefined,//封面图
describe: undefined,//描述 describe: undefined,//描述
introduce: undefined,//行程介绍 introduce: "",//行程介绍
crtTime: undefined, crtTime: undefined,
explain: undefined,//费用说明 explain: "",//费用说明
name: undefined,//旅行名称 name: undefined,//旅行名称
price: undefined,//成人价 price: undefined,//成人价
rank: undefined, rank: undefined,
...@@ -348,11 +348,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -348,11 +348,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本
}, },
}, },
mounted() { mounted() {
this.cleanForm();
if(this.title == "编辑"){ if(this.title == "编辑"){
let row = this.oneTourRow; let row = this.oneTourRow;
this.getOneGoods(row.id); this.getOneGoods(row.id);
} else{
this.activeName2 = "first";
} }
this.cleanForm();
this.oneTourDialogVisible = true; this.oneTourDialogVisible = true;
}, },
computed: { computed: {
...@@ -863,7 +865,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -863,7 +865,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
this.$emit("oneTourDialogEvent", false); this.$emit("oneTourDialogEvent", false);
}, },
/** /**
* 富文本 营地详情 * 富文本 旅游
* */ * */
editorReadyEvent(instance){ editorReadyEvent(instance){
let t = this; let t = this;
...@@ -943,14 +945,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -943,14 +945,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
this.activeName2= '',//行程亮点 this.activeName2= '',//行程亮点
this.form= { this.form= {
isOutside: "0",//省内、省外 isOutside: "0",//省内、省外
childPrice: undefined,//儿童价 childPrice: undefined,//儿童价
tourDepartVo:undefined,//type:0出发地 1途径地 2目的地 tourDepartVo:undefined,//type:0出发地 1途径地 2目的地
content: undefined,//行程亮点 content: "",//行程亮点
cover:undefined,//封面图 cover:undefined,//封面图
describe: undefined,//描述 describe: undefined,//描述
introduce: undefined,//行程介绍 introduce: "",//行程介绍
crtTime: undefined, crtTime: undefined,
explain: undefined,//费用说明 explain: "",//费用说明
name: undefined,//旅行名称 name: undefined,//旅行名称
price: undefined,//成人价 price: undefined,//成人价
rank: undefined, rank: undefined,
...@@ -966,9 +968,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -966,9 +968,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本
bannerDTOS:[],//banner轮播 bannerDTOS:[],//banner轮播
tourDepartTimeVo:[],//活动时间 tourDepartTimeVo:[],//活动时间
}, },
this.showDestinationVisible= false,//编辑目的地 this.showDestinationVisible= false,//编辑目的地
this.showPathWayVisible= false,//编辑途径地 this.showPathWayVisible= false,//编辑途径地
this.showTimeVisible= false;//编辑时间 this.showTimeVisible= false;//编辑时间
this.activeName2 = "";
} }
} }
} }
......
...@@ -350,6 +350,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -350,6 +350,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
let row = this.oneRow; let row = this.oneRow;
this.getOne(row.id); this.getOne(row.id);
} else { } else {
this.activeName2 = "first";
let tagArr = []; let tagArr = [];
this.labelList.map(function(iitem){ this.labelList.map(function(iitem){
if(iitem.children.length >0){ if(iitem.children.length >0){
...@@ -778,6 +779,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -778,6 +779,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
* 清空旅游弹框数据 * 清空旅游弹框数据
*/ */
cleanForm() { cleanForm() {
this.activeName2 = "";
this.form = { this.form = {
name: undefined,//房车名称 name: undefined,//房车名称
config: "",//房车配置 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