|
|
@@ -378,7 +378,7 @@ export default {
|
|
|
let str = '每周'
|
|
|
let numArr = []
|
|
|
that.dayCheckList.forEach((element,i) => {
|
|
|
- let ind = that.weekList.findIndex(item=>item===element) + 1
|
|
|
+ let ind = that.weekList.findIndex(item=>item===element)!=-1?that.weekList.findIndex(item=>item===element) + 1:''
|
|
|
numArr.push(ind)
|
|
|
});
|
|
|
numArr.sort(function(a,b){
|
|
|
@@ -396,7 +396,7 @@ export default {
|
|
|
|
|
|
return '每月'+that.monthDateValue
|
|
|
}else if(content == '周保养'){
|
|
|
- let ind = that.weekList.findIndex(item=>item===that.weekDateValue) + 1
|
|
|
+ let ind = that.weekList.findIndex(item=>item===that.weekDateValue)!=-1?that.weekList.findIndex(item=>item===that.weekDateValue) + 1:''
|
|
|
return '每周'+ind
|
|
|
}else if(content == '季度保养'){
|
|
|
return '每季度'+that.quarterDateValue
|
|
|
@@ -432,7 +432,7 @@ export default {
|
|
|
let turnVal = that.monthDateValue.replace(/[^0-9]/ig, '')
|
|
|
return turnVal
|
|
|
}else if(content == '周保养'){
|
|
|
- let ind = that.weekList.findIndex(item=>item===that.weekDateValue) + 1
|
|
|
+ let ind = that.weekList.findIndex(item=>item===that.weekDateValue)!=-1?that.weekList.findIndex(item=>item===that.weekDateValue) + 1:''
|
|
|
return ind
|
|
|
}else if(content == '季度保养'){
|
|
|
let turnVal = that.quarterDateValue.replace(/[^0-9]/ig, '')
|
|
|
@@ -451,8 +451,9 @@ export default {
|
|
|
let that = this
|
|
|
if(content.weiHuLeiXing == '日保养'){
|
|
|
let strArr = []
|
|
|
- let str = content.weiHuRiQi.slice(1)
|
|
|
+ let str = content.weiHuRiQi.slice(2)
|
|
|
let partArr = str.split(",")
|
|
|
+ // console.log(partArr)
|
|
|
partArr.forEach((e,i)=>{
|
|
|
let num = e*1-1
|
|
|
strArr.push(this.weekList[num])
|
|
|
@@ -461,7 +462,10 @@ export default {
|
|
|
}else if(content.weiHuLeiXing == '月保养'){
|
|
|
that.monthDateValue = content.weiHuRiQi
|
|
|
}else if(content.weiHuLeiXing == '周保养'){
|
|
|
- that.weekDateValue = content.weiHuRiQi
|
|
|
+ let str = content.weiHuRiQi.slice(2)
|
|
|
+ let partArr = str.split(",")
|
|
|
+ // console.log(partArr*1-1)
|
|
|
+ that.weekDateValue = this.weekList[partArr*1-1]
|
|
|
}else if(content.weiHuLeiXing == '季度保养'){
|
|
|
that.quarterDateValue = content.weiHuRiQi
|
|
|
}else if(content.weiHuLeiXing == '半年保养'){
|