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

Merge pull request '弹出框修改' (#11) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/11
This commit is contained in:
liang.cheng 2022-10-26 16:08:23 +08:00
parent 9a9c243ec7 238ccbabf8
commit 748aa1f740
19 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pc4mobx/organization/apis/managerDetach.js
View File

@ -4,11 +4,23 @@ import {
} from 'ecCom'
export const getSearchList = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/scheme/getTable', 'GET', params);
return WeaTools.callApi('/api/bs/hrmorganization/detach/getTable', 'GET', params);
}
export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/detach/getTableBtn', 'GET', params);
}
export const getAdvanceSearchCondition = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/detach/getSearchCondition', 'GET', params);
}
export const getSchemeForm = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/detach/getForm', 'GET', params);
}
export const deleteTableData = (params) => {
return fetch('/api/bs/hrmorganization/scheme/deleteByIds', {
return fetch('/api/bs/hrmorganization/detach/deleteByIds', {
method: 'POST',
mode: 'cors',
headers: {
@ -18,12 +30,9 @@ export const deleteTableData = (params) => {
})
}
export const getAdvanceSearchCondition = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSearchCondition', 'GET', params);
}
export const add = (params) => {
return fetch('/api/bs/hrmorganization/scheme/save', {
return fetch('/api/bs/hrmorganization/detach/save', {
method: 'POST',
mode: 'cors',
headers: {
@ -34,7 +43,7 @@ export const add = (params) => {
}
export const edit = (params) => {
return fetch('/api/bs/hrmorganization/scheme/updateScheme', {
return fetch('/api/bs/hrmorganization/detach/update', {
method: 'POST',
mode: 'cors',
headers: {
@ -44,11 +53,6 @@ export const edit = (params) => {
})
}
export const getSchemeForm = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSchemeForm', 'GET', params);
}
export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/scheme/getTableBtn', 'GET', params);
}

4
pc4mobx/organization/components/NewAndEditDialog.js
View File

@ -51,7 +51,7 @@ export default class NewAndEditDialog extends React.Component {
</WeaFormItem>)
})
})
return <div className="wea-form-item-group">{arr}</div>
return <div style={{"height":"100%","padding":"30px"}} className="wea-form-item-group">{arr}</div>
}
onChange = data => {
@ -162,7 +162,7 @@ export default class NewAndEditDialog extends React.Component {
loading ? <div className='hrm-loading-center-small'>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={loading}></Spin>
</div>
: this.getSearchGroupForm()}
: conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
</WeaDialog>

6
pc4mobx/organization/components/company/company.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 16:23:32
* @LastEditTime: 2022-09-08 17:35:40
* @LastEditTime: 2022-10-26 15:53:23
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/
@ -592,8 +592,8 @@ export default class Company extends React.Component {
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={4}
height={400}
conditionLen={2}
save={() => this.handleSave()}
onCancel={() => company.setNewVisible(false)}
saveAndSetting = {() => this.handleSaveAndSetting()}

6
pc4mobx/organization/components/department/department.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-09-02 15:22:00
* @LastEditTime: 2022-10-26 15:53:37
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
@ -684,8 +684,8 @@ export default class Department extends React.Component {
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={13}
height={400}
conditionLen={2}
save={() => this.handleSave()}
onCancel={() => department.setNewVisible(false)}
saveAndSetting={() => this.handleSaveAndSetting()}

4
pc4mobx/organization/components/detach/ManagerDetach.js
View File

@ -426,8 +426,8 @@ export default class ManagerDetach extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={250}
conditionLen={3}
height={200}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => managerDetach.setVisible(false)}
/>

78
pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
View File

@ -20,6 +20,7 @@ import {
i18n
} from '../../public/i18n';
const { ButtonSelect } = WeaDropdown;
import { renderNoright } from '../../util';
@inject('fieldDefined')
@ -126,7 +127,7 @@ export default class FieldDefined extends Component {
}}
/>
]
}, title = moduleType === 'subCompany' ? i18n.module.subCompanyFieldDef() : moduleType === 'department' ? i18n.module.departmentFieldDef() : i18n.module.resourceFieldDef(),
}, title = moduleType === 'subCompany' ? i18n.module.subCompanyFieldDef() : moduleType === 'department' ? i18n.module.departmentFieldDef() : moduleType === 'job' ? i18n.module.jobFieldDef() : i18n.module.resourceFieldDef(),
topProps = {
title,
icon: <i className='icon-coms-hrm' />,
@ -144,50 +145,43 @@ export default class FieldDefined extends Component {
}
}
let children = [];
debugger
if (hasRight) {
const {
data,
onSelectedTreeNode,
selectedKeys,
onExpand,
treeExpandKeys
} = store.toJS(treeConfig);
const treeCom = (
<WeaLeftTree ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftTree@ifgbi1`}
datas={data}
onSelect={onSelectedTreeNode}
selectedKeys={selectedKeys}
onExpand={onExpand}
expandedKeys={treeExpandKeys} />
if (hasRight === false) {
return renderNoright();
}
const {
data,
onSelectedTreeNode,
selectedKeys,
onExpand,
treeExpandKeys
} = store.toJS(treeConfig);
const treeCom = (
<WeaLeftTree ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftTree@ifgbi1`}
datas={data}
onSelect={onSelectedTreeNode}
selectedKeys={selectedKeys}
onExpand={onExpand}
expandedKeys={treeExpandKeys} />
)
children = [
(
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@hwytf7`} spinning={spinning}>
<WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@rdv0wt`} {...topProps}>
<WeaLeftRightLayout ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@q6b87k`} leftCom={treeCom}>
{
<Tabs ecId={`${this && this.props && this.props.ecId || ''}_Tabs@4k4wsi`} {...tabProps}>
<FieldDef ecId={`${this && this.props && this.props.ecId || ''}_FieldDef@pliw94`} logSmallType={logType || this.state.logSmallType} targetId={activeTabInfo.tabInfo ? activeTabInfo.tabInfo.groupid : ''} resetClass={true} />
</Tabs>
}
</WeaLeftRightLayout>
</WeaTop>
</Spin>
)
children = [
(
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@hwytf7`} spinning={spinning}>
<WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@rdv0wt`} {...topProps}>
<WeaLeftRightLayout ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@q6b87k`} leftCom={treeCom}>
{
<Tabs ecId={`${this && this.props && this.props.ecId || ''}_Tabs@4k4wsi`} {...tabProps}>
<FieldDef ecId={`${this && this.props && this.props.ecId || ''}_FieldDef@pliw94`} logSmallType={logType || this.state.logSmallType} targetId={activeTabInfo.tabInfo ? activeTabInfo.tabInfo.groupid : ''} resetClass={true} />
</Tabs>
}
</WeaLeftRightLayout>
</WeaTop>
</Spin>
)
]
} else {
children = [
(
<WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@z0f4dh`}>
<div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
</WeaAlertPage>
)
];
}
]
return (
<div className="hrm_module_container fieldDef">
hasRight && <div className="hrm_module_container fieldDef">
{children}
</div>
)

6
pc4mobx/organization/components/job/Job.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:05:59
* @LastEditTime: 2022-09-01 15:08:26
* @LastEditTime: 2022-10-26 15:49:00
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/
@ -659,8 +659,8 @@ export default class Job extends React.Component {
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={13}
height={400}
conditionLen={2}
save={() => this.handleSave()}
onCancel={() => job.setNewVisible(false)}
saveAndSetting = {() => this.handleSaveAndSetting()}

4
pc4mobx/organization/components/office/components/leftTree.js
View File

@ -354,8 +354,8 @@ class LeftTree extends Component {
isFormInit={form1.isFormInit}
loading={loading}
isEdit={true}
height={250}
conditionLen={3}
height={150}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() =>
officeManageStore.setOfficeVisible({

4
pc4mobx/organization/components/office/officeManage.js
View File

@ -492,8 +492,8 @@ export default class OfficeManage extends Component {
isFormInit={form.isFormInit}
loading={dialogLoading || loading}
isEdit={true}
height={250}
conditionLen={3}
height={400}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => {
officeManageStore.setVisible(false);

4
pc4mobx/organization/components/postionrank/JobGrade.js
View File

@ -461,8 +461,8 @@ export default class JobGrade extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={350}
conditionLen={3}
height={280}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => jobGrade.setVisible(false)}
moduleName={"jobGrade"}

4
pc4mobx/organization/components/postionrank/JobLevel.js
View File

@ -456,8 +456,8 @@ export default class JobLevel extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={3}
height={250}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => jobLevel.setVisible(false)}
/>

4
pc4mobx/organization/components/postionrank/RankScheme.js
View File

@ -430,8 +430,8 @@ export default class RankScheme extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={250}
conditionLen={3}
height={200}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => rankScheme.setVisible(false)}
/>

6
pc4mobx/organization/components/resource/ResourceBasicInfo.js
View File

@ -444,7 +444,7 @@ export default class ResourceBasicInfo extends React.Component {
} = this.props;
const {
isPanelShow, form2, fname, conditionNum, tableStore, nEdialogTitle, visible, condition,
form, dialogLoading, isEdit, date, hasRight, treeConfig, treeLoading
form, dialogLoading, isEdit, date, hasRight, treeConfig, treeLoading,operateType
} = resourceBasicInfo;
if (hasRight === false) {
@ -517,8 +517,8 @@ export default class ResourceBasicInfo extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={3}
height={operateType == 2 ? 180 : 230}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => resourceBasicInfo.setVisible(false)}
/>

4
pc4mobx/organization/components/resource/resource.js
View File

@ -466,8 +466,8 @@ export default class Resource extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={350}
conditionLen={3}
height={400}
conditionLen={2}
save={() => this.handleSave()}
onCancel={() => resource.setVisible(false)}
// saveAndSetting={() => this.handleSaveAndSetting()}

4
pc4mobx/organization/components/sequence/Sequence.js
View File

@ -435,8 +435,8 @@ export default class Sequence extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={3}
height={250}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => sequence.setVisible(false)}
/>

4
pc4mobx/organization/components/staff/Staff.js
View File

@ -532,8 +532,8 @@ export default class Staff extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={400}
conditionLen={3}
height={350}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => staff.setVisible(false)}
moduleName={"staff"}

4
pc4mobx/organization/components/staff/StaffScheme.js
View File

@ -429,8 +429,8 @@ export default class StaffScheme extends React.Component {
isFormInit={form.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={450}
conditionLen={3}
height={400}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => staffScheme.setVisible(false)}
moduleName={"staffScheme"}

1
pc4mobx/organization/public/i18n.js
View File

@ -12,6 +12,7 @@ export const i18n = {
subCompanyFieldDef: () => getLabel(81876, '分部字段定义'),
departmentFieldDef: () => getLabel(81877, '部门字段定义'),
resourceFieldDef: () => getLabel(81878, '人员卡片字段定义'),
jobFieldDef: () => getLabel(81878, '岗位字段定义'),
roleSetting: () => getLabel(16527, '角色设置'),
batchMaintenance: () => getLabel(33923, '批量维护'),
batchAdjustSubCompany: () => getLabel(385879, '批量调整分部信息'),

1
pc4mobx/organization/style/common.less
View File

@ -7,6 +7,7 @@
margin-top: -8px;
}
.hrm-dialog-form {
padding-top: 27px;
padding-right: 8%;