|
@@ -41,6 +41,7 @@ Page({
|
|
|
if (rs && rs.length > 0) {
|
|
|
this.setData({ 'eventList': rs })
|
|
|
}
|
|
|
+ this.initList()
|
|
|
});
|
|
|
util.apiPost(urls.get_holidays, { 'q.companyId': stu.orgId }).then((rs) => {
|
|
|
if (rs && rs.length > 0) {
|
|
@@ -50,11 +51,19 @@ Page({
|
|
|
}
|
|
|
},
|
|
|
|
|
|
+ initList:function(){
|
|
|
+ let date = this.data.bd
|
|
|
+ if (date) {
|
|
|
+ let t = this;
|
|
|
+ t.selectDate(date)
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
/**
|
|
|
* 生命周期函数--监听页面初次渲染完成
|
|
|
*/
|
|
|
onReady: function () {
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -64,7 +73,7 @@ Page({
|
|
|
let date = this.data.bd
|
|
|
if (date) {
|
|
|
let t = this;
|
|
|
- setTimeout(() => { t.selectDate(date) }, 500)
|
|
|
+ t.selectDate(date)
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -108,6 +117,7 @@ Page({
|
|
|
let list = this.data.eventList.filter(o => {
|
|
|
return o.attenceDate == v;
|
|
|
});
|
|
|
+
|
|
|
list.map(o => {
|
|
|
o.bt = o.beginTime.substring(11, 16);
|
|
|
o.et = o.endTime.substring(11, 16);
|