liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '权限' (#14) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/14
This commit is contained in:
liang.cheng 2022-11-08 09:51:44 +08:00
parent 69441eca6c 3b4592adb5
commit 967453d11b
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pc4mobx/organization/components/newImport/stepContent.js
View File

@ -233,14 +233,18 @@ export default class StepDialog extends React.Component {
return ( return (
<div> <div>
{ {
current == 0 && <WeaTransfer current == 0 &&
data={toJS(data)} <div>
selectedKeys={toJS(selectedKeys)} <p style={{"color":"red","fontSize":"15px"}}>注意:右侧列表默认加载的为必填字段！！！</p>
onChange={(keys, datas) => { <WeaTransfer
newImport.setSelectedKeys(keys); data={toJS(data)}
newImport.setSelectData(datas); selectedKeys={toJS(selectedKeys)}
}} onChange={(keys, datas) => {
/> newImport.setSelectedKeys(keys);
newImport.setSelectData(datas);
}}
/>
</div>
} }
{ {
current == 1 && <WeaNewScroll ecId={`${this && this.props && this.props.ecId || ''}_WeaNewScroll@2908z2`} ref="scrollBar"> current == 1 && <WeaNewScroll ecId={`${this && this.props && this.props.ecId || ''}_WeaNewScroll@2908z2`} ref="scrollBar">

0
pc4mobx/organization/stores/adareaset.js
View File

6
pc4mobx/organization/stores/managerDetach.js
View File

@ -61,8 +61,10 @@ export class ManagerDetachStore {
Api.getSearchList(params).then(res => { Api.getSearchList(params).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.setHasRight(res.data.hasRight); this.setHasRight(res.data.hasRight);
this.isDetach = res.data.isDetach; if(res.data.hasRight) {
isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1); this.isDetach = res.data.isDetach;
isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1);
}
} else { } else {
message.warning(res.msg); message.warning(res.msg);
} }

12
pc4mobx/organization/stores/newImport.js
View File

@ -85,8 +85,16 @@ export class NewImportStore {
"icon": "icon-coms-crm", "icon": "icon-coms-crm",
"title": "人员", "title": "人员",
"linkName": "人员导入", "linkName": "人员导入",
"url": "/spa/hrm/engine.html#/hrmengine/organization" "url": "/spa/organization/static/index.html#/main/organization/resource"
} },
{
"subTitle": "等级设置",
"bgColor": "rgb(230, 168, 69)",
"icon": "icon-portal-kpi-o",
"title": "职等职级",
"linkName": "职等职级导入",
"url": "/spa/organization/static/index.html#/main/organization/rankscheme"
},
] ]
@observable isMouseOver = false; @observable isMouseOver = false;