From 0ecb758e8564395dc75e9e99065fb0de77cb0191 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 27 Jul 2022 15:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/addRoleStaff/addRoleStaff.html | 77 ++++++++++ .../frame/addRoleStaff/addRoleStaff.js | 138 ++++++++++++++++++ .../deleteRoleStaff/deleteRoleStaff.html | 21 +++ .../frame/deleteRoleStaff/deleteRoleStaff.js | 49 +++++++ .../components/frame/roleStaff/roleStaff.html | 82 +++++++++++ .../components/frame/roleStaff/roleStaff.js | 84 +++++++++++ public/components/property/editCar/editCar.js | 2 +- public/pages/frame/role/role.html | 5 +- public/pages/frame/role/role.js | 14 +- .../property/listOwnerCar/listOwnerCar.html | 28 ++-- 10 files changed, 478 insertions(+), 22 deletions(-) create mode 100644 public/components/frame/addRoleStaff/addRoleStaff.html create mode 100644 public/components/frame/addRoleStaff/addRoleStaff.js create mode 100644 public/components/frame/deleteRoleStaff/deleteRoleStaff.html create mode 100644 public/components/frame/deleteRoleStaff/deleteRoleStaff.js create mode 100644 public/components/frame/roleStaff/roleStaff.html create mode 100644 public/components/frame/roleStaff/roleStaff.js diff --git a/public/components/frame/addRoleStaff/addRoleStaff.html b/public/components/frame/addRoleStaff/addRoleStaff.html new file mode 100644 index 000000000..d87764235 --- /dev/null +++ b/public/components/frame/addRoleStaff/addRoleStaff.html @@ -0,0 +1,77 @@ + \ No newline at end of file diff --git a/public/components/frame/addRoleStaff/addRoleStaff.js b/public/components/frame/addRoleStaff/addRoleStaff.js new file mode 100644 index 000000000..8aa250fe7 --- /dev/null +++ b/public/components/frame/addRoleStaff/addRoleStaff.js @@ -0,0 +1,138 @@ +(function(vc) { + var DEFAULT_ROWS = 10 + vc.extends({ + propTypes: { + emitListener: vc.propTypes.string, + emitFunction: vc.propTypes.string + }, + data: { + addRoleStaffInfo: { + staffs: [], + staffName: '', + roleId: '', + orgName: '', + selectStaffs: [] + } + }, + watch: { // 监视双向绑定的数据数组 + checkData: { + handler() { // 数据数组有变化将触发此函数 + if (vc.component.addRoleStaffInfo.selectStaffs.length == vc.component.addRoleStaffInfo.staffs.length) { + document.querySelector('#quan').checked = true; + } else { + document.querySelector('#quan').checked = false; + } + }, + deep: true // 深度监视 + } + }, + _initMethod: function() {}, + _initEvent: function() { + vc.on('addRoleStaff', 'openAddRoleStaffModal', function(_param) { + vc.component._refreshChooseOrgInfo(); + $('#addRoleStaffModel').modal('show'); + vc.copyObject(_param, vc.component.addRoleStaffInfo); + vc.component._loadAllStaffInfo(1, 10, ''); + }); + + vc.on('addRoleStaff', 'paginationPlus', 'page_event', function(_currentPage) { + vc.component._loadAllStaffInfo(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _loadAllStaffInfo: function(_page, _row, _name) { + let param = { + params: { + page: _page, + row: _row, + userName: _name, + roleId: vc.component.addRoleStaffInfo.roleId + } + }; + + //发送get请求 + vc.http.apiGet('/role.listStaffsNoRole', + param, + function(json) { + var _staffInfo = JSON.parse(json); + vc.component.addRoleStaffInfo.staffs = _staffInfo.data; + vc.emit('addRoleStaff', 'paginationPlus', 'init', { + total: _staffInfo.records, + currentPage: _page + }); + }, + function() { + console.log('请求失败处理'); + } + ); + }, + addRoleStaff: function(_org) { + var _selectStaffs = vc.component.addRoleStaffInfo.selectStaffs; + var _tmpStaffs = vc.component.addRoleStaffInfo.staffs; + if (_selectStaffs.length < 1) { + vc.toast("请选择小区"); + return; + } + let _staffs = []; + for (var _selectIndex = 0; _selectIndex < _selectStaffs.length; _selectIndex++) { + for (var _staffIndex = 0; _staffIndex < _tmpStaffs.length; _staffIndex++) { + if (_selectStaffs[_selectIndex] == _tmpStaffs[_staffIndex].userId) { + _staffs.push({ + staffId: _tmpStaffs[_staffIndex].userId, + staffName: _tmpStaffs[_staffIndex].userName + }); + } + } + } + let _objData = { + roleId: vc.component.addRoleStaffInfo.roleId, + orgName: vc.component.addRoleStaffInfo.orgName, + staffs: _staffs + } + vc.http.apiPost('/role.saveRoleStaff', + JSON.stringify(_objData), { + emulateJSON: true + }, + function(json, res) { + $('#addRoleStaffModel').modal('hide'); + let _json = JSON.parse(json) + if (_json.code == 0) { + vc.emit($props.emitListener, $props.emitFunction, {}); + return; + } + vc.toast(_json.msg); + }, + function() { + console.log('请求失败处理'); + } + ); + $('#addRoleStaffModel').modal('hide'); + }, + queryStaffs: function() { + vc.component._loadAllStaffInfo(1, 10, vc.component.addRoleStaffInfo.staffName); + }, + _refreshChooseOrgInfo: function() { + vc.component.addRoleStaffInfo = { + staffs: [], + staffName: '', + roleId: '', + orgName: '', + selectStaffs: [] + }; + }, + checkAll: function(e) { + var checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项 + if (e.target.checked) { // 判定全选checkbox的勾选状态 + for (var i = 0; i < checkObj.length; i++) { + if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中 + vc.component.addRoleStaffInfo.selectStaffs.push(checkObj[i].value); + } + } + } else { // 如果是去掉全选则清空checkbox选项绑定数组 + vc.component.addRoleStaffInfo.selectStaffs = []; + } + } + } + + }); +})(window.vc); \ No newline at end of file diff --git a/public/components/frame/deleteRoleStaff/deleteRoleStaff.html b/public/components/frame/deleteRoleStaff/deleteRoleStaff.html new file mode 100644 index 000000000..b1f838722 --- /dev/null +++ b/public/components/frame/deleteRoleStaff/deleteRoleStaff.html @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/public/components/frame/deleteRoleStaff/deleteRoleStaff.js b/public/components/frame/deleteRoleStaff/deleteRoleStaff.js new file mode 100644 index 000000000..de2105548 --- /dev/null +++ b/public/components/frame/deleteRoleStaff/deleteRoleStaff.js @@ -0,0 +1,49 @@ +(function(vc, vm) { + + vc.extends({ + data: { + deleteRoleStaffInfo: { + + } + }, + _initMethod: function() { + + }, + _initEvent: function() { + vc.on('deleteRoleStaff', 'openDeleteRoleStaffModal', function(_params) { + + vc.component.deleteRoleStaffInfo = _params; + $('#deleteRoleStaffModel').modal('show'); + + }); + }, + methods: { + deleteRoleStaff: function() { + vc.http.apiPost( + '/role.deleteRoleStaff', + JSON.stringify(vc.component.deleteRoleStaffInfo), { + emulateJSON: true + }, + function(json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + if (res.status == 200) { + //关闭model + $('#deleteRoleStaffModel').modal('hide'); + vc.emit('roleStaffInfo', 'listRoleStaff', {}); + return; + } + vc.toast(json); + }, + function(errInfo, error) { + console.log('请求失败处理'); + vc.toast(json); + + }); + }, + closeDeleteRoleStaffModel: function() { + $('#deleteRoleStaffModel').modal('hide'); + } + } + }); + +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/components/frame/roleStaff/roleStaff.html b/public/components/frame/roleStaff/roleStaff.html new file mode 100644 index 000000000..f23f55b85 --- /dev/null +++ b/public/components/frame/roleStaff/roleStaff.html @@ -0,0 +1,82 @@ +
+ +
+
+
+ +
+
+ +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
{{staff.name}}{{staff.tel}}{{staff.email}}{{staff.address}}{{staff.sex == 0 ? '男' : '女'}} +
+ +
+
+
    +
    + + + + + + + + \ No newline at end of file diff --git a/public/components/frame/roleStaff/roleStaff.js b/public/components/frame/roleStaff/roleStaff.js new file mode 100644 index 000000000..519cafdb8 --- /dev/null +++ b/public/components/frame/roleStaff/roleStaff.js @@ -0,0 +1,84 @@ +/** + 入驻小区 + **/ +(function(vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + var ALL_ROWS = 100; + vc.extends({ + data: { + roleStaffInfo: { + staffs: [], + total: 0, + records: 1, + moreCondition: false, + pgId: '', + staffName: '', + + } + }, + _initMethod: function() { + + }, + _initEvent: function() { + vc.on('roleStaffInfo', 'openRoleStaff', function(_param) { + vc.copyObject(_param, vc.component.roleStaffInfo); + vc.component._listRoleStaffs(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('roleStaffInfo', 'listRoleStaff', function(_param) { + //vc.copyObject(_param, vc.component.roleStaffInfo.conditions); + vc.component._listRoleStaffs(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function(_currentPage) { + vc.component._listRoleStaffs(_currentPage, DEFAULT_ROWS); + }); + + }, + methods: { + _listRoleStaffs: function(_page, _rows) { + + let param = { + params: { + page: _page, + row: _rows, + roleId: vc.component.roleStaffInfo.pgId, + userName: $that.roleStaffInfo.staffName + } + }; + + //发送get请求 + vc.http.apiGet('/role.listRoleStaff', + param, + function(json, res) { + var _roleStaffInfo = JSON.parse(json); + vc.component.roleStaffInfo.total = _roleStaffInfo.total; + vc.component.roleStaffInfo.records = _roleStaffInfo.records; + vc.component.roleStaffInfo.staffs = _roleStaffInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.roleStaffInfo.records, + dataCount: vc.component.roleStaffInfo.total, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openAddRoleStaffModal: function() { + vc.emit('addRoleStaff', 'openAddRoleStaffModal', { + roleId: vc.component.roleStaffInfo.pgId, + orgName: vc.component.roleStaffInfo.orgName + }); + }, + _openDeleteRoleStaffModel: function(_roleStaff) { + _roleStaff.roleId = $that.roleStaffInfo.pgId; + vc.emit('deleteRoleStaff', 'openDeleteRoleStaffModal', _roleStaff); + }, + _queryRoleStaffMethod: function() { + vc.component._listRoleStaffs(DEFAULT_PAGE, DEFAULT_ROWS); + + }, + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/components/property/editCar/editCar.js b/public/components/property/editCar/editCar.js index b18a637bb..86bfb3419 100755 --- a/public/components/property/editCar/editCar.js +++ b/public/components/property/editCar/editCar.js @@ -134,7 +134,7 @@ //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); let _json = JSON.parse(json) - if (_json.code != 0) { + if (_json.code == 0) { //关闭model $('#editCarModal').modal('hide'); vc.emit('listOwnerCar', 'listOwnerCarData', {}); diff --git a/public/pages/frame/role/role.html b/public/pages/frame/role/role.html index 3e7a74996..f881f40ff 100755 --- a/public/pages/frame/role/role.html +++ b/public/pages/frame/role/role.html @@ -18,7 +18,10 @@
    - + +
    +
    +
    diff --git a/public/pages/frame/role/role.js b/public/pages/frame/role/role.js index 22887d447..d95ea515a 100755 --- a/public/pages/frame/role/role.js +++ b/public/pages/frame/role/role.js @@ -1,4 +1,4 @@ -(function (vc) { +(function(vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ @@ -9,17 +9,17 @@ }, }, - _initMethod: function () { + _initMethod: function() { }, - _initEvent: function () { - vc.on('role', 'switchRole', function (_param) { + _initEvent: function() { + vc.on('role', 'switchRole', function(_param) { $that.roleInfo.curRole = _param; $that._changeRoleTab('privilege') }) }, methods: { - _changeRoleTab: function (_tabName) { + _changeRoleTab: function(_tabName) { $that.roleInfo.tabName = _tabName; if (_tabName == 'privilege') { vc.emit('privilegeTree', 'loadPrivilege', $that.roleInfo.curRole.pgId); @@ -27,6 +27,10 @@ if (_tabName == 'community') { vc.emit('roleCommunityInfo', 'openRoleCommunity', { pgId: $that.roleInfo.curRole.pgId }); } + if (_tabName == 'staff') { + vc.emit('roleStaffInfo', 'openRoleStaff', { pgId: $that.roleInfo.curRole.pgId }); + } + } }, }); diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html index 247308fc7..de4ecc22f 100755 --- a/public/pages/property/listOwnerCar/listOwnerCar.html +++ b/public/pages/property/listOwnerCar/listOwnerCar.html @@ -5,8 +5,7 @@
    -
    @@ -25,7 +24,7 @@