|
@@ -535,6 +535,9 @@ export default {
|
|
|
},
|
|
|
/*获取节假日数据*/
|
|
|
async holiday(now,date,days,type,sa_orderitemsid){
|
|
|
+ console.log(now)
|
|
|
+ console.log(date)
|
|
|
+ console.log(days)
|
|
|
let dateNow = new Date(now)
|
|
|
let dateNow1 = new Date(date)
|
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
@@ -556,7 +559,9 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.jsDay = res.total
|
|
|
+ console.log(this.jsDay)
|
|
|
if (this.jsDay >0){
|
|
|
+ console.log('进入了嘛')
|
|
|
const dateAdd = this.addDaysToDate(date, this.jsDay)
|
|
|
this.holidayE(now,dateAdd.toISOString().split('T')[0],Number(this.jsDay),type,sa_orderitemsid)
|
|
|
}else {
|
|
@@ -569,6 +574,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async holidayE(now,date,days,type,sa_orderitemsid){
|
|
|
+ console.log('进入了嘛22222')
|
|
|
let dateNow = new Date(now)
|
|
|
let dateNow1 = new Date(date)
|
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
@@ -593,12 +599,13 @@ export default {
|
|
|
if (this.jsYcDay >0){
|
|
|
const dateAdd = this.addDaysToDate(date, this.jsYcDay)
|
|
|
if (type == '单'){
|
|
|
- this.dayChange(date,days,sa_orderitemsid)
|
|
|
+ this.dayChange(dateAdd.toISOString().split('T')[0],days,sa_orderitemsid)
|
|
|
}else {
|
|
|
this.daysChange(dateAdd.toISOString().split('T')[0],this.value3)
|
|
|
}
|
|
|
|
|
|
}else {
|
|
|
+ console.log(date,'计算出来的日期')
|
|
|
if (type == '单'){
|
|
|
this.dayChange(date,days,sa_orderitemsid)
|
|
|
}else {
|