|
|
@@ -53,7 +53,7 @@ Page({
|
|
|
begdate: "",
|
|
|
enddate: "",
|
|
|
tradefield: "",
|
|
|
- isleave: 0,
|
|
|
+ isleave: 1,
|
|
|
unfinish: 1
|
|
|
}
|
|
|
},
|
|
|
@@ -135,6 +135,9 @@ Page({
|
|
|
},
|
|
|
onReady() {
|
|
|
this.setChartData();
|
|
|
+ this.selectComponent("#organization").setData({
|
|
|
+ isleave:1
|
|
|
+ })
|
|
|
this.selectComponent("#organization").initDepAndUser();
|
|
|
// this.selectComponent("#Yl_Filtrate1").queryMonths(12)
|
|
|
},
|
|
|
@@ -153,25 +156,29 @@ Page({
|
|
|
handleFilter({
|
|
|
detail
|
|
|
}) {
|
|
|
- console.log(detail)
|
|
|
if (detail.name == 'reset') {
|
|
|
- // this.selectComponent("#organization").initDepAndUser()
|
|
|
+ this.selectComponent("#organization").setData({
|
|
|
+ isleave:1
|
|
|
+ })
|
|
|
+ this.selectComponent("#organization").initDepAndUser()
|
|
|
this.setData({
|
|
|
'content.dataid': wx.getStorageSync('userMsg').userid,
|
|
|
'content.type': 0,
|
|
|
- 'content.where.isleave': 0,
|
|
|
+ 'content.where.isleave': 1,
|
|
|
'content.where.tradefield': "",
|
|
|
'content.where.unfinish': 1,
|
|
|
})
|
|
|
} else {
|
|
|
- let active = this.selectComponent("#organization").data.result;
|
|
|
+ let active = this.selectComponent("#organization").data.result,
|
|
|
+ isleave = this.selectComponent("#organization").data.isleave;
|
|
|
let type = active.userid ? 0 : 1,
|
|
|
dataid = type == 0 ? active.userid : active.departmentid
|
|
|
+ console.log(isleave)
|
|
|
this.setData({
|
|
|
'content.dataid': dataid,
|
|
|
'content.type': type,
|
|
|
'content.where.tradefield': detail.tradefield,
|
|
|
- 'content.where.isleave': active.isleave || 0,
|
|
|
+ 'content.where.isleave': isleave || 1,
|
|
|
'content.where.unfinish': detail.unfinish || 0,
|
|
|
})
|
|
|
}
|