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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
18652063575 2022-09-06 19:31:06 +08:00
parent cbfed11819 bf8b1fecc4
commit a7592b2777
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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',

3
pc4mobx/organization/stores/job.js
View File

@ -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);

2
pc4mobx/organization/stores/jobgrade.js
View File

@ -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);
}

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

@ -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 '部门':