From db5101250e07795a0929cc08f3d0fb78f90103a4 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Fri, 8 Jul 2022 13:31:40 +0800
Subject: [PATCH] fixed

---
 pc4mobx/organization/stores/job.js      | 12 +++++------
 pc4mobx/organization/stores/jobgrade.js | 27 +++++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js
index d3e0666..361250f 100644
--- a/pc4mobx/organization/stores/job.js
+++ b/pc4mobx/organization/stores/job.js
@@ -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);
diff --git a/pc4mobx/organization/stores/jobgrade.js b/pc4mobx/organization/stores/jobgrade.js
index 9e098c8..83141e5 100644
--- a/pc4mobx/organization/stores/jobgrade.js
+++ b/pc4mobx/organization/stores/jobgrade.js
@@ -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({