From 3b4592adb5524bcd069669c6578d35748c35f4c4 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 8 Nov 2022 09:49:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/newImport/stepContent.js | 20 +++++++++++--------
pc4mobx/organization/stores/adareaset.js | 0
pc4mobx/organization/stores/newImport.js | 12 +++++++++--
3 files changed, 22 insertions(+), 10 deletions(-)
delete mode 100644 pc4mobx/organization/stores/adareaset.js
diff --git a/pc4mobx/organization/components/newImport/stepContent.js b/pc4mobx/organization/components/newImport/stepContent.js
index 61301f6..072975f 100644
--- a/pc4mobx/organization/components/newImport/stepContent.js
+++ b/pc4mobx/organization/components/newImport/stepContent.js
@@ -233,14 +233,18 @@ export default class StepDialog extends React.Component {
return (
{
- current == 0 &&
{
- newImport.setSelectedKeys(keys);
- newImport.setSelectData(datas);
- }}
- />
+ current == 0 &&
+
+
注意:右侧列表默认加载的为必填字段!!!
+
{
+ newImport.setSelectedKeys(keys);
+ newImport.setSelectData(datas);
+ }}
+ />
+
}
{
current == 1 &&
diff --git a/pc4mobx/organization/stores/adareaset.js b/pc4mobx/organization/stores/adareaset.js
deleted file mode 100644
index e69de29..0000000
diff --git a/pc4mobx/organization/stores/newImport.js b/pc4mobx/organization/stores/newImport.js
index 6c40f26..20a3cde 100644
--- a/pc4mobx/organization/stores/newImport.js
+++ b/pc4mobx/organization/stores/newImport.js
@@ -85,8 +85,16 @@ export class NewImportStore {
"icon": "icon-coms-crm",
"title": "人员",
"linkName": "人员导入",
- "url": "/spa/hrm/engine.html#/hrmengine/organization"
- }
+ "url": "/spa/organization/static/index.html#/main/organization/resource"
+ },
+ {
+ "subTitle": "等级设置",
+ "bgColor": "rgb(230, 168, 69)",
+ "icon": "icon-portal-kpi-o",
+ "title": "职等职级",
+ "linkName": "职等职级导入",
+ "url": "/spa/organization/static/index.html#/main/organization/rankscheme"
+ },
]
@observable isMouseOver = false;