Showing
1 changed file
with
17 additions
and
4 deletions
| @@ -84,11 +84,24 @@ Component({ | @@ -84,11 +84,24 @@ Component({ | ||
| 84 | App.Customer.GetTableFillUpDate(parmdata).then((json)=>{ | 84 | App.Customer.GetTableFillUpDate(parmdata).then((json)=>{ |
| 85 | if(json.ret==200){ | 85 | if(json.ret==200){ |
| 86 | let marklist=this.marklist; | 86 | let marklist=this.marklist; |
| 87 | + let templist=[]; | ||
| 88 | + marklist.forEach((v,i)=>{ | ||
| 89 | + templist.push(v.date) | ||
| 90 | + }) | ||
| 87 | json.data.forEach((v,i)=>{ | 91 | json.data.forEach((v,i)=>{ |
| 88 | - marklist.push({ | ||
| 89 | - date:v, | ||
| 90 | - mark:'置' | ||
| 91 | - }) | 92 | + if(templist.length>0){ |
| 93 | + if(templist.indexOf(v)==-1){ | ||
| 94 | + marklist.push({ | ||
| 95 | + date:v, | ||
| 96 | + mark:'置' | ||
| 97 | + }) | ||
| 98 | + } | ||
| 99 | + }else{ | ||
| 100 | + marklist.push({ | ||
| 101 | + date:v, | ||
| 102 | + mark:'置' | ||
| 103 | + }) | ||
| 104 | + } | ||
| 92 | }) | 105 | }) |
| 93 | this.marklist=marklist; | 106 | this.marklist=marklist; |
| 94 | this.setData({ | 107 | this.setData({ |
-
Please register or login to post a comment