diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index 88a038f..bc7b737 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -26,20 +26,20 @@ Page({
},
fetchMemberList: function(){
getCheckList({enterpriseId: app.userInfo.enterpriseId}).then(result => {
- this.setData({ checkList: result.data, loading: false})
+ this.setData({ checkList: result.data.records, loading: false})
}).catch(err => {
wx.hideLoading()
util.showToast(err)
})
this.data.eemidList = []
getEmployeList({enterpriseId: app.userInfo.enterpriseId, isPassFromBackstage: 1}).then(result => {
- for (let index = 0; index < result.data.length; index++) {
- const element = result.data[index]
+ for (let index = 0; index < result.data.records.length; index++) {
+ const element = result.data.records[index]
if(element.position == 'ADMINISTRATOR'){
this.data.eemidList.push(element.id)
}
}
- this.setData({ memberList: result.data, loading: false })
+ this.setData({ memberList: result.data.records, loading: false })
wx.hideLoading()
}).catch(err => {
wx.hideLoading()
@@ -48,16 +48,11 @@ Page({
},
lookItem: function(event){
var item = this.data.memberList[event.currentTarget.dataset.index]
- if(item.position == 'ADMINISTRATOR'){
- return
- }
var that = this
wx.showActionSheet({
- itemList: ['设为管理员'],
+ itemList: ['删除该员工'],
success(res){
if (res.tapIndex === 0){
- that.setAdmin(event.currentTarget.dataset.index, item)
- }if (res.tapIndex === 1){
that.deleteItem(event.currentTarget.dataset.index, item)
}
}
@@ -96,24 +91,22 @@ Page({
util.showToast(err)
})
},
- agreeItem: function(event){
+ agreeItem: function(e){
// /employees/audit 员工审核
wx.showLoading({ title: '加载中', mask: true })
- var item = this.data.checkList[event.currentTarget.dataset.index]
+ var item = this.data.checkList[e.currentTarget.dataset.index]
auditEmploye({id: item.id, status: 1 }).then(result => {
- //成功回调
this.fetchMemberList()
}).catch(err => {
- //异常回调
wx.hideLoading()
util.showToast(err)
})
},
- refuseItem: function(event){
+ refuseItem: function(e){
wx.showLoading({ title: '加载中', mask: true })
- var item = this.data.checkList[event.currentTarget.dataset.index]
+ var item = this.data.checkList[e.currentTarget.dataset.index]
auditEmploye({id: item.id, status: 2 }).then(result => {
- this.setData({ ['checkList[' + event.currentTarget.dataset.index + '].applicantStatus']: 2})
+ this.setData({ ['checkList[' + e.currentTarget.dataset.index + '].status']: 2})
wx.hideLoading()
}).catch(err => {
wx.hideLoading()
diff --git a/pages/home/employee/index.wxml b/pages/home/employee/index.wxml
index aeae1a7..ff7caaf 100644
--- a/pages/home/employee/index.wxml
+++ b/pages/home/employee/index.wxml
@@ -14,37 +14,43 @@
待审核
-
-
-
-
+
+
+
+
+
+
{{item.applicantName || item.enterpriseMemberName}}
- {{item.phone || ''}}
+ {{item.phone || item.applicationMobile || ''}}
-
- 同意加入
+
+ 同意加入
拒绝加入
- 已拒绝
+
+ 已拒绝
+
+
+ 已过期
+
-
+
所有员工
-
-
+
+
- {{item.userName || ''}}
+ {{item.enterpriseMemberName || ''}}
企业主
管理员
- {{item.phone || ''}}
+ {{item.mobile || ''}}
diff --git a/pages/home/employee/index.wxss b/pages/home/employee/index.wxss
index 634c182..f7d282c 100644
--- a/pages/home/employee/index.wxss
+++ b/pages/home/employee/index.wxss
@@ -1,8 +1,9 @@
/* pages/home/employee/index.wxss */
-.e-image{
- width: 90rpx;
- height: 90rpx;
- margin-top: 12rpx;
+.item-content{
+ padding: 20rpx 32rpx 20rpx 0rpx;
+ border-bottom:1rpx solid #f3f3f3;
+ margin-left:32rpx;
+ align-items: flex-start;
}
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 3972af8..e9d22ab 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -29,7 +29,7 @@
-
+