From 0c235113f96e63414a8c2031b234c2f0e001440a Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 11 Mar 2024 18:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E8=81=8C=E4=BD=8D=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/department/departmentExtend.js   |  2 --
 .../components/newImport/stepContent.js         |  2 +-
 .../components/sequence/Sequence.js             | 17 +++++++++++++++--
 pc4mobx/organization/stores/departmentextend.js | 12 +++++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js
index 1100485..7cd4525 100644
--- a/pc4mobx/organization/components/department/departmentExtend.js
+++ b/pc4mobx/organization/components/department/departmentExtend.js
@@ -29,8 +29,6 @@ import '../../style/common.less';
 export default class DepartmentExtendStore extends React.Component {
 
   componentDidMount() {
-    const params = useParams();
-    console.log(toJS(params));
     this.handleHashChange();
     window.addEventListener('hashchange', this.handleHashChange);
   }
diff --git a/pc4mobx/organization/components/newImport/stepContent.js b/pc4mobx/organization/components/newImport/stepContent.js
index c8ae746..d9d1a82 100644
--- a/pc4mobx/organization/components/newImport/stepContent.js
+++ b/pc4mobx/organization/components/newImport/stepContent.js
@@ -239,7 +239,7 @@ export default class StepDialog extends React.Component {
                 {
                     current == 0 && 
                     <div>
-                        <p style={{"color":"red","fontSize":"15px"}}>注意:右侧列表默认加载的为必填字段！！！</p>
+                        <p style={{"color":"red","fontSize":"15px"}}>注意:右侧列表默认加载的为必填字段!</p>
                         <WeaTransfer
                             data={toJS(data)}
                             selectedKeys={toJS(selectedKeys)}
diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js
index adb6171..1c9ced1 100644
--- a/pc4mobx/organization/components/sequence/Sequence.js
+++ b/pc4mobx/organization/components/sequence/Sequence.js
@@ -30,6 +30,7 @@ import {
 import '../../style/common.less';
 
 import NewAndEditDialog from '../NewAndEditDialog';
+import ImportDialog from '../ImportDialog'
 import { renderNoright } from '../../util';
 
 
@@ -40,6 +41,7 @@ const WeaTable = WeaTableNew.WeaTable;
 
 
 @inject('sequence')
+@inject('importDialog')
 @observer
 export default class Sequence extends React.Component {
     constructor(props) {
@@ -150,6 +152,16 @@ export default class Sequence extends React.Component {
         sequence.delete();
     }
 
+    importFile(){
+        const {
+            importDialog
+        } = this.props;
+        importDialog.importVisible=true;
+        importDialog.importModule='sequence';
+        importDialog.current = 0;
+        importDialog.getImportForm();
+    }
+
 
     getDropMenuDatas() {
         const {
@@ -374,13 +386,13 @@ export default class Sequence extends React.Component {
     render() {
 
         const {
-            sequence
+            sequence,importDialog
         } = this.props;
         const {
             isPanelShow, form2, levelName, conditionNum, tableStore,nEdialogTitle,visible,condition,
             form,dialogLoading,isEdit,selectedKey,topTab,topTabCount,date,hasRight
         } = sequence;
-
+        const {importVisible} = importDialog;
         if (hasRight === false) {
             return renderNoright();
         }
@@ -442,6 +454,7 @@ export default class Sequence extends React.Component {
                     save={() => this.handleSave()}
                     onCancel={() => sequence.setVisible(false)}
                 />
+                {importVisible && <ImportDialog ecId={`${this && this.props && this.props.ecId || ''}_ImportDialog@633i8k`} />}
             </div>
         )
     }
diff --git a/pc4mobx/organization/stores/departmentextend.js b/pc4mobx/organization/stores/departmentextend.js
index ffacc2e..0a11802 100644
--- a/pc4mobx/organization/stores/departmentextend.js
+++ b/pc4mobx/organization/stores/departmentextend.js
@@ -152,7 +152,17 @@ export class DepartmentExtendStore {
         //this.tableInfo = this.handleTable(res.data.result.tables);
         this.getTabInfo();
         res.data.result.buttons && this.setButtons(res.data.result.buttons);
-        res.data.result.tabInfo && this.setTopTab(res.data.result.tabInfo);
+        // const topTab = [
+        //   ...res.data.result.tabInfo,
+        //   {
+        //     "color": "#000000",
+        //     "groupId": "-10000",
+        //     "showcount": false,
+        //     "title": "人力资源",
+        //     "viewCondition": "-10000"
+        //   }
+        // ]
+        this.setTopTab(res.data.result.tabInfo);
         this.isEditor && this.getSelectedRows();
         this.setLoading(false);