|
@@ -261,6 +261,7 @@ import {
|
|
import selectMembershipLevel from '../model/selectMembershipLevel.vue'
|
|
import selectMembershipLevel from '../model/selectMembershipLevel.vue'
|
|
import selectMemberInformation from '../model/selectMemberInformation.vue'
|
|
import selectMemberInformation from '../model/selectMemberInformation.vue'
|
|
import selectTicketOrders from "../model/selectTicketOrders.vue"
|
|
import selectTicketOrders from "../model/selectTicketOrders.vue"
|
|
|
|
+import moment from'moment';
|
|
export default {
|
|
export default {
|
|
name: "addAndEdit",
|
|
name: "addAndEdit",
|
|
components: {selectMembershipLevel,selectMemberInformation,selectTicketOrders},
|
|
components: {selectMembershipLevel,selectMemberInformation,selectTicketOrders},
|
|
@@ -314,6 +315,7 @@ export default {
|
|
};
|
|
};
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ moment,
|
|
async initData(title , model,row){
|
|
async initData(title , model,row){
|
|
this.title = title
|
|
this.title = title
|
|
this.activeName = 'first'
|
|
this.activeName = 'first'
|
|
@@ -596,8 +598,8 @@ export default {
|
|
return {
|
|
return {
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
if(useType == 1 && datas && datas.length>0) {
|
|
if(useType == 1 && datas && datas.length>0) {
|
|
- let now = new Date(datas[1])
|
|
|
|
- return time.getTime() >= (now-86400000);
|
|
|
|
|
|
+ let now = new Date(moment(datas[1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
|
|
|
|
+ return time.getTime() > now.getTime();
|
|
}else {
|
|
}else {
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
@@ -609,8 +611,8 @@ export default {
|
|
return {
|
|
return {
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
if(datas && datas.length>0) {
|
|
if(datas && datas.length>0) {
|
|
- let now = new Date(datas[0])
|
|
|
|
- return time.getTime() <= (now-86400000);
|
|
|
|
|
|
+ let now = new Date(moment(datas[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
|
|
|
|
+ return time.getTime() < now.getTime()
|
|
}else {
|
|
}else {
|
|
return false
|
|
return false
|
|
}
|
|
}
|