diff --git a/api/saas.js b/api/saas.js index feeff8e..3110af3 100644 --- a/api/saas.js +++ b/api/saas.js @@ -10,6 +10,7 @@ const sconfig = { } // *****************************************账户业务********************************************** const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig) +const deleteEmploye = (params) => mPost(`/recycle-user-center/remove/employees`, params, sconfig) const getUserInfo = () => mGet(`/recycle-user-center/user/get/user-info`, null, sconfig) const getEmployeList = (params) => mGet(`/recycle-user-center/get/self-department-member-list`, params, sconfig) const getRoleList = (params) => mGet(`/recycle-user-center/get/self-department-role-list`, params, sconfig) @@ -166,5 +167,6 @@ export { deleteCar, getOrderLog, getPlateList, - savePlateNumber + savePlateNumber, + deleteEmploye } \ No newline at end of file diff --git a/api/user.js b/api/user.js index b0c5754..c5f265e 100644 --- a/api/user.js +++ b/api/user.js @@ -31,7 +31,6 @@ const bindAccount = (params) => mPost(`/uec/bind/primary-account`, params, confi const applyEmplyee = (params) => mPost(`/uec/save/join/of/enterprise-department`, params, config) const getCheckList = (params) => mGet(`/uec/get/employee-joining-department-application-list`, params, config) const auditEmploye = (params) => mPost(`/uec/modify/join/of/enterprise-department`, params, config) -const deleteEmploye = (params) => mPost(`/uec/remove/employees`, params, config) const editEmploye = (params) => mPost(`/uec/save/self-department-member`, params, config) // **************************************************************************************************************************************** // /authorize/by-wechat-applet小程序登录 @@ -249,6 +248,5 @@ export { applyEmplyee, getCheckList, auditEmploye, - deleteEmploye, editEmploye } \ No newline at end of file diff --git a/pages/home/employee-info/index.js b/pages/home/employee-info/index.js index fd922cb..46f785e 100644 --- a/pages/home/employee-info/index.js +++ b/pages/home/employee-info/index.js @@ -2,7 +2,8 @@ import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' import { getRoleList} from "../../../api/saas" -import { editEmploye, deleteEmploye, auditEmploye } from "../../../api/user" +import { editEmploye, auditEmploye } from "../../../api/user" +import { deleteEmploye } from "../../../api/saas" const util = require('../../../utils/util') const event = require('../../../utils/event') @@ -113,7 +114,8 @@ Scene({ deleteForm: function(){ Dialog.confirm({ title: '温馨提示', message: '确定删除该员工?' }).then(() => { wx.showLoading({ title: '处理中', mask: true }) - deleteEmploye({idList: [this.data.form.enterpriseMemberId] }).then(result => { + var enterpriseDepartmentId = this.data.form.enterpriseDepartmentId + deleteEmploye({idList: [this.data.form.enterpriseMemberId], enterpriseDepartmentId }).then(result => { wx.hideLoading() util.showBackToast('员工已经删除') const channel = this.getOpenerEventChannel() diff --git a/pages/setting/vehicle-list/index.js b/pages/setting/vehicle-list/index.js index bea81e0..ed81773 100644 --- a/pages/setting/vehicle-list/index.js +++ b/pages/setting/vehicle-list/index.js @@ -63,7 +63,7 @@ Scene({ var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum - var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + var finished = result.data.current >= result.data.total this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ finished: true, requesting: false, loading: false }) @@ -108,5 +108,4 @@ Scene({ onUnload: function(){ event.remove('OrderMessage', this) } - }) \ No newline at end of file