From 1d9ac506e84623387ead2d1ef286cb18247a0729 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 18 Aug 2022 17:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/apis/newImport.js        |  5 +++++
 .../fieldDefinedSet/FieldDefined.js           |  4 ++--
 .../components/newImport/index.js             | 19 ++++++++++++++-----
 .../components/office/officeManage.js         |  2 +-
 .../components/postionrank/JobGrade.js        |  2 +-
 pc4mobx/organization/stores/fieldDefined.js   |  4 +++-
 pc4mobx/organization/stores/jobgrade.js       |  2 +-
 pc4mobx/organization/stores/newImport.js      | 13 +++++++++++++
 pc4mobx/organization/stores/officeManage.js   |  2 +-
 9 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/organization/apis/newImport.js b/pc4mobx/organization/apis/newImport.js
index e334637..eac6738 100644
--- a/pc4mobx/organization/apis/newImport.js
+++ b/pc4mobx/organization/apis/newImport.js
@@ -1,5 +1,10 @@
 import { WeaTools } from 'ecCom'
 
+//导入页面权限
+export const getHasRight = () => {
+  return WeaTools.callApi(`/api/bs/hrmorganization/commonimport/getHasRight`, 'GET');
+}
+
 //选择导入字段
 export const getImportFields = (params) => {
     return WeaTools.callApi(`/api/bs/hrmorganization/commonimport/getImportFields`, 'GET', params);
diff --git a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
index c2812e6..26239ac 100644
--- a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
+++ b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
@@ -87,7 +87,8 @@ export default class FieldDefined extends Component {
 		} = this.props, {
 			//containerInitFinished,//权限验证
 			refreshMainTabComponent,
-			spinning
+			spinning,
+			hasRight
 		} = store, {
 			type: moduleType
 		} = params, {
@@ -143,7 +144,6 @@ export default class FieldDefined extends Component {
 			}
 		}
 		let children = [];
-		const hasRight = true;//todo
 		if (hasRight) {
 			const {
 				data,
diff --git a/pc4mobx/organization/components/newImport/index.js b/pc4mobx/organization/components/newImport/index.js
index 07a5237..8ce9ed4 100644
--- a/pc4mobx/organization/components/newImport/index.js
+++ b/pc4mobx/organization/components/newImport/index.js
@@ -21,6 +21,8 @@ import {
 import '../../style/import.css';
 import { addContentPath } from '../../util/index.js';
 import StepDialog from './stepDialog';
+import { renderNoright } from '../../util';
+
 
 
 @inject("newImport")
@@ -34,12 +36,14 @@ export default class newImport extends React.Component {
         })
     }
 
-    componentWillMount() {
-
+    componentDidMount() {
+        const {newImport} = this.props;
+        newImport.getHasRight();
     }
 
-    componentDidMount() {
 
+    componentWillMount() {
+        
     }
 
 
@@ -120,13 +124,18 @@ export default class newImport extends React.Component {
         const {
             newImport,
         } = this.props, {
-            visible
+            visible,
+            hasRight
         } = newImport, {
             title,
         } = this.state;
 
+        if (hasRight === false) {
+            return renderNoright();
+        }
+
         return (
-            <WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@sp0zb8`}
+            hasRight && <WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@sp0zb8`}
                 title={title}
                 icon={<i className='icon-coms-hrm' />}
                 iconBgcolor='#217346'
diff --git a/pc4mobx/organization/components/office/officeManage.js b/pc4mobx/organization/components/office/officeManage.js
index b8e2535..34b4587 100644
--- a/pc4mobx/organization/components/office/officeManage.js
+++ b/pc4mobx/organization/components/office/officeManage.js
@@ -422,7 +422,7 @@ export default class OfficeManage extends Component {
     }
 
     return (
-      <div className="office-wapper">
+      hasRight && <div className="office-wapper">
         <WeaLeftRightLayout
           isNew={true}
           leftWidth={310}
diff --git a/pc4mobx/organization/components/postionrank/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js
index 66d1490..669ee7d 100644
--- a/pc4mobx/organization/components/postionrank/JobGrade.js
+++ b/pc4mobx/organization/components/postionrank/JobGrade.js
@@ -397,7 +397,7 @@ export default class JobGrade extends React.Component {
             treeExpandKeys
         } = toJS(treeConfig);
         const treeCom = (
-            <WeaLeftTree ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftTree@ifgbi1`}
+            hasRight && <WeaLeftTree ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftTree@ifgbi1`}
                 datas={data}
                 searchLabel={"等级方案"}
                 onSelect={onSelectedTreeNode}
diff --git a/pc4mobx/organization/stores/fieldDefined.js b/pc4mobx/organization/stores/fieldDefined.js
index 0a646b7..2a1980b 100644
--- a/pc4mobx/organization/stores/fieldDefined.js
+++ b/pc4mobx/organization/stores/fieldDefined.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-09 10:16:00
- * @LastEditTime: 2022-07-04 15:12:06
+ * @LastEditTime: 2022-08-18 13:53:57
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/stores/fieldDefined.js
  */
@@ -672,6 +672,7 @@ export class FieldDefinedStore extends HrmBaseStore {
 	 * @param  {String} key       [tabKey]
 	 * @return {null}
 	 */
+	@observable hasRight = '';
 	@action setActiveTab = (tabConfig, key) => {
 		tabConfig.activeTabKey = key || tabConfig.tabs[0].viewCondition;
 		const tabIndex = this.getTabIndex(this.tabConfig.tabs, key);
@@ -697,6 +698,7 @@ export class FieldDefinedStore extends HrmBaseStore {
 					datas,
 					selectedData
 				} = this.convertData(res.data.data, 'fieldDef');
+				this.hasRight = res.data.hasRight;
 				this.encryptEnable = res.data.encryptEnable;
 				this.tableEditConfig.fieldDef.datas = datas;
 				this.tableEditConfig.fieldDef.columns = this.getColumns();
diff --git a/pc4mobx/organization/stores/jobgrade.js b/pc4mobx/organization/stores/jobgrade.js
index 242e4a8..0a69083 100644
--- a/pc4mobx/organization/stores/jobgrade.js
+++ b/pc4mobx/organization/stores/jobgrade.js
@@ -48,7 +48,7 @@ export class JobGradeStore {
     @observable topTab = [];
     @observable topTabCount = {};
     @observable lastime = '';//
-    @observable hasRight = true;
+    @observable hasRight = '';
     @observable treeLoading = true;
 
     @observable treeConfig = {
diff --git a/pc4mobx/organization/stores/newImport.js b/pc4mobx/organization/stores/newImport.js
index fe64764..8ff836e 100644
--- a/pc4mobx/organization/stores/newImport.js
+++ b/pc4mobx/organization/stores/newImport.js
@@ -40,6 +40,19 @@ import {
 
 export class newImportStore {
 
+  @observable hasRight = '';
+  @action getHasRight(){
+    API.getHasRight().then(res => {
+      if(res.code == 200) {
+        this.hasRight = res.data.hasRight;
+      }else {
+        message.warning(res.msg);
+      }
+    },error => {
+      message.warning(error.msg);
+    })
+  }
+  
   /********************* cardConfig  *********************/
   cardConfig = [
     {
diff --git a/pc4mobx/organization/stores/officeManage.js b/pc4mobx/organization/stores/officeManage.js
index 87c5cd3..1966840 100644
--- a/pc4mobx/organization/stores/officeManage.js
+++ b/pc4mobx/organization/stores/officeManage.js
@@ -30,7 +30,7 @@ export class OfficeManageStore {
   @observable dialogLoading = false;
   @observable schemeId = "";
   @observable date = "";
-  @observable hasRight = "";
+  @observable hasRight = '';
 
   @action
   setOfficeClassifyId(id) {