|
...
|
...
|
@@ -84,11 +84,24 @@ Component({ |
|
|
|
App.Customer.GetTableFillUpDate(parmdata).then((json)=>{
|
|
|
|
if(json.ret==200){
|
|
|
|
let marklist=this.marklist;
|
|
|
|
let templist=[];
|
|
|
|
marklist.forEach((v,i)=>{
|
|
|
|
templist.push(v.date)
|
|
|
|
})
|
|
|
|
json.data.forEach((v,i)=>{
|
|
|
|
marklist.push({
|
|
|
|
date:v,
|
|
|
|
mark:'置'
|
|
|
|
})
|
|
|
|
if(templist.length>0){
|
|
|
|
if(templist.indexOf(v)==-1){
|
|
|
|
marklist.push({
|
|
|
|
date:v,
|
|
|
|
mark:'置'
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
marklist.push({
|
|
|
|
date:v,
|
|
|
|
mark:'置'
|
|
|
|
})
|
|
|
|
}
|
|
|
|
})
|
|
|
|
this.marklist=marklist;
|
|
|
|
this.setData({
|
...
|
...
|
|