diff --git a/pc4mobx/organization/stores/department.js b/pc4mobx/organization/stores/department.js index 408d22b..b51b9cd 100644 --- a/pc4mobx/organization/stores/department.js +++ b/pc4mobx/organization/stores/department.js @@ -194,9 +194,9 @@ export class DepartmentStore { getDeptForm() { - let params = {}; + this.setDialogLoadingStatus(true); - Api.getDeptForm(params).then(res => { + Api.getDeptForm(this.selectTreeNodeInfo).then(res => { if (res.code === 200) { this.setDialogLoadingStatus(false); res.data.condition && this.setCondition(res.data.condition); diff --git a/pc4mobx/organization/stores/fieldDefined.js b/pc4mobx/organization/stores/fieldDefined.js index 3602dad..037e602 100644 --- a/pc4mobx/organization/stores/fieldDefined.js +++ b/pc4mobx/organization/stores/fieldDefined.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-06-09 10:16:00 - * @LastEditTime: 2022-08-22 15:25:05 + * @LastEditTime: 2022-09-06 09:43:39 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/stores/fieldDefined.js */ @@ -227,7 +227,7 @@ export class FieldDefinedStore extends HrmBaseStore { key: 'fieldType', useRecord: true, colSpan: 1, - width: "40%", + width: "45%", com: [{ label: '', type: 'CUSTOMFIELD', diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js index deed2b2..a66a783 100644 --- a/pc4mobx/organization/stores/job.js +++ b/pc4mobx/organization/stores/job.js @@ -195,9 +195,8 @@ export class JobStore { getJobForm() { - let params = {}; this.setDialogLoadingStatus(true); - Api.getJobForm(params).then(res => { + Api.getJobForm(this.selectTreeNodeInfo).then(res => { if (res.code === 200) { this.setDialogLoadingStatus(false); res.data.condition && this.setCondition(res.data.condition); diff --git a/pc4mobx/organization/stores/jobgrade.js b/pc4mobx/organization/stores/jobgrade.js index 79e54d9..eaaa626 100644 --- a/pc4mobx/organization/stores/jobgrade.js +++ b/pc4mobx/organization/stores/jobgrade.js @@ -230,7 +230,7 @@ export class JobGradeStore { this.setDialogLoadingStatus(false); res.data.condition && this.setCondition(res.data.condition); res.data.condition && this.form.initFormFields(res.data.condition); - this.updateConditions(this.selectedTreeNodeInfo.domid); + this.isNew ? this.updateConditions(this.selectedTreeNodeInfo.domid):''; } else { message.warning(res.msg); } diff --git a/pc4mobx/organization/stores/staff.js b/pc4mobx/organization/stores/staff.js index 4d826dd..d512a27 100644 --- a/pc4mobx/organization/stores/staff.js +++ b/pc4mobx/organization/stores/staff.js @@ -3,7 +3,7 @@ import { action } from 'mobx'; import * as mobx from 'mobx'; -import * as Api from '../apis/staff'; // 引入API接口文件 +import * as Api from '../apis/staff'; // 引入API接口文件 import { WeaForm } from 'comsMobx'; @@ -199,7 +199,7 @@ export class StaffStore { switch(type) { case '分部': this.condition[0].items = this.condition[0].items.filter(item => { - return (item.domkey[0] != 'deptId' && item.domkey[0] != 'jobId') + return (item.domkey[0] != 'ecDepartment' && item.domkey[0] != 'jobId') }); break; case '部门':