From 835a04c72b9f15d8fe7b977e0bb5dc6e8b695a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 26 Apr 2023 15:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E9=85=AC=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/reportView/components/condition.js  | 60 +++++++++----------
 .../statisticalMicroSettingsSlide.js          |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index 2f88f912..0e86091c 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
@@ -77,36 +77,36 @@ export const condition = [
         labelcol: 6,
         viewAttr: 2
       },
-      {
-        browserConditionParam: {
-          completeParams: {},
-          conditionDataParams: {},
-          dataParams: {},
-          destDataParams: {},
-          hasAddBtn: false,
-          hasAdvanceSerach: true,
-          idSeparator: ",",
-          isAutoComplete: 1,
-          isDetail: 0,
-          isMultCheckbox: false,
-          isSingle: false,
-          linkUrl: "",
-          pageSize: 10,
-          quickSearchName: "",
-          replaceDatas: [],
-          title: getLabel(111, "岗位"),
-          type: "278",
-          viewAttr: 2
-        },
-        colSpan: 2,
-        conditionType: "BROWSER",
-        domkey: ["position"],
-        fieldcol: 18,
-        isQuickSearch: false,
-        label: getLabel(111, "岗位"),
-        labelcol: 6,
-        viewAttr: 2
-      },
+      // {
+      //   browserConditionParam: {
+      //     completeParams: {},
+      //     conditionDataParams: {},
+      //     dataParams: {},
+      //     destDataParams: {},
+      //     hasAddBtn: false,
+      //     hasAdvanceSerach: true,
+      //     idSeparator: ",",
+      //     isAutoComplete: 1,
+      //     isDetail: 0,
+      //     isMultCheckbox: false,
+      //     isSingle: false,
+      //     linkUrl: "",
+      //     pageSize: 10,
+      //     quickSearchName: "",
+      //     replaceDatas: [],
+      //     title: getLabel(111, "岗位"),
+      //     type: "278",
+      //     viewAttr: 2
+      //   },
+      //   colSpan: 2,
+      //   conditionType: "BROWSER",
+      //   domkey: ["position"],
+      //   fieldcol: 18,
+      //   isQuickSearch: false,
+      //   label: getLabel(111, "岗位"),
+      //   labelcol: 6,
+      //   viewAttr: 2
+      // },
       {
         browserConditionParam: {
           completeParams: {},
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index bda4cc15..6c39dd46 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -122,7 +122,7 @@ class StatisticalMicroSettingsSlide extends Component {
       hiredate: extra["hiredate1__hiredate2"].value || [],
       department: _.map(department.valueObj, it => ({ id: it.id, name: it.name })),
       employee: _.map(employee.valueObj, it => ({ id: it.id, name: it.name })),
-      position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
+      // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
       subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })),
       taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [],
       items: dataSource,