From 355205431f7435516ac66ffdafe114763d28b608 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sat, 13 Aug 2022 01:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E7=9B=B8=E5=85=B3=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addPrivilegeGroup/addPrivilegeGroup.html | 10 +-- .../frame/orgTreeShow/orgTreeShow.html | 4 + .../frame/orgTreeShow/orgTreeShow.js | 87 +++++++++++++++++++ .../property/selectStaff/selectStaff.html | 34 ++------ .../property/selectStaff/selectStaff.js | 67 ++------------ 5 files changed, 108 insertions(+), 94 deletions(-) create mode 100644 public/components/frame/orgTreeShow/orgTreeShow.html create mode 100644 public/components/frame/orgTreeShow/orgTreeShow.js diff --git a/public/components/dev/addPrivilegeGroup/addPrivilegeGroup.html b/public/components/dev/addPrivilegeGroup/addPrivilegeGroup.html index ce17fd25d..651114929 100755 --- a/public/components/dev/addPrivilegeGroup/addPrivilegeGroup.html +++ b/public/components/dev/addPrivilegeGroup/addPrivilegeGroup.html @@ -3,19 +3,19 @@

- +

{{addPrivilegeGroupInfo.errorInfo}}

- -
+ +
- -
+ +
-
+
- +
-
-
- - - {{item.orgName}} - -
+
+
-
-
- -
-
-
- - - {{item.orgName}} - -
-
-
-
+
diff --git a/public/components/property/selectStaff/selectStaff.js b/public/components/property/selectStaff/selectStaff.js index 695f264d5..f6022ffae 100755 --- a/public/components/property/selectStaff/selectStaff.js +++ b/public/components/property/selectStaff/selectStaff.js @@ -17,33 +17,21 @@ } }, _initMethod: function() { - $that._initSelectStaffInfo(); }, _initEvent: function() { vc.on('selectStaff', 'openStaff', function(_staff) { //查询公司信息 - $that._initOrg(2, ''); $('#selectStaffModel').modal('show'); $that.selectStaffInfo.staff = _staff; $that.staff = _staff; }); + vc.on('selectStaff','switchOrg',function(_param){ + $that.loadStaff(_param); + }) + }, methods: { - _initSelectStaffInfo: function() { - - }, - - _changeCompany: function(item) { - $that.selectStaffInfo.curCompanyId = item.orgId; - //查询部门 - $that._initOrg(3, $that.selectStaffInfo.curCompanyId); - }, - _changeDepartment: function(item) { - $that.selectStaffInfo.curDepartmentId = item.orgId; - //查询部门 - $that.loadStaff(); - }, _changeStaff: function(item) { $that.staff.staffId = item.userId; $that.staff.staffName = item.userName; @@ -52,54 +40,13 @@ $that.staff.call($that.staff); } }, - _initOrg: function(_orgLevel, _parentOrgId) { - var param = { - params: { - page: 1, - row: 100, - orgLevel: _orgLevel, - parentOrgId: _parentOrgId - } - }; - - //发送get请求 - vc.http.apiGet('/org.listOrgs', - param, - function(json, res) { - var _orgManageInfo = JSON.parse(json); - if (_orgLevel == 2) { - $that.selectStaffInfo.companys = _orgManageInfo.orgs; - if (_orgManageInfo.orgs.length < 1) { - return; - } - $that.selectStaffInfo.curCompanyId = _orgManageInfo.orgs[0].orgId - //查询部门 - $that._initOrg(3, $that.selectStaffInfo.curCompanyId); - } else if (_orgLevel == 3) { - $that.selectStaffInfo.departments = _orgManageInfo.orgs; - if (_orgManageInfo.orgs.length < 1) { - return; - } - $that.selectStaffInfo.curDepartmentId = _orgManageInfo.orgs[0].orgId - //查询部门 - $that.loadStaff(); - } else { - $that.selectStaffInfo.staffs = _orgManageInfo.orgs; - } - - }, - function(errInfo, error) { - console.log('请求失败处理'); - } - ); - }, - loadStaff: function() { - var param = { + loadStaff: function(_org) { + let param = { params: { page: 1, rows: default_row, row: default_row, - orgId: $that.selectStaffInfo.curDepartmentId + orgId: _org.orgId } };