Signed-off-by: cellee <893264950@qq.com>

src/components/SelectCommunity/Tow.tsx

+import React, { useState, useEffect } from 'react';
+import SelectOptions from '../SelectOptions/Tow';
+
+import { connect } from 'umi';
+
+const index = (props: any) => {
+  const { dispatch, CommunityList, value, onChange, checklist } = props;
+
+  // console.log(props)
+
+  const tosCommunityget = (values: any) => {
+    dispatch({ type: 'Init/tosCommunityget', playload: values });
+  };
+  useEffect(() => {
+    if (CommunityList == null) {
+      tosCommunityget(null);
+    }
+  }, []);
+  // 给已选值默认  如果有默认就传递默认 否则传递列表数据
+  useEffect(() => {
+    if (checklist != null) {
+      onChange({ index: 1, value: checklist });
+    } else {
+      onChange({ index: 1, value: CommunityList });
+    }
+  }, [checklist]);
+
+  // 点击选择的时候传递给子组件 已选列表
+  const printContent = (values: any) => {
+    onChange({ index: CommunityList.length == values.length ? 1 : 0, value: values });
+  };
+  return (
+    <>
+      {CommunityList != null ? (
+        <SelectOptions
+          list={CommunityList.sort()}
+          checklist={checklist}
+          show={true}
+          onSubmit={printContent}
+        />
+      ) : null}
+    </>
+  );
+};
+
+function mapStateToProps(state: any) {
+  const { CommunityList } = state.Init;
+  return {
+    CommunityList,
+  };
+}
+export default connect(mapStateToProps)(index);

src/pages/AccountManagement/account/AccountAdds.tsx

@@ -7,7 +7,7 @@ import './Account.less';
 import { zhCnFaci, enUsFaci } from '@/utils/power';
 import { AccountTip } from '@/utils/tip';
 
-import SelectCommunity from '@/components/SelectCommunity';
+import SelectCommunity from '@/components/SelectCommunity/Tow';
 import { getNumber } from '@/utils/string'; // 正则
 import { RA } from '@/utils/method';
 
@@ -105,6 +105,7 @@ const Account = (props: any) => {
     if (Info != null) {
       setCommunity(Info.community);
       power(Info.permissions);
+      setCheckedKeys([]);
     }
   }, [Info]);
 
