feat:数据接入

75994581 · chenshu · 98706900 · 75994581 · 75994581 · 75994581
Commit 75994581 authored Apr 09, 2021 by chenshu
5 changed files
--- a/src/modules/college-manage/EmployeeManage.tsx
+++ b/src/modules/college-manage/EmployeeManage.tsx
@@ -18,6 +18,7 @@ import User from "@/common/js/user";
 import "./EmployeeManage.less";
 import ChooseMembersModal from "./modal/ChooseMembersModal";
+import SetEmployeeModal from "./modal/SetEmployeeModal";
 const { confirm } = Modal;
 const { Search } = Input;
@@ -67,12 +68,9 @@ function EmployeeManage() {
    roleCodes: [],
  });
-  const [valueLike, setValueLike] = useState();
  const [total, setTotal] = useState(0);
  const [model, setModel] = useState<React.ReactNode>(null);
-  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [employeeModal, setEmployeeModal] = useState(false);
-  const [isManager, setIsManager] = useState(true);
-  const [isNormal, setIsNormal] = useState(true);
  const [choosedItem, setChooseItem] = useState<ChoosedItemType>({
    nickName: "",
    phone: "",
@@ -258,19 +256,7 @@ function EmployeeManage() {
  }
  function handleToAddEmployee() {
-    const model: React.ReactNode = (
+    setEmployeeModal(true);
-      <ChooseMembersModal
-        isOpen={true}
-        type="USER"
-        handleChooseModal={(bool: any) => {
-          setModel(null)
-          if (bool) {
-            getEmployeeList();
-          }
-        }}
-      />
-    );
-    setModel(model);
  }
  function handleDeleteEmployee(storeUserId: string) {
@@ -337,6 +323,7 @@ function EmployeeManage() {
                {_.map(roleIds, (item: any) => {
                  return (
                    <CheckBox
+                      key={item.roleCode}
                      text={item.name}
                      name={item.roleCode}
                      onChange={(e: any) => {
@@ -403,6 +390,16 @@ function EmployeeManage() {
          </div>
        </div>
        {model}
+        <ChooseMembersModal
+          isOpen={employeeModal}
+          type="USER"
+          handleChooseModal={(bool: any) => {
+            setEmployeeModal(false)
+            if (bool) {
+              getEmployeeList();
+            }
+          }}
+        />
    </div>
  );
 }

--- a/src/modules/college-manage/modal/ChooseMembersModal.jsx
+++ b/src/modules/college-manage/modal/ChooseMembersModal.jsx
@@ -18,20 +18,21 @@ class ChooseMembersModal extends React.Component {
  constructor(props) {
    super(props);
    this.state = {
+      isOpen: false,
      allUserList : [],                               // 所有成员列表
      selectUserList: [],                             // 已选则成员
      temporaryList: [],                              // 临时用户成员列表（搜索时使用）
      instId : window.currentUserInstInfo.instId,     // 机构Id
      searchKey : null,                                 // 搜索内容  
      selectedRowKeys : [],                            // 勾选的成员  
-      userAuthority: ['可编辑', '可查看/下载', '仅可查看'],
      query: {
        current: 1,
        size: 300,
        enterpriseId: User.getEnterpriseId(),
        storeId: User.getStoreId(),
        visibleTypeEnum: props.type,
-      }
+      },
+      openSetModal: false,
    }
  }
@@ -39,6 +40,19 @@ class ChooseMembersModal extends React.Component {
    this.getUserAuthority();
  }
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.isOpen !== this.props.isOpen) {
+      this.setState({
+        isOpen: nextProps.isOpen,
+        selectedRowKeys : [],
+        allUserList : [],   
+        selectUserList: [], 
+        temporaryList: [], 
+        searchKey : null,     
+      })
+    }
+  }
  // 获取对应文件相关成员
  getUserAuthority = (searchKey='') => {
    const { query } = this.state;
@@ -135,12 +149,11 @@ class ChooseMembersModal extends React.Component {
  }
  // 批量添加成员(点击确定)
-  addUser = () => {
+  addUser = (selectUserList) => {
-    const { selectUserList } = this.state;
    let enterpriseUserList = [];            // 保存新加进去的成员
    selectUserList.map((item) => {
      enterpriseUserList.push({
-        roleCode: 'Cloud_Manager',
+        roleCode: item.roleCode,
        enterpriseVisibleUserId: item.enterpriseVisibleUserId
      })
      return enterpriseUserList
@@ -153,7 +166,8 @@ class ChooseMembersModal extends React.Component {
      if (res.code === '200') {
        this.handleClose(true); 
        this.setState({
-          temporaryList: []
+          temporaryList: [],
+          openSetModal: false,
        })   
      }
    })
@@ -262,8 +276,8 @@ class ChooseMembersModal extends React.Component {
  }
  render() {
-    const { isOpen, type } = this.props;
+    const { type } = this.props;
-    const { selectUserList, allUserList, searchKey, selectedRowKeys } = this.state;
+    const { selectUserList, allUserList, searchKey, selectedRowKeys, openSetModal, isOpen } = this.state;
    const title = '添加员工';
    return (    
      <div>
@@ -277,7 +291,7 @@ class ChooseMembersModal extends React.Component {
              message.warning('请选择员工')
              return null;
            }
-            type === 'USER' ? this.addUser() : this.addCustomer();
+            type === 'USER' ? this.setState({ openSetModal: true, isOpen: false }) : this.addCustomer();
          }}
          title={title}
          width={680}
@@ -338,6 +352,21 @@ class ChooseMembersModal extends React.Component {
            </div>
          </div>   
        </Modal>
+        {openSetModal &&
+          <SetEmployeeModal
+            list={selectUserList}
+            onClose={() => {
+              this.setState({ openSetModal: false, isOpen: true })  
+            }}
+            onCancel={() => {
+              this.props.handleChooseModal();
+              this.setState({ openSetModal: false });
+            }}
+            onOk={(list) => {
+              this.addUser(list);
+            }}
+          />
+        }
      </div>
    )
  }

--- a/src/modules/college-manage/modal/SetEmployeeModal.jsx
+++ b/src/modules/college-manage/modal/SetEmployeeModal.jsx
@@ -42,18 +42,15 @@ export default class SetEmployeeModal extends React.Component {
        visible={true}
        title="添加员工"
        className="set-employee-modal"
-        onOk={() => {
-        }}
        onCancel={() => {
+          this.props.onCancel()
        }}
        wenterpriseVisibleUserIdth={680}
        footer={
          <div className="modal-footer">
-            <Button style={{ float: 'left' }}>上一步</Button>
+            <Button style={{ float: 'left' }} onClick={() => this.props.onClose()}>上一步</Button>
-            <Button>取消</Button>
+            <Button onClick={() => this.props.onCancel()}>取消</Button>
-            <Button type="primary">确定</Button>
+            <Button onClick={() => this.props.onOk(list)} type="primary">确定</Button>
          </div>
        }
      >
@@ -63,7 +60,9 @@ export default class SetEmployeeModal extends React.Component {
              <div
                className={`item ${selected === item.enterpriseVisibleUserId ? ' selected' : ''}`}
                key={item.enterpriseVisibleUserId}
-                onClick={() => this.setState({ selected: item.enterpriseVisibleUserId })}
+                onClick={() => {
+                  this.setState({ selected: item.enterpriseVisibleUserId, roleCode: item.roleCode })
+                }}
              >
                <span className="icon iconfont avatar-icon">&#xe84a;</span>
                <span className='name'>{item.name}</span>

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
@@ -62,7 +62,15 @@ export default class CollegeManagePage extends React.Component {
            <div className="user">
              <img className="image" src={avatar} />
              <span className="name">{name}</span>
-              <span className="logout">退出</span>
+              <span
+                className="logout"
+                onClick={() => {
+                  if (!User.getEnterpriseId()) {
+                    User.setEnterpriseId(list[0].id);
+                  }
+                  window.RCHistory.push('/home');
+                }}
+              >退出</span>
            </div>
          </div>
        </div>

--- a/src/modules/root/CreateCollege.jsx
+++ b/src/modules/root/CreateCollege.jsx
@@ -182,7 +182,12 @@ export default class CreateCollege extends React.Component {
            <div className="user">
              <img className="image" src={avatar} />
              <span className="name">{name}</span>
-              <span className="logout">退出</span>
+              <span
+                className="logout"
+                onClick={() => {
+                  window.RCHistory.goBack();
+                }}
+              >退出</span>
            </div>
          </div>
        </div>