Merge remote-tracking branch 'origin/dev' into dev

pc4mobx/organization/components/newImport/stepContent.js

@@ -233,14 +233,18 @@ export default class StepDialog extends React.Component {
         return (
             <div>
                 {
-                    current == 0 && <WeaTransfer
-                        data={toJS(data)}
-                        selectedKeys={toJS(selectedKeys)}
-                        onChange={(keys, datas) => {
-                            newImport.setSelectedKeys(keys);
-                            newImport.setSelectData(datas);
-                        }}
-                    />
+                    current == 0 && 
+                    <div>
+                        <p style={{"color":"red","fontSize":"15px"}}>注意:右侧列表默认加载的为必填字段！！！</p>
+                        <WeaTransfer
+                            data={toJS(data)}
+                            selectedKeys={toJS(selectedKeys)}
+                            onChange={(keys, datas) => {
+                                newImport.setSelectedKeys(keys);
+                                newImport.setSelectData(datas);
+                            }}
+                        />
+                    </div>
                 }
                 {
                     current == 1 && <WeaNewScroll ecId={`${this && this.props && this.props.ecId || ''}_WeaNewScroll@2908z2`} ref="scrollBar">

pc4mobx/organization/stores/managerDetach.js

@@ -61,8 +61,10 @@ export class ManagerDetachStore {
         Api.getSearchList(params).then(res => {
             if (res.code === 200) {
                 this.setHasRight(res.data.hasRight);
-                this.isDetach = res.data.isDetach;
-                isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1);
+                if(res.data.hasRight) {
+                    this.isDetach = res.data.isDetach;
+                    isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1);
+                }
             } else {
                 message.warning(res.msg);
             }

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;