From ffcb1d1ac173fab698e31268ad50bd266d64091d Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 13 Apr 2021 20:03:59 +0800
Subject: [PATCH] no message
---
api/user.js | 4 +-
components/checker/index.js | 58 +++++++++++
components/checker/index.json | 7 ++
components/checker/index.wxml | 22 ++++
components/checker/index.wxs | 12 +++
components/checker/index.wxss | 1 +
components/checker/shared.js | 21 ++++
components/checker/toolbar.wxml | 11 ++
components/picker/index.js | 15 ++-
components/picker/index.wxml | 41 +++-----
components/picker/toolbar.wxml | 27 +----
components/radio/index.wxml | 23 ++---
pages/home/employee-info/index.js | 105 ++++++++++++-------
pages/home/employee-info/index.json | 5 +-
pages/home/employee-info/index.wxml | 42 +++++---
pages/home/employee/index.js | 151 +++++++++++-----------------
pages/home/employee/index.json | 1 -
pages/home/employee/index.wxml | 2 -
18 files changed, 333 insertions(+), 215 deletions(-)
create mode 100644 components/checker/index.js
create mode 100644 components/checker/index.json
create mode 100644 components/checker/index.wxml
create mode 100644 components/checker/index.wxs
create mode 100644 components/checker/index.wxss
create mode 100644 components/checker/shared.js
create mode 100644 components/checker/toolbar.wxml
diff --git a/api/user.js b/api/user.js
index 771d91d..a155b6f 100644
--- a/api/user.js
+++ b/api/user.js
@@ -28,7 +28,7 @@ const applyEmplyee = (params) => mPost(`/uec/apply/to/be/employee/of/enterprise-
const getCheckList = (params) => mGet(`/uec/get/employee-joining-department-application-list`, params, config)
const auditEmploye = (params) => mPost(`/uec/audit/employee-joining-department-application`, params, config)
const deleteEmploye = (params) => mPost(`/uec/remove/employees`, params, config)
-const adminEmploye = (params) => mPost(`/uec/grant/admin-role/to/employees`, params, config)
+const editEmploye = (params) => mPost(`/uec/save/self-department-member`, params, config)
// ****************************************************************************************************************************************
// /authorize/by-wechat-applet小程序登录
function loginWechat(form) {
@@ -204,5 +204,5 @@ export {
getCheckList,
auditEmploye,
deleteEmploye,
- adminEmploye
+ editEmploye
}
\ No newline at end of file
diff --git a/components/checker/index.js b/components/checker/index.js
new file mode 100644
index 0000000..25af514
--- /dev/null
+++ b/components/checker/index.js
@@ -0,0 +1,58 @@
+import { VantComponent } from '../common/component';
+import { pickerProps } from './shared';
+
+VantComponent({
+ classes: ['active-class', 'toolbar-class', 'column-class'],
+ props: Object.assign(Object.assign({}, pickerProps), {
+ max: {
+ type: Number,
+ value: Infinity,
+ },
+ activeId: {
+ type: Array,
+ value: []
+ },
+ toolbarPosition: {
+ type: String,
+ value: 'top'
+ },
+ defaultIndex: {
+ type: Number,
+ value: 0
+ },
+ columns: {
+ type: Array,
+ value: []
+ },
+ selectedIcon: {
+ type: String,
+ value: 'success',
+ }
+ }),
+ methods: {
+ emit(event) {
+ const { type } = event.currentTarget.dataset;
+ if (this.data.columns.length) {
+ this.$emit(type, this.data.activeId );
+ } else {
+ this.$emit(type, { });
+ }
+ },
+ onSelectItem(event) {
+ const { item } = event.currentTarget.dataset;
+ const isArray = Array.isArray(this.data.activeId);
+ // 判断有没有超出右侧选择的最大数
+ const isOverMax = isArray && this.data.activeId.length >= this.data.max;
+ // 判断该项有没有被选中, 如果有被选中,则忽视是否超出的条件
+ const index = this.data.activeId.indexOf(item.id)
+ if (!item.disabled && !isOverMax) {
+ if(index > -1){
+ this.data.activeId.splice(index, 1)
+ } else {
+ this.data.activeId.push(item.id)
+ }
+ this.setData({ activeId: this.data.activeId });
+ }
+ },
+ }
+});
diff --git a/components/checker/index.json b/components/checker/index.json
new file mode 100644
index 0000000..5433fbf
--- /dev/null
+++ b/components/checker/index.json
@@ -0,0 +1,7 @@
+{
+ "component": true,
+ "usingComponents": {
+ "van-icon": "../icon/index",
+ "loading": "../loading/index"
+ }
+}
diff --git a/components/checker/index.wxml b/components/checker/index.wxml
new file mode 100644
index 0000000..23632ce
--- /dev/null
+++ b/components/checker/index.wxml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
\ No newline at end of file
diff --git a/components/checker/index.wxs b/components/checker/index.wxs
new file mode 100644
index 0000000..b1cbb39
--- /dev/null
+++ b/components/checker/index.wxs
@@ -0,0 +1,12 @@
+/* eslint-disable */
+var array = require('../wxs/array.wxs');
+
+function isActive (activeList, itemId) {
+ if (array.isArray(activeList)) {
+ return activeList.indexOf(itemId) > -1;
+ }
+
+ return activeList === itemId;
+}
+
+module.exports.isActive = isActive;
diff --git a/components/checker/index.wxss b/components/checker/index.wxss
new file mode 100644
index 0000000..5b0e2a6
--- /dev/null
+++ b/components/checker/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-picker{position:relative;overflow:hidden;-webkit-text-size-adjust:100%;-webkit-user-select:none;user-select:none;background-color:#fff;background-color:var(--picker-background-color,#fff)}.van-picker__toolbar{display:-webkit-flex;display:flex;-webkit-justify-content:space-between;justify-content:space-between;height:44px;height:var(--picker-toolbar-height,44px);line-height:44px;line-height:var(--picker-toolbar-height,44px)}.van-picker__cancel{padding:0 16px;padding:var(--picker-action-padding,0 16px);font-size:14px;font-size:var(--picker-action-font-size,14px);color:#666666;color:var(--picker-action-text-color,#666666)}.van-picker__confirm{padding:0 16px;padding:var(--picker-action-padding,0 16px);font-size:14px;font-size:var(--picker-action-font-size,14px);color:#1989fa;color:var(--picker-action-text-color,#1989fa)}.van-picker__cancel--hover,.van-picker__confirm--hover{background-color:#f2f3f5;background-color:var(--picker-action-active-color,#f2f3f5)}.van-picker__title{max-width:50%;text-align:center;font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--picker-option-font-size,16px)}.van-picker__columns{position:relative;display:-webkit-flex;display:flex}.van-picker__column{-webkit-flex:1 1;flex:1 1;width:0}.van-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:4;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;background-color:hsla(0,0%,100%,.9);background-color:var(--picker-loading-mask-color,hsla(0,0%,100%,.9))}.van-picker__mask{position:absolute;top:0;left:0;z-index:2;width:100%;height:100%;background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-backface-visibility:hidden;backface-visibility:hidden;pointer-events:none}.van-picker__frame,.van-picker__loading .van-loading{position:absolute;top:50%;left:0;z-index:1;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}.van-tree-select{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;font-size:14px;font-size:var(--tree-select-font-size,14px)}.van-tree-select__nav{-webkit-flex:1;flex:1;background-color:#f7f8fa;background-color:var(--tree-select-nav-background-color,#f7f8fa);--sidebar-padding:12px 8px 12px 12px}.van-tree-select__nav__inner{width:100%!important;height:100%}.van-tree-select__content{-webkit-flex:2;flex:2;background-color:#fff;background-color:var(--tree-select-content-background-color,#fff)}.van-tree-select__item{position:relative;font-weight:700;line-height:44px;line-height:var(--tree-select-item-height,44px)}.van-tree-select__item--active{color:#1989fa;color:var(--tree-select-item-active-color,#1989fa)}.van-tree-select__item--disabled{color:#c8c9cc;color:var(--tree-select-item-disabled-color,#c8c9cc)}.van-tree-select__selected{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);right:0px;}
\ No newline at end of file
diff --git a/components/checker/shared.js b/components/checker/shared.js
new file mode 100644
index 0000000..18d133c
--- /dev/null
+++ b/components/checker/shared.js
@@ -0,0 +1,21 @@
+export const pickerProps = {
+ title: String,
+ loading: Boolean,
+ showToolbar: Boolean,
+ cancelButtonText: {
+ type: String,
+ value: '取消'
+ },
+ confirmButtonText: {
+ type: String,
+ value: '确认'
+ },
+ visibleItemCount: {
+ type: Number,
+ value: 5
+ },
+ itemHeight: {
+ type: Number,
+ value: 45
+ }
+};
diff --git a/components/checker/toolbar.wxml b/components/checker/toolbar.wxml
new file mode 100644
index 0000000..d112b29
--- /dev/null
+++ b/components/checker/toolbar.wxml
@@ -0,0 +1,11 @@
+
+
+
+ {{ cancelButtonText }}
+
+ {{title}}
+
+ {{ confirmButtonText }}
+
+
+
\ No newline at end of file
diff --git a/components/picker/index.js b/components/picker/index.js
index 8e78e66..6a28a20 100644
--- a/components/picker/index.js
+++ b/components/picker/index.js
@@ -2,16 +2,20 @@ import { VantComponent } from '../common/component';
import { pickerProps } from './shared';
VantComponent({
classes: ['active-class', 'toolbar-class', 'column-class'],
- props: Object.assign(Object.assign({}, pickerProps), { valueKey: {
+ props: Object.assign(Object.assign({}, pickerProps), {
+ valueKey: {
type: String,
value: 'text'
- }, toolbarPosition: {
+ },
+ toolbarPosition: {
type: String,
value: 'top'
- }, defaultIndex: {
+ },
+ defaultIndex: {
type: Number,
value: 0
- }, columns: {
+ },
+ columns: {
type: Array,
value: [],
observer(columns = []) {
@@ -21,7 +25,8 @@ VantComponent({
this.setColumns().catch(() => { });
}
}
- } }),
+ }
+ }),
beforeCreate() {
this.children = [];
},
diff --git a/components/picker/index.wxml b/components/picker/index.wxml
index 519adb5..bcd9eb9 100644
--- a/components/picker/index.wxml
+++ b/components/picker/index.wxml
@@ -1,36 +1,23 @@
-
+
-
+
-
-
+
-
-
+ default-index="{{ item.defaultIndex || defaultIndex }}" item-height="{{ itemHeight }}"
+ visible-item-count="{{ visibleItemCount }}" active-class="active-class" bind:change="onChange" />
+
+
-
+
@@ -38,4 +25,4 @@
return columns.length && !columns[0].values;
}
module.exports = isSimple;
-
+
\ No newline at end of file
diff --git a/components/picker/toolbar.wxml b/components/picker/toolbar.wxml
index 4fa9db5..d112b29 100644
--- a/components/picker/toolbar.wxml
+++ b/components/picker/toolbar.wxml
@@ -1,28 +1,11 @@
-
-
+
+
{{ cancelButtonText }}
- {{
- title
- }}
-
+ {{title}}
+
{{ confirmButtonText }}
-
+
\ No newline at end of file
diff --git a/components/radio/index.wxml b/components/radio/index.wxml
index 0b748ef..e6b47cd 100644
--- a/components/radio/index.wxml
+++ b/components/radio/index.wxml
@@ -1,29 +1,20 @@
-
+
-
+ custom-style="line-height: {{ utils.addUnit(iconSize) }};font-size: .8em;display: block;" />
-
+
-
+
\ No newline at end of file
diff --git a/pages/home/employee-info/index.js b/pages/home/employee-info/index.js
index feeb32b..34f5edd 100644
--- a/pages/home/employee-info/index.js
+++ b/pages/home/employee-info/index.js
@@ -1,9 +1,9 @@
// pages/home/customer-info/index.js
import Scene from '../../index/scene'
-import { getRoleList, editCustomer, saveCustomer} from "../../../api/saas"
+import Dialog from '../../../components/dialog/dialog'
+import { getRoleList} from "../../../api/saas"
+import { editEmploye, deleteEmploye, auditEmploye } from "../../../api/user"
const util = require('../../../utils/util')
-const event = require('../../../utils/event')
-const app = getApp()
Scene({
/**
@@ -22,6 +22,12 @@ Scene({
let channel = this.getOpenerEventChannel()
let that = this
channel.on('onParam', function (data) {
+ console.log(data)
+ if(data.enterpriseRoleIds.length){
+ data.enterpriseRoleIds = data.enterpriseRoleIds.split(',')
+ } else {
+ data.enterpriseRoleIds = []
+ }
that.setData({ form: data })
})
}
@@ -33,52 +39,83 @@ Scene({
this.data.form[e.currentTarget.id] = e.detail
},
chooseMethod: function(e){
- if(e.currentTarget.id == 'bankName'){
- this.setData({ visible: true })
- } else {
- this.setData({ show: true })
- }
- },
- registCustomer: function(){
- wx.navigateTo({ url: `/pages/client/registe/index?id=${this.data.form.id}` })
+ this.setData({ visible: true })
},
onHide: function() {
this.setData({ visible: false })
},
onConfirm: function({detail}) {
- this.setData({ visible: false, ['form.bankName']: detail.value })
+ var rolename = ''
+ for (let index = 0; index < this.data.roleList.length; index++) {
+ const element = this.data.roleList[index]
+ if(detail.indexOf(element.id) > -1){
+ if(util.isEmpty(rolename)){
+ rolename = element.name
+ } else {
+ rolename += ',' + element.name
+ }
+ }
+ }
+ this.setData({ visible: false, ['form.enterpriseRoleIds']: detail, ['form.enterpriseRoleNames']: rolename })
+ },
+ onChange: function({detail}) {
+ this.setData({ ['form.status']: detail })
},
submitForm: function(){
- if (util.isEmpty(this.data.form.name)) {
- util.showToast('请输入客户姓名')
+ if (util.isEmpty(this.data.form.enterpriseRoleIds) || !this.data.form.enterpriseRoleIds.length) {
+ util.showToast('员工角色')
return
}
- if (util.isEmpty(this.data.form.defaultPaymentMethod)) {
- util.showToast('请选择客户的付款方式')
- return
+ wx.showLoading({ title: '处理中', mask: true })
+ if(!util.isEmpty(this.data.form.joinAt)){
+ this.data.form.joinAt = this.data.form.joinAt.substring(0, 10)
}
- if (util.isEmpty(this.data.form.defaultPaymentMethod)) {
- this.data.form.defaultPaymentMethod = 1
+ editEmploye(this.data.form).then(result => {
+ wx.hideLoading()
+ util.showBackToast('修改成功')
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
+ },
+ agreeForm: function(){
+ if (util.isEmpty(this.data.form.enterpriseRoleIds) || !this.data.form.enterpriseRoleIds.length) {
+ util.showToast('员工角色')
+ return
}
- wx.showLoading({ title: '正在获取', mask: true })
- if(this.data.form.id) {
- editCustomer(this.data.form).then(result => {
- wx.hideLoading()
- util.showBackToast('修改成功')
- event.emit('EventMessage', { what: 102, detail: this.data.form })
- }).catch(err => {
- wx.hideLoading()
- util.showToast(err)
- })
- } else {
- saveCustomer(this.data.form).then(result => {
+ wx.showLoading({ title: '处理中', mask: true })
+ this.data.form.status = 1
+ auditEmploye(this.data.form).then(result => {
+ wx.hideLoading()
+ util.showBackToast('员工已经加入')
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
+ },
+ refuseform: function(){
+ wx.showLoading({ title: '处理中', mask: true })
+ this.data.form.status = 2
+ auditEmploye(this.data.form).then(result => {
+ wx.hideLoading()
+ util.showBackToast('员工已经拒绝')
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
+ },
+ deleteForm: function(){
+ Dialog.confirm({ title: '温馨提示', message: '确定删除该员工?' }).then(() => {
+ wx.showLoading({ title: '处理中', mask: true })
+ deleteEmploye({idList: [this.data.form.enterpriseMemberId] }).then(result => {
wx.hideLoading()
- util.showBackToast('添加成功')
- event.emit('EventMessage', { what: 102, detail: this.data.form })
+ util.showBackToast('员工已经删除')
+ const channel = this.getOpenerEventChannel()
+ channel.emit('onCallback', { what: 120, desc: 'PaymentOrder' })
}).catch(err => {
wx.hideLoading()
util.showToast(err)
})
- }
+ })
}
})
\ No newline at end of file
diff --git a/pages/home/employee-info/index.json b/pages/home/employee-info/index.json
index 5a722f0..4874e67 100644
--- a/pages/home/employee-info/index.json
+++ b/pages/home/employee-info/index.json
@@ -7,8 +7,11 @@
"van-image": "/components/image/index",
"van-icon": "/components/icon/index",
"van-notice-bar": "/components/notice-bar/index",
- "van-picker": "/components/picker/index",
+ "van-checker": "/components/checker/index",
"van-popup": "/components/popup/index",
+ "van-radio": "/components/radio/index",
+ "van-radio-group": "/components/radio-group/index",
+ "van-dialog": "/components/dialog/index",
"notification": "/pages/message/notification/index"
}
}
\ No newline at end of file
diff --git a/pages/home/employee-info/index.wxml b/pages/home/employee-info/index.wxml
index 6aa9cc5..2a7e4c5 100644
--- a/pages/home/employee-info/index.wxml
+++ b/pages/home/employee-info/index.wxml
@@ -2,23 +2,37 @@
员工资料
-
-
-
-
-
-
-
-
-
- 删除
-
- 保存
+
+
+
+
+
+
+
+ 员工状态:
+
+
+ 启用
+ 停用
+
+
+
+
+
+ 删除
+
+ 保存
+
+
+ 拒绝
+
+ 同意
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index f39be3b..d02655f 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -15,7 +15,6 @@ Scene({
loading: true,
checkList: [],
memberList: [],
- eemidList: [],
showEmbedded: false,
show: false,
actions: [
@@ -28,24 +27,17 @@ Scene({
*/
onLoad: function (options) {
this.setData({ height: app.globalData.fragmentHeight })
- wx.showLoading({ title: '加载中', mask: true })
this.fetchMemberList()
},
fetchMemberList: function(){
+ wx.showLoading({ title: '加载中', mask: true })
getCheckList({enterpriseId: app.userInfo.enterpriseId}).then(result => {
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.records.length; index++) {
- const element = result.data.records[index]
- if(element.position == 'ADMINISTRATOR'){
- this.data.eemidList.push(element.id)
- }
- }
this.setData({ memberList: result.data.records, loading: false })
wx.hideLoading()
}).catch(err => {
@@ -57,18 +49,13 @@ Scene({
this.data.nowIndex = e.currentTarget.dataset.index
var item = this.data.memberList[this.data.nowIndex]
item.apply = 0
- // if(item.position == 'ADMINISTRATOR'){
- // this.setData({ actions: [ { id: 1, name: '删除该员工' } ], show: true })
- // } else [
- // this.setData({ actions: [ { id: 2, name: '设为管理员' }, { id: 1, name: '删除该员工' } ], show: true })
- // ]
wx.navigateTo({
url: `/pages/home/employee-info/index?id=${item.enterpriseMemberId}`,
events: {
onCallback: (data) => {
- // if (data.what == 12) {
- // that.fetchOrderInfo(that.data.form.id)
- // }
+ if (data.what == 120) {
+ that.fetchMemberList()
+ }
}
},
success: function(res) {
@@ -76,77 +63,62 @@ Scene({
}
})
},
- onClose() {
- this.setData({ show: false })
- this.data.nowIndex = -1
- },
- onSelect({detail}) {
- if(detail.id === 1){
- var item = this.data.memberList[this.data.nowIndex]
- this.deleteItem(this.data.nowIndex, item)
- this.data.nowIndex = -1
- } else if(detail.id === 2){
- var item = this.data.memberList[this.data.nowIndex]
- this.setAdmin(this.data.nowIndex, item)
- this.data.nowIndex = -1
- }
- },
- setAdmin: function(index, item){
- wx.showLoading({ title: '加载中', mask: true })
- if(item.position == 'ADMINISTRATOR'){
- var sindex = -1
- for (var i = 0; i < this.data.eemidList.length; i++) {
- if (this.data.eemidList[i] == item.id){
- sindex = i
- break
- }
- }
- this.data.eemidList.splice(sindex, 1)
- } else {
- if(this.data.eemidList.indexOf(item.id) < 0){
- this.data.eemidList.push(item.id)
- }
- }
- adminEmploye({ids: this.data.eemidList }).then(result => {
- this.setData({ ['memberList[' + index + '].position'] : item.position == 'ADMINISTRATOR' ? 'ORDINARY' : 'ADMINISTRATOR'})
- wx.hideLoading()
- }).catch(err => {
- wx.hideLoading()
- util.showToast(err)
- })
- },
- deleteItem: function(index, item){
- wx.showLoading({ title: '加载中', mask: true })
- deleteEmploye({idList: [item.enterpriseMemberId] }).then(result => {
- this.fetchMemberList()
- }).catch(err => {
- wx.hideLoading()
- util.showToast(err)
- })
- },
- agreeItem: function(e){
- wx.showLoading({ title: '加载中', mask: true })
- var item = this.data.checkList[e.currentTarget.dataset.index]
- auditEmploye({id: item.id, status: 1 }).then(result => {
- this.fetchMemberList()
- }).catch(err => {
- wx.hideLoading()
- console.log(err)
- util.showToast(err)
- })
- },
- refuseItem: function(e){
- wx.showLoading({ title: '加载中', mask: true })
- var item = this.data.checkList[e.currentTarget.dataset.index]
- auditEmploye({id: item.id, status: 2 }).then(result => {
- this.setData({ ['checkList[' + e.currentTarget.dataset.index + '].status']: 2})
- wx.hideLoading()
- }).catch(err => {
- wx.hideLoading()
- console.log(err)
- util.showToast(err)
- })
- },
+ // setAdmin: function(index, item){
+ // wx.showLoading({ title: '加载中', mask: true })
+ // if(item.position == 'ADMINISTRATOR'){
+ // var sindex = -1
+ // for (var i = 0; i < this.data.eemidList.length; i++) {
+ // if (this.data.eemidList[i] == item.id){
+ // sindex = i
+ // break
+ // }
+ // }
+ // this.data.eemidList.splice(sindex, 1)
+ // } else {
+ // if(this.data.eemidList.indexOf(item.id) < 0){
+ // this.data.eemidList.push(item.id)
+ // }
+ // }
+ // adminEmploye({ids: this.data.eemidList }).then(result => {
+ // this.setData({ ['memberList[' + index + '].position'] : item.position == 'ADMINISTRATOR' ? 'ORDINARY' : 'ADMINISTRATOR'})
+ // wx.hideLoading()
+ // }).catch(err => {
+ // wx.hideLoading()
+ // util.showToast(err)
+ // })
+ // },
+ // deleteItem: function(index, item){
+ // wx.showLoading({ title: '加载中', mask: true })
+ // deleteEmploye({idList: [item.enterpriseMemberId] }).then(result => {
+ // this.fetchMemberList()
+ // }).catch(err => {
+ // wx.hideLoading()
+ // util.showToast(err)
+ // })
+ // },
+ // agreeItem: function(e){
+ // wx.showLoading({ title: '加载中', mask: true })
+ // var item = this.data.checkList[e.currentTarget.dataset.index]
+ // auditEmploye({id: item.id, status: 1 }).then(result => {
+ // this.fetchMemberList()
+ // }).catch(err => {
+ // wx.hideLoading()
+ // console.log(err)
+ // util.showToast(err)
+ // })
+ // },
+ // refuseItem: function(e){
+ // wx.showLoading({ title: '加载中', mask: true })
+ // var item = this.data.checkList[e.currentTarget.dataset.index]
+ // auditEmploye({id: item.id, status: 2 }).then(result => {
+ // this.setData({ ['checkList[' + e.currentTarget.dataset.index + '].status']: 2})
+ // wx.hideLoading()
+ // }).catch(err => {
+ // wx.hideLoading()
+ // console.log(err)
+ // util.showToast(err)
+ // })
+ // },
onClickHideEmbedded: function(){
this.setData({ showEmbedded: false })
},
@@ -186,8 +158,5 @@ Scene({
that.setData({ showEmbedded: false })
}
})
- },
- noop: function() {
-
}
})
\ No newline at end of file
diff --git a/pages/home/employee/index.json b/pages/home/employee/index.json
index cc1884b..0771f56 100644
--- a/pages/home/employee/index.json
+++ b/pages/home/employee/index.json
@@ -9,7 +9,6 @@
"van-tag": "/components/tag/index",
"van-icon": "/components/icon/index",
"van-overlay": "/components/overlay/index",
- "van-action-sheet": "/components/action-sheet/index",
"notification": "/pages/message/notification/index"
}
}
\ No newline at end of file
diff --git a/pages/home/employee/index.wxml b/pages/home/employee/index.wxml
index 355a07d..943d8c0 100644
--- a/pages/home/employee/index.wxml
+++ b/pages/home/employee/index.wxml
@@ -76,6 +76,4 @@
-
-
\ No newline at end of file