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

!54 fixed.. 

Merge pull request !54 from reset/feature/cl
This commit is contained in:
reset 2022-07-08 05:33:30 +00:00 committed by Gitee
parent c52834678b db5101250e
commit 38ceda8153
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,8 +310,8 @@ export class JobStore {
const index = findIndex(this.condition[1].items, { label });
const schemeId = data.sequence_id.valueObj[0].scheme_values;
this.condition[1].items[index].browserConditionParam.replaceDatas = [{ name: data.sequence_id.valueObj[0].scheme_ids, id: schemeId }];
//清空职等并限制范围
label = "职等"
//清空职级并限制范围
label = "职级"
const index1 = findIndex(this.condition[1].items, { label });
let currenttime = Date.now();
let key = `scheme_id_${currenttime}`;
@ -354,14 +354,14 @@ export class JobStore {
});
} else {
//清空职级并限制范围
let label = "职级"
//清空职等并限制范围
let label = "职等"
const index2 = findIndex(this.condition[1].items, { label });
let currenttime = Date.now();
let key1 = `level_id_${currenttime}`;
let key1 = `id_${currenttime}`;
const lastKey = this.key1;
this.key1 = key1;
const levelId = data.level_id.value;
const levelId = '11,12';
Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.completeParams, lastKey);
Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.conditionDataParams, lastKey);
Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.dataParams, lastKey);

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

@ -277,33 +277,38 @@ export class JobGradeStore {
}
updateConditions(val) {
let currenttime = Date.now();
let currenttime = 1657247378274;
let key = `scheme_id_${currenttime}`;
const lastKey = this.key;
Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.completeParams, lastKey);
Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.conditionDataParams, lastKey);
Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.dataParams, lastKey);
Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.destDataParams, lastKey);
this.setKey(key);
let id_key = `level_id_${currenttime}`
// const lastKey = this.key;
// Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.completeParams, lastKey);
// Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.conditionDataParams, lastKey);
// Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.dataParams, lastKey);
// Reflect.deleteProperty(this.condition[0].items[4].browserConditionParam.destDataParams, lastKey);
// this.setKey(key);
this.condition[0].items[4].browserConditionParam.completeParams = {
[key]: val,
...this.condition[0].items[4].browserConditionParam.completeParams,
currenttime: currenttime
currenttime: currenttime,
[id_key]:"''"
}
this.condition[0].items[4].browserConditionParam.conditionDataParams = {
[key]: val,
...this.condition[0].items[4].browserConditionParam.conditionDataParams,
currenttime: currenttime
currenttime: currenttime,
[id_key]:"''"
}
this.condition[0].items[4].browserConditionParam.dataParams = {
[key]: val,
...this.condition[0].items[4].browserConditionParam.dataParams,
currenttime: currenttime
currenttime: currenttime,
[id_key]:"''"
}
this.condition[0].items[4].browserConditionParam.destDataParams = {
[key]: val,
...this.condition[0].items[4].browserConditionParam.destDataParams,
currenttime: currenttime
currenttime: currenttime,
[id_key]:"''"
}
this.form.updateFields({