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

---
 pc4mobx/hrmSalary/apis/statistics.js                  |  4 ++--
 .../components/conditions.js                          |  2 +-
 .../components/dimensionSlide.js                      | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/statistics.js b/pc4mobx/hrmSalary/apis/statistics.js
index 2536ea8c..3ac89281 100644
--- a/pc4mobx/hrmSalary/apis/statistics.js
+++ b/pc4mobx/hrmSalary/apis/statistics.js
@@ -2,8 +2,8 @@ import { WeaTools } from "ecCom";
 import { postFetch } from "../util/request";
 
 //薪酬统计维度下拉列表
-export const dimensionSelectList = (params) => {
-  return WeaTools.callApi("/api/bs/hrmsalary/report/statistics/dimension/selectList", "GET", params);
+export const dimensionGetForm = (params) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/report/statistics/dimension/getForm", "GET", params);
 };
 // 保存薪酬统计维度
 export const dimensionSave = (params) => {
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index 260115e5..e8066d81 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -11,7 +11,7 @@ export const condition = [
         label: "维度类型",
         labelcol: 6,
         options: [],
-        detailtype: 2,
+        detailtype: 3,
         rules: "required|string",
         viewAttr: 3
       },
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
index f905b5a4..046c14c1 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
@@ -9,7 +9,7 @@ import { WeaDialog } from "ecCom";
 import { Button } from "antd";
 import { condition } from "./conditions";
 import { commonEnumList } from "../../../apis/ruleconfig";
-import { dimensionSelectList } from "../../../apis/statistics";
+import { dimensionGetForm } from "../../../apis/statistics";
 import { getSearchs } from "../../../util";
 import "../index.less";
 
@@ -30,7 +30,10 @@ class DimensionSlide extends Component {
 
 
   initCondition = async () => {
-    const [dimTypeEnum, dimCodeList] = await Promise.all([this.commonEnumList(), this.dimensionSelectList()]);
+    const [dimTypeEnum, dimCodeList] = await Promise.all([this.commonEnumList(), this.dimensionGetForm()]);
+    const { data: dimTypeData } = dimTypeEnum, { data: dimCodeData } = dimCodeList;
+
+
     console.log(dimTypeEnum, dimCodeList, condition);
   };
   commonEnumList = () => {
@@ -39,8 +42,8 @@ class DimensionSlide extends Component {
     };
     return commonEnumList(payload);
   };
-  dimensionSelectList = () => {
-    return dimensionSelectList();
+  dimensionGetForm = () => {
+    return dimensionGetForm();
   };
   handleSave = () => {
     this.props.form.validateForm().then(f => {