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

Merge pull request 'feature/cl' (#24) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/24
This commit is contained in:
liang.cheng 2022-11-21 13:51:11 +08:00
parent 82b09416bb d48b404468
commit 814cf971e0
13 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/organization/components/ImportDialog.js
View File

@ -150,7 +150,7 @@ export default class ImportDialog extends React.Component {
} = this.state;
const buttons = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '导入完成' : '开始导入'}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '关闭' : '开始导入'}</Button>),
];

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

@ -47,7 +47,7 @@ export default class NewAndEditDialog extends React.Component {
error={form.getError(field)}
tipPosition="bottom"
wrapperCol={{ span: `${field.fieldcol}` }}>
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} />}
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange} />}
</WeaFormItem>)
})
})

2
pc4mobx/organization/components/columnSetting/index.js
View File

@ -62,7 +62,7 @@ class ColumnSetting extends Component {
return renderNoright();
}
return (
<div style={{ height: "100%" }}>
authorized && <div style={{ height: "100%" }}>
<WeaRightMenu
ecId={`${this && this.props && this.props.ecId || ""}_WeaRightMenu@k6oc4u`}
datas={[{

2
pc4mobx/organization/components/newImport/stepDialog.js
View File

@ -67,7 +67,7 @@ export default class StepDialog extends React.Component {
} = this.state;
const buttons = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '导入完成' : i18n.button.nextStep()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '关闭' : i18n.button.nextStep()}</Button>),
];
return (

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

@ -231,7 +231,7 @@ export default class ResourceCard extends React.Component {
</div>
<div style={{ marginTop: '10px' }}>
<span className='label'>账号类型:</span>
<span className='value'>{data.user.belongTo}</span>
<span className='value'>{data.user.accountType}</span>
<span className='label'>状态:</span>
<span className='value'>{data.user.status}</span>
</div>
@ -241,7 +241,7 @@ export default class ResourceCard extends React.Component {
{
data.buttons.slice(0,3).map((item,index) => {
return (
<Button className='item' onClick={() => { window.location.href = item.url.replaceAll("${id}",data.user.id)}}>{item.name}</Button>
<Button className='item' onClick={() => { window.open(item.url.replaceAll("${id}",data.user.id),"_self")}}>{item.name}</Button>
)
})
}

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

@ -533,7 +533,7 @@ export default class Staff extends React.Component {
loading={dialogLoading}
isEdit={isEdit}
height={350}
conditionLen={1}
conditionLen={2}
save={() => this.handleSave()}
onCancel={() => staff.setVisible(false)}
moduleName={"staff"}

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

@ -158,7 +158,7 @@ export const i18n = {
typeName: () => getLabel(129927, '类型名称'),
ResourceName: () => getLabel(385936, '人员'),
newPeople: () => getLabel(386246, '新建人员'),
resourceMange: () => getLabel(386246, '人员管理'),
resourceMange: () => getLabel(386246, '花名册'),
resourceBasicInfo: () => getLabel(386246, '人员信息'),
newResourceBasicInfo: () => getLabel(386246, '新建人员资料'),
newResourceBasicType: () => getLabel(386246, '新建人员资料类型'),

4
pc4mobx/organization/stores/columnSetting.js
View File

@ -19,7 +19,7 @@ export class ColumnSetting {
@observable tableStore = new TableStore();
@observable columnsPermissionData = [];
@observable selectedKey = "0";
@observable authorized = true;
@observable authorized = '';
@observable loading = true;
@observable tabOneRelatedData = {
datas: [], //datas受控
@ -186,7 +186,7 @@ export class ColumnSetting {
ecId={`${this && this.props && this.props.ecId || ""}_WeaHelpfulTip@4vdvfp@${index}`}
title="页面链接地址可以为外网地址，如：http://www.baidu.com
也可以是内部地址，如：/test.jsp，可以带上参数传参，像这样：/test.jsp?a=1&b=2
也可以写占位符{#id}传人员id，像这样：/test.jsp?a=1&b={#id}&mypara2={#id}"/>
也可以写占位符${id}传人员id，像这样：/test.jsp?a=1&b=${id}&mypara2=${id}"/>
</span>
</span>;
}

4
pc4mobx/organization/stores/companyextend.js
View File

@ -79,7 +79,8 @@ export class CompanyExtendStore {
editResource = () => {
let pDatas = this.form.getFormParams();
Api.editResource({ ...{
id: this.id
id: this.id,
viewCondition:this.selectedKey
},
...pDatas,
...this.getTableEditParams()
@ -119,6 +120,7 @@ export class CompanyExtendStore {
getData = () => {
this.setLoading(true);
this.form = new WeaForm();
let params = {
viewAttr: this.isEditor ? 2 : 1,
id: this.id,

4
pc4mobx/organization/stores/departmentextend.js
View File

@ -78,7 +78,8 @@ export class DepartmentExtendStore {
editResource = () => {
let pDatas = this.form.getFormParams();
Api.editResource({ ...{
id: this.id
id: this.id,
viewCondition:this.selectedKey
},
...pDatas,
...this.getTableEditParams()
@ -118,6 +119,7 @@ export class DepartmentExtendStore {
getData = () => {
this.setLoading(true);
this.form = new WeaForm();
let params = {
viewAttr: this.isEditor ? 2 : 1,
id: this.id,

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

@ -81,7 +81,8 @@ export class JobExtendStore {
let pDatas = this.form.getFormParams();
Api.editResource({
...{
id: this.id
id: this.id,
viewCondition:this.selectedKey
},
...pDatas,
...this.getTableEditParams()
@ -121,10 +122,11 @@ export class JobExtendStore {
getData = () => {
this.setLoading(true);
this.form = new WeaForm();
let params = {
viewAttr: this.isEditor ? 2 : 1,
id: this.id,
viewCondition: this.selectedKey
viewCondition: this.selectedKey,
}
Api.getJobExtendForm(params).then((res) => {
if (res.code === 200) {

7
pc4mobx/organization/stores/resourceExtend.js
View File

@ -78,14 +78,16 @@ export class ResourceExtendStore {
editResource = () => {
let pDatas = this.form.getFormParams();
Api.editResource({ ...{
id: this.id
id: this.id,
viewCondition:this.selectedKey
},
...pDatas,
...this.getTableEditParams()
}).then(data => {
if (data.code == 200) {
message.success(i18n.message.saveSuccess());
window.location.href = `/spa/organization/static/index.html#/main/organization/resourceCard/${this.id}`;
this.selectedKey = '0';
window.open(`/spa/organization/static/index.html#/main/organization/resourceCard/${this.id}`,"_self");
// this.init();
// this.getData();
// this.selectedRowKeys = [];
@ -119,6 +121,7 @@ export class ResourceExtendStore {
getData = () => {
this.setLoading(true);
this.form = new WeaForm()
let params = {
viewAttr: this.isEditor ? 2 : 1,
id: this.id,

10
pc4mobx/organization/stores/staff.js
View File

@ -186,10 +186,10 @@ export class StaffStore {
updateConditions(data) {
this.form.updateFields({
compId: {
ecCompany: {
value: ''
},
deptId: {
ecDepartment: {
value: ''
},
jobId: {
@ -206,11 +206,13 @@ export class StaffStore {
break;
case '部门':
this.condition[0].items = this.condition[0].items.filter(item => {
return item.domkey[0] != 'jobId'
return item.domkey[0] != 'ecCompany' && item.domkey[0] != 'jobId'
})
break;
case '岗位':
break;
this.condition[0].items = this.condition[0].items.filter(item => {
return item.domkey[0] != 'ecCompany' && item.domkey[0] != 'ecDepartment'
})
}
this.setCondition(this.condition);