diff --git a/public/components/property/selectStaff/selectStaff.html b/public/components/property/selectStaff/selectStaff.html index 685b74c93..b8d52e767 100644 --- a/public/components/property/selectStaff/selectStaff.html +++ b/public/components/property/selectStaff/selectStaff.html @@ -3,28 +3,50 @@
- +
-
+
公司信息
-
青海开机公司
-
青海开机公司
-
青海开机公司
-
青海开机公司
-
青海开机公司
-
青海开机公司
- -
青海开机公司
-
青海开机公司
-
青海开机公司
-
青海开机公司
-
青海开机公司
+
+
+ + + {{item.orgName}} + +
+
-
+
部门信息
+
+
+ + + {{item.orgName}} + +
+
-
+
员工信息
+
+
+ + + {{item.name}} + +
+
diff --git a/public/components/property/selectStaff/selectStaff.js b/public/components/property/selectStaff/selectStaff.js index 353bffee3..5b0aae606 100644 --- a/public/components/property/selectStaff/selectStaff.js +++ b/public/components/property/selectStaff/selectStaff.js @@ -1,5 +1,5 @@ (function (vc) { - + var default_row = 50; vc.extends({ data: { selectStaffInfo: { @@ -8,37 +8,52 @@ describle: '', companys: [], departments: [], - staffs: [] + staffs: [], + curCompanyId: '', + curDepartmentId: '', + curStaffId: '', + curStaffName: '', + staff: {} } }, _initMethod: function () { $that._initSelectStaffInfo(); }, _initEvent: function () { - vc.on('selectStaff','openStaff',function(){ + vc.on('selectStaff', 'openStaff', function (_staff) { + //查询公司信息 + $that._initOrg(2, ''); $('#selectStaffModel').modal('show'); - }) + $that.staff = _staff; + }); }, methods: { _initSelectStaffInfo: function () { - $('.dropdown li a').click(function () { - console.log(this); - title = $(this).attr("data-title"); - id = $(this).attr("data-index"); - $("#select-title").text(title); - $("#category_id").val(id); - }); + }, - _changeCompany: function (_e) { - console.log(_e); + _changeCompany: function (item) { + $that.selectStaffInfo.curCompanyId = item.orgId; + //查询部门 + $that._initOrg(3, $that.selectStaffInfo.curCompanyId); }, - _initOrg:function(_orgLevel,_parentOrgId){ + _changeDepartment: function (item) { + $that.selectStaffInfo.curDepartmentId = item.orgId; + //查询部门 + $that.loadStaff(); + }, + _changeStaff: function (item) { + console.log('selectStaff',item); + $that.staff.staffId = item.userId; + $that.staff.staffName = item.userName; + $('#selectStaffModel').modal('hide'); + }, + _initOrg: function (_orgLevel, _parentOrgId) { var param = { params: { - page:1, - row:100, + page: 1, + row: 100, orgLevel: _orgLevel, parentOrgId: _parentOrgId } @@ -50,19 +65,60 @@ param, function (json, res) { var _orgManageInfo = JSON.parse(json); - if(_orgLevel == 1){ + if (_orgLevel == 2) { $that.selectStaffInfo.companys = _orgManageInfo.orgs; - }else if(_orgLevel == 2){ + 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; - }else{ + 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 = { + params: { + page: 1, + rows: default_row, + row: default_row, + orgId: $that.selectStaffInfo.curDepartmentId + } + }; + + //发送get请求 + vc.http.get('staff', + 'loadData', + param, + function (json) { + var _staffInfo = JSON.parse(json); + $that.selectStaffInfo.staffs = _staffInfo.staffs; + + if (_staffInfo.staffs.length < 1) { + return; + } + $that.selectStaffInfo.curStaffId = _staffInfo.staffs[0].orgId + }, function () { + console.log('请求失败处理'); + } + ); + + }, + } }); diff --git a/public/css/vc-ui.css b/public/css/vc-ui.css index d6b83f61a..a4bb42534 100644 --- a/public/css/vc-ui.css +++ b/public/css/vc-ui.css @@ -1747,5 +1747,50 @@ table.table-mail tr td { border-left:1px solid #e7eaec; } +.select{ + color: #1ab394; +} + +.overflow-hidden{ + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.staff{ + overflow-y:auto; + height:400px +} + +.staff div span{ + cursor: pointer; + background: #ffffff; + transition-duration: 0.5s; +} +.staff div span:hover{ + font-size: 20px; + color: #1ab394; +} + + +.staff::-webkit-scrollbar {/*滚动条整体样式*/ + width: 4px; /*高宽分别对应横竖滚动条的尺寸*/ + height: 4px; +} +.staff::-webkit-scrollbar-thumb {/*滚动条里面小方块*/ + border-radius: 5px; + -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + background: rgba(0,0,0,0.2); +} +.staff::-webkit-scrollbar-track {/*滚动条里面轨道*/ + -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + border-radius: 0; + background: rgba(0,0,0,0.1); +} + +.staff div{ + +} + diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.html b/public/pages/property/workflowSettingManage/workflowSettingManage.html index a4b8f60f5..39be63cf2 100644 --- a/public/pages/property/workflowSettingManage/workflowSettingManage.html +++ b/public/pages/property/workflowSettingManage/workflowSettingManage.html @@ -34,8 +34,8 @@
@@ -66,8 +66,8 @@
diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.js b/public/pages/property/workflowSettingManage/workflowSettingManage.js index 4d1244a1c..68997a94f 100644 --- a/public/pages/property/workflowSettingManage/workflowSettingManage.js +++ b/public/pages/property/workflowSettingManage/workflowSettingManage.js @@ -157,8 +157,9 @@ } $that.workflowSettingInfo.steps.push(_step); }, - chooseStaff: function () { - vc.emit('selectStaff','openStaff',{}) + chooseStaff: function (item) { + console.log(item); + vc.emit('selectStaff','openStaff',item); }, _goBack: function () { vc.getBack();