Commit 8861b8d2 authored by 黄奎's avatar 黄奎

页面修改

parent 52032e9d
......@@ -99,7 +99,7 @@ module.exports = {
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
host: 'www.test.com', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
......
......@@ -241,8 +241,8 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}{{item.extraRewardMoney}}</p>
......@@ -890,8 +890,7 @@
this.getCtlxList()
this.getEmployee();
// this.getLineList();
// this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
......@@ -904,7 +903,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
......@@ -556,14 +556,14 @@
</p>
<p>{{ $t("hotel.hotel_StartTeam") }}:{{ item.startDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<!-- <p v-if="item.commissionMoney" style="color: red;">
{{ $t("salesModule.CommissionNum") }}:{{ item.commissionMoney }}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.CommissionNum") }}:{{
item.latestCommissionMoney
}}
</p>
</p> -->
<div>
<div
style="color: green"
......
......@@ -583,7 +583,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
......@@ -628,14 +628,7 @@
this.msg.CStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.CStartDate === "" && this.msg.QEndDate === "") {
// let nowDay = new Date().toLocaleDateString();
var dd = new Date();
dd.setDate(dd.getDate() + 3); //获取AddDayCount天后的日期
var y = dd.getFullYear();
var m = dd.getMonth() + 1; //获取当前月份的日期
var d = dd.getDate();
// this.msg.QStartDate = nowDay;
this.msg.QEndDate = y + '-' + m + '-' + d;
this.msg.QEndDate = this.FormartDate(new Date());
}
this.getList();
},
......
......@@ -1703,14 +1703,14 @@
</p>
<p>{{ $t("restaurant.res_oderTime") }}{{ item.createDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<!-- <p v-if="item.commissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}{{ item.commissionMoney }}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}{{
item.latestCommissionMoney
}}
</p>
</p> -->
<div>
<div style="color: green" v-if="
item.commissionMoney == '' || item.commissionMoney == '-1'
......
......@@ -3614,7 +3614,7 @@
this.msg.TCIDList = this.TCIDList = this.$route.query.TCIDList;
}
if (this.msg.StartTime === "") {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay;
}
this.getEmployee();
......
......@@ -2153,7 +2153,7 @@
this.msg.TCIDList = this.TCIDList = this.$route.query.TCIDList;
}
if (this.msg.StartTime === "") {
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
this.msg.StartTime = nowDay;
}
this.getEmployee()
......
......@@ -147,8 +147,8 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}{{item.extraRewardMoney}}</p>
......@@ -691,9 +691,8 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
// this.msg.QStartDate = nowDay;
// this.msg.QEndDate = nowDay;
let nowDay =this.FormartDate(new Date());
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
......
......@@ -1211,7 +1211,8 @@ export default {
this.getLineList();
this.getDepartment();
this.getDdztList();
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
......
......@@ -590,7 +590,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
......@@ -1153,6 +1153,18 @@ export default {
}
item[filed] = value;
}
//格式化日期
Vue.prototype.FormartDate = function (date) {
let today =
date.getFullYear() +
"-" +
(date.getMonth() < 9 ?
"0" + (date.getMonth() + 1) :
date.getMonth() + 1) +
"-" +
(date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
return today;
}
//时间验证
Vue.prototype.checkTime = function (item, filed) {
var date = item[filed];
......@@ -1561,4 +1573,4 @@ export default {
return postData
}
}
}
\ No newline at end of file
}
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