@@ -148,9 +149,6 @@ const Account = (props: any) => {
     const userInfo = localStorage.getItem('userInfo') || '';
     const id = JSON.parse(userInfo).userModel.id;
 
-    console.log(treeDataList);
-    console.log();
-
     if (
       value.tosAccountName.length <= 2 &&
       value.tosUserPhone.length != 8 &&
@@ -182,9 +180,7 @@ const Account = (props: any) => {
       value.tosUserLevel = values; //级别
       value.creatorName = JSON.parse(userInfo).userModel.tosUserName; //新建者账号
       value.creatorId = id; //新建者ID
-      if (values == 3) {
-        value.userLeader = towAccountId;
-      }
+
       delete value.community;
 
       // 判断有没有 0  有就删除
@@ -194,7 +190,7 @@ const Account = (props: any) => {
 
       // 追加到上级id
       let Obj = treeData[0].children;
-      console.log(Obj);
+
       for (let i in Obj) {
         for (let j in checkedKeys) {
           if (JSON.stringify(Obj[i].children).indexOf(JSON.stringify(checkedKeys[j])) != -1) {
@@ -208,6 +204,9 @@ const Account = (props: any) => {
         return parseInt(n1) - parseInt(n2);
       });
 
+      if (values == 3) {
+        value.userLeader = towAccountId;
+      }
       // 另传权限
       let obj = {
         userName: value.tosUserName,
@@ -255,25 +254,12 @@ const Account = (props: any) => {
   //级别切换
   const onRadio = (e: any) => {
     setvalues(e.target.value);
-
-    // 如果是3级，取消后面两个选择
-    let treeDatas = treeDataList; //将转换而来的字符串转换为原生js对
-    let _p = treeDatas[0].children; // 所有权限列表
-    // 禁用最后两个
-    if (e.target.value == 3) {
-      _p[_p.length - 1].children[2].disableCheckbox = true;
-      _p[_p.length - 1].children[3].disableCheckbox = true;
-    } else {
+    // setCheckedKeys([]);
+    if (e.target.value == 2) {
       //否则打开
-      _p[_p.length - 1].children[2].disableCheckbox = false;
-      _p[_p.length - 1].children[3].disableCheckbox = false;
-
       settowAccountId(null);
       setCommunity(CommunityList);
     }
-    // 赋值改变
-    treeDatas[0].children = _p;
-    settreeDataList(treeDatas as any); // 可勾选列表
   };
 
   //手机号

src/pages/AccountManagement/account/AccountDetail.tsx

@@ -39,7 +39,6 @@ const Account = (props: any) => {
   const [values, setvalues] = useState(2); // 树形菜单展开关闭
 
   const [over, setOver] = useState(false); // 关闭账号确认弹窗
-  const [accountName, setaccountName] = useState(null as any); // 弹窗账号信息
 
   // 表单标识
   const [form] = Form.useForm();
@@ -48,7 +47,6 @@ const Account = (props: any) => {
   // // 数据
   useEffect(() => {
     if (DataSave != null) {
-      console.log(DataSave.tosUserLevel);
       // 赋值
       form.setFieldsValue({
         tosUserName: DataSave.tosUserName,
@@ -195,14 +193,6 @@ const Account = (props: any) => {
     setSelectedKeys(selectedKeys);
   };
 
-  // 管理员级别样式
-  const radioStyle = {
-    display: 'block',
-    height: '30px',
-    lineHeight: '30px',
-    marginBottom: '15px',
-  };
-
   // 监听改变状态提交结果
   useEffect(() => {
     if (Result != null) {
@@ -216,11 +206,6 @@ const Account = (props: any) => {
     }
   }, [Result]);
 
-  //级别切换
-  const onRadio = (e: any) => {
-    setvalues(e.target.value);
-  };
-
   //手机号
   const keyup_communityManagerFee = (e: any) => {
     e.target.value = keyup_tool(e.target.value);
@@ -232,9 +217,14 @@ const Account = (props: any) => {
 
   // 停用账号弹窗
   const lockS = () => {
+    // 先判断是不是自己
+    const userInfo = JSON.parse(localStorage.getItem('userInfo') || '[]');
+    if (userInfo.userModel.id == DataSave.id) {
+      message.info('Unable to close own account!');
+      return;
+    } else {
       setOver(true);
-    setaccountName(DataSave);
-    console.log(DataSave);
+    }
   };
 
   // 关闭弹窗
@@ -246,9 +236,9 @@ const Account = (props: any) => {
   const handleOk = (e: any) => {
     //
     let obj = {
-      // userStatus: accountName.userStatus == 0 ? 1 : 0,
+      // userStatus: DataSave.userStatus == 0 ? 1 : 0,
       userStatus: 1,
-      userID: accountName.tosUserId,
+      userID: DataSave.tosUserId,
     };
     RA(52, obj, module, dispatch);
     // setOver(false);
@@ -261,10 +251,14 @@ const Account = (props: any) => {
           <EditOutlined />
           &nbsp; Detail Account
           <div className="back">
+            {DataSave && DataSave.tosUserLevel <= 2 ? (
               <Button type="primary" danger style={{ marginRight: 15 }} onClick={lockS}>
                 <PoweroffOutlined />
                 Close Account
               </Button>
+            ) : (
+              ''
+            )}
             <Button onClick={goToReturn}>
               <LeftOutlined />
               Back
@@ -330,11 +324,11 @@ const Account = (props: any) => {
                 color="success"
                 style={{ verticalAlign: 'sub', fontSize: 14, padding: '4px 7px' }}
               >
-                {DataSave.tosUserLevel == 2
+                {DataSave && DataSave.tosUserLevel == 2
                   ? 'Two Level Administrator '
                   : 'Three Level Administrator'}
               </Tag>
-              {DataSave.tosUserLevel == 3 ? (
+              {DataSave && DataSave.tosUserLevel == 3 ? (
                 <Tag
                   icon={<RightOutlined />}
                   color="processing"
@@ -388,11 +382,11 @@ const Account = (props: any) => {
           onCancel={handleCancel}
           confirmLoading={loading}
         >
-          {accountName != null ? (
+          {DataSave != null ? (
             <p>
               Are You Sure To{' '}
-              <span style={{ color: 'red' }}>{accountName.userStatus != 1 ? 'Close' : 'Open'}</span>{' '}
-              The Account '<span style={{ color: 'red' }}> {accountName.tosUserName} </span>' ?
+              <span style={{ color: 'red' }}>{DataSave.userStatus != 1 ? 'Close' : 'Open'}</span>{' '}
+              The Account '<span style={{ color: 'red' }}> {DataSave.tosUserName} </span>' ?
             </p>
           ) : (
             ''

src/pages/AccountManagement/account/AccountEdit.tsx

@@ -91,6 +91,8 @@ const Account = (props: any) => {
 
       // 发起获取权限请求
       RA(54, { tosUserName: DataSave.tosUserName }, module, dispatch); // 发起获取权限请求
+    } else {
+      history.push('/AccountManagement/account');
     }
   }, [DataSave, user]);
 
@@ -357,11 +359,11 @@ const Account = (props: any) => {
                 color="success"
                 style={{ verticalAlign: 'sub', fontSize: 14, padding: '4px 7px' }}
               >
-                {DataSave.tosUserLevel == 2
+                {DataSave && DataSave.tosUserLevel == 2
                   ? 'Two Level Administrator '
                   : 'Three Level Administrator'}
               </Tag>
-              {DataSave.tosUserLevel == 3 ? (
+              {DataSave && DataSave.tosUserLevel == 3 ? (
                 <Tag
                   icon={<RightOutlined />}
                   color="processing"

src/pages/CommunityManagement/FacilityBookings/BookingDetail.tsx

@@ -167,7 +167,10 @@ const BookingDetail = (props: any) => {
             <hr />
 
             {/* 已交押金且未产生退费 */}
-            {DataSave != null && DataSave.managerFeeStatus == 1 && DataSave.backMarginFee > 0 ? (
+            {DataSave &&
+            DataSaveDetail &&
+            DataSave.managerFeeStatus == 1 &&
+            DataSaveDetail.backMarginFee == 0 ? (
               <>
                 <Form
                   ref={formRef}