Bug修复

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

config/config.ts

@@ -345,6 +345,7 @@ export default defineConfig({
                     { path: './', component: './AccountManagement/account/Account' },
                     { path: './edit', component: './AccountManagement/account/AccountEdit' },
                     { path: './Add', component: './AccountManagement/account/AccountAdds' },
+                    { path: './Detail', component: './AccountManagement/account/AccountDetail' },
                     { path: './reset', component: './AccountManagement/account/AccountReset' },
                   ],
                 },

src/pages/AccountManagement/account/Account.tsx

@@ -127,7 +127,7 @@ const Account = (props: any) => {
           <Button
             type="link"
             onClick={() => {
-              edit(record);
+              detail(record);
             }}
           >
             Detail
@@ -162,6 +162,13 @@ const Account = (props: any) => {
     }
   };
 
+  // 详情
+  const detail = (item: any) => {
+    let DataSave = item;
+    dispatch({ type: 'Account/SA', DataSave });
+    history.push('/AccountManagement/account/Detail');
+  };
+
   // 停用账号弹窗
   const lockS = (item: any) => {
     setOver(true);

src/pages/AccountManagement/account/AccountDetail.tsx

+import React, { useState, useEffect, useRef } from 'react';
+import { Form, Input, Button, Spin, message, Descriptions, Checkbox, Tree, Radio } from 'antd';
+import { connect, history } from 'umi';
+import { SearchOutlined, ClearOutlined, EditOutlined, LeftOutlined } from '@ant-design/icons';
+import { getCookie } from '@/utils/method';
+
+import './Account.less';
+import { zhCnFaci, enUsFaci } from '@/utils/power';
+import { AccountTip } from '@/utils/tip';
+
+import SelectCommunity from '@/components/SelectCommunity';
+import { getNumber } from '@/utils/string'; // 正则
+import { RA } from '@/utils/method';
+
+import moment from 'moment';
+
+const Account = (props: any) => {
+  const module = 'Account';
+
+  const { dispatch, Data, DataSave, DataSaveDetail, Result, loading, Permission, user } = props;
+
+  // 权限列表
+  const treeData = enUsFaci || zhCnFaci;
+
+  const [expandedKeys, setExpandedKeys] = useState<string[]>([]); // 展开栏目
+  const [checkedKeys, setCheckedKeys] = useState<string[]>([]); // 默认已选栏目
+  const [selectedKeys, setSelectedKeys] = useState<string[]>([]); // 设置选中的树节点
+  const [autoExpandParent, setAutoExpandParent] = useState<boolean>(true); // 树形菜单展开关闭
+
+  // 单选 二级还是三级管理员
+  const [values, setvalues] = useState(2); // 树形菜单展开关闭
+
+  // 已选小区
+  const [ServiceCell, setServiceCell] = useState(null as any);
+
+  // 表单标识
+  const [form] = Form.useForm();
+  const formRef = useRef(null);
+
+  // 拉取数据的条件存储
+  // const [term, setTerm] = useState({} as any);
+  // 小区列表
+  // const [comList, setCommunityList] = useState(CommunityList as any);
+
+  // // 数据
+  useEffect(() => {
+    if (DataSave != null) {
+      console.log(DataSave);
+      // 赋值
+      form.setFieldsValue({
+        tosUserName: DataSave.tosUserName,
+        tosUserPhone: DataSave.tosUserPhone,
+        tosAccountName: DataSave.tosAccountName,
+      });
+
+      setvalues(DataSave.tosUserLevel); // 等级
+      setServiceCell(DataSave.tosUserServiceCell.split(',')); // 已选小区
+
+      // 发起获取权限请求
+      RA(54, { tosUserName: DataSave.tosUserName }, module, dispatch); // 发起获取权限请求
+    }
+
+    let a = [];
+    for (var i = 0; i <= 66; i++) {
+      a.push(i);
+    }
+    console.log(a);
+  }, [DataSave]);
+
+  // 当前账户权限
+  useEffect(() => {
+    if (user != null) {
+      let treeDatas = treeData;
+      let _a = user.currentUser.permission; // 当前账户权限
+      let _p = treeDatas[0].children; // 所有权限列表
+
+      let arr: any = []; // 一级栏目权限
+      let erArr: any = []; // 一级栏目权限
+      // 循环一级 判断当前账户有没有权限修改增加
+      for (let i of _a) {
+        for (let j in _p) {
+          if (_p[j].key == i) {
+            arr.push(_p[j].key);
+            _p[j].disabled = false;
+          }
+          // 二级权限
+          for (let k in _p[j].children) {
+            if (_p[j].children[k].key == i) {
+              erArr.push(_p[j].children[k].key);
+              _p[j].children[k].disableCheckbox = false;
+            }
+          }
+        }
+      }
+      // 赋值改变
+      treeDatas[0].children = _p;
+      setCheckedKeys(treeDatas as any); // 可勾选列表
+    }
+  }, [user]);
+
+  // 已选权限
+  useEffect(() => {
+    if (Permission != null) {
+      let newPer = eval('(' + Permission + ')');
+      let data: any = [];
+      for (let i in newPer) {
+        data[i] = newPer[i] + '';
+      }
+      setCheckedKeys(data);
+    }
+  }, [Permission]);
+
+  // 保存提交
+  const onFinishContract = async (value: any) => {
+    // console.log(value);
+    if (checkedKeys.length == 0) {
+      // 权限
+      message.error('Please Select Permission!');
+      return false;
+    } else if (value.community.value == null || value.community.value.length == 0) {
+      // 小区
+      message.error('Please Select The Jurisdiction Area!');
+      return false;
+    } else if (value.tosUserName.length < 6) {
+      // 账号长度
+      message.error('The Account Password is Greater Than 6 Digits!');
+      return false;
+    } else {
+      value.tosUserServiceCellList = value.community.value; // 管辖小区
+      value.tosUserEmail = value.tosUserName; //  邮箱就是账号
+      value.tosUserLevel = values; //级别
+      value.creatorName = getCookie('name'); //新建者账号
+      value.creatorId = getCookie('id'); //新建者ID
+      delete value.community;
+      // console.log(value);
+
+      // 另传权限
+      let obj = {
+        userName: value.tosUserName,
+        userPassword: value.tosUserPwd,
+        permissionArray: checkedKeys.sort((n1, n2) => {
+          return parseInt(n1) - parseInt(n2);
+        }),
+      };
+      // console.log(obj);
+
+      RA(38, value, module, dispatch); // 信息上传
+      RA(42, obj, module, dispatch); // 权限上传
+    }
+  };
+
+  //goToReturn
+  const goToReturn = () => {
+    history.go(-1);
+  };
+
+  // 全选
+  const onCheckAllChange = (e: any) => {};
+
+  // 展开/收起树形菜单触发
+  const onExpand = (expandedKeys: any) => {
+    setExpandedKeys(expandedKeys);
+    setAutoExpandParent(false);
+  };
+
+  // 点击单个触发
+  const onCheck = (checkedKeys: any) => {
+    console.log('onCheck', checkedKeys);
+    setCheckedKeys(checkedKeys);
+  };
+
+  // 点击树节点触发  - 大栏目
+  const onSelect = (selectedKeys: any, info: any) => {
+    console.log('onSelect', info);
+    setSelectedKeys(selectedKeys);
+  };
+
+  // 管理员级别样式
+  const radioStyle = {
+    display: 'block',
+    height: '30px',
+    lineHeight: '30px',
+    marginBottom: '15px',
+  };
+
+  //级别切换
+  const onRadio = (e: any) => {
+    setvalues(e.target.value);
+  };
+
+  //手机号
+  const keyup_communityManagerFee = (e: any) => {
+    e.target.value = keyup_tool(e.target.value);
+  };
+  const keyup_tool = (value: any) => {
+    return getNumber(value.replace(/[^\d^\.]+/g, ''));
+  };
+  // 选择小区名字并赋值
+
+  return (
+    <Spin spinning={loading}>
+      <div className="contop" style={{ padding: '12px 20px' }}>
+        <h3 className="capi">
+          <EditOutlined />
+          &nbsp; Detail Account
+          <div className="back">
+            <Button onClick={goToReturn}>
+              <LeftOutlined />
+              Back
+            </Button>
+          </div>
+        </h3>
+        <hr></hr>
+
+        <Form
+          ref={formRef}
+          form={form}
+          autoComplete="off"
+          // layout="inline"
+          layout="horizontal"
+          name="contract"
+          onFinish={onFinishContract}
+        >
+          <Descriptions column={{ xs: 1, sm: 2, md: 3 }}>
+            <Descriptions.Item>
+              <Form.Item name="tosUserName" label="Account ID" rules={AccountTip[0]}>
+                <Input placeholder="Login Account" className="input" disabled />
+              </Form.Item>
+            </Descriptions.Item>
+          </Descriptions>
+
+          <Descriptions column={{ xs: 1, sm: 2, md: 3 }}>
+            <Descriptions.Item>
+              <Form.Item name="tosAccountName" label="Name" rules={AccountTip[1]}>
+                <Input placeholder="Name Of Administrator" className="input" disabled />
+              </Form.Item>
+            </Descriptions.Item>
+            <Descriptions.Item>
+              <Form.Item name="tosUserPhone" label="Phone" rules={AccountTip[2]}>
+                <Input
+                  placeholder="Contact Information"
+                  className="input"
+                  maxLength={11}
+                  onKeyUp={keyup_communityManagerFee}
+                  disabled
+                />
+              </Form.Item>
+            </Descriptions.Item>
+          </Descriptions>
+
+          <Form.Item name="community" label="Community">
+            <SelectCommunity />
+          </Form.Item>
+
+          <div className="diy" style={{ marginBottom: '14px' }}>
+            <div className="label">
+              <span className="title">Privilege Level：</span>
+            </div>
+            <div className="label">
+              <Radio.Group defaultValue={values} onChange={onRadio} disabled>
+                <Radio style={radioStyle} value={2}>
+                  Two Level Administrator
+                </Radio>
+                <Radio style={radioStyle} value={3}>
+                  Three Level Administrator
+                  {/* <Input placeholder="三级管理员" style={{ width: 160, marginLeft: 10 }} /> */}
+                </Radio>
+              </Radio.Group>
+            </div>
+          </div>
+
+          <div className="diy" style={{ marginBottom: '24px' }}>
+            <div className="label">
+              <span className="title">Permission List：</span>
+            </div>
+            <div className="label">
+              <Tree
+                checkable
+                onExpand={onExpand}
+                expandedKeys={expandedKeys}
+                autoExpandParent={autoExpandParent}
+                onCheck={onCheck}
+                checkedKeys={checkedKeys}
+                onSelect={onSelect}
+                selectedKeys={selectedKeys}
+                treeData={treeData}
+                disabled
+              />
+            </div>
+          </div>
+
+          <div className="diy">
+            <div className="label"></div>
+            <div className="label">
+              <Button type="primary" htmlType="submit" loading={loading} disabled>
+                Submit
+              </Button>
+            </div>
+          </div>
+        </Form>
+      </div>
+    </Spin>
+  );
+};
+
+const AccountProps = (state: any) => {
+  const { Data, DataSave, DataSaveDetail, Result, Permission } = state.Account;
+  const loading = state.loading.models.Account || false;
+  const { user } = state;
+  return {
+    Data,
+    DataSave,
+    DataSaveDetail,
+    Result,
+    loading,
+    Permission,
+    user,
+  };
+};
+
+export default connect(AccountProps)(Account);

src/pages/AccountManagement/account/AccountEdit.tsx

 import React, { useState, useEffect, useRef } from 'react';
 import { Form, Input, Button, Spin, message, Descriptions, Checkbox, Tree, Radio } from 'antd';
 import { connect, history } from 'umi';
-import { SearchOutlined, ClearOutlined, EditOutlined, LeftOutlined } from '@ant-design/icons';
+import { SearchOutlined, PoweroffOutlined, EditOutlined, LeftOutlined } from '@ant-design/icons';
 import { getCookie } from '@/utils/method';
 
 import './Account.less';
@@ -204,6 +204,10 @@ const Account = (props: any) => {
           <EditOutlined />
           &nbsp; Edit Account
           <div className="back">
+            <Button type="primary" danger style={{ marginRight: 15 }}>
+              <PoweroffOutlined />
+              Close Account
+            </Button>
             <Button onClick={goToReturn}>
               <LeftOutlined />
               Back

src/pages/ContractManagement/ContractContent.tsx

@@ -167,13 +167,13 @@ const ContractContent = (props: any) => {
     action: '/tos/image/upload',
     data: { imageType: 'tosContract', extends: comtyName },
     fileList: fileList,
-    onChange: ({ file, fileList }: { file: any; fileList: any }) => {
+    onChange: ({ file }: { file: any }) => {
       if (file.status === 'uploading') {
         setimgLoad(true);
       }
       if (file.status == 'done') {
-        message.success(file.name);
-        setFileList(fileList);
+        message.success(file.name + ' Upload Successful !');
+        setFileList([...fileList, file]);
         // 添加到表单
         form.setFieldsValue({
           upload: 'ok',
@@ -253,32 +253,22 @@ const ContractContent = (props: any) => {
 
   // 文件上传判断
   function beforeUpload(file: any) {
-    // 文件类型判断
-    const isJpgOrPng =
-      file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
-    if (!isJpgOrPng) {
-      message.error('You can only upload JPG/PNG file!');
-      return false;
-    }
     // 文件大小判断
     const isLt2M = file.size / 1024 / 1024 < 2;
     if (!isLt2M) {
       message.error('Image must smaller than 2MB!');
-      return false;
     }
-    return isJpgOrPng && isLt2M;
+    return isLt2M;
   }
 
   // 移除文件
   const onRemove = async (file: any) => {
-    console.log('点击');
     let fileListArr = fileList;
     for (let i in fileListArr) {
       if (fileListArr[i].uid == file.uid) {
         fileListArr.splice(i, 1);
       }
     }
-    console.log(fileListArr);
     setFileList([...fileListArr]);
   };
 

src/pages/ContractManagement/ContractDetail copy.tsx

-import React, { useEffect, useState } from 'react';
-import { connect, history } from 'umi';
-import { Spin, Descriptions } from 'antd';
-import { LeftOutlined } from '@ant-design/icons';
-import moment from 'moment';
-
-import './ContractContent.less';
-
-import PreView from '@/components/PreView/PreViewTow';
-
-const ContractDetail = (props: any) => {
-  const { Contract, dispatch, FileImg, loading } = props;
-  const { DataSaveDetail } = Contract;
-  const RA = (index: any, values: any) => {
-    dispatch({ type: 'Contract/RA', playload: { index: index, body: values } });
-  };
-  const goToReturn = () => {
-    history.go(-1);
-  };
-
-  const [fileList, setFileList] = useState([] as any); // 图片列表
-  const [tipTime, setTipTime] = useState(['previous month', 'two months'] as any); //提示时间
-
-  // 带来信息
-  useEffect(() => {
-    if (DataSaveDetail == null) {
-      history.push('/ContractManagement');
-    } else {
-      // 请求
-      let objData = {
-        type: 'tosContractPreview',
-        fileName: DataSaveDetail.contractFileName,
-        extends: DataSaveDetail.communityName,
-      };
-      RA(47, objData);
-
-      // 设置提示时间
-      let a1 = moment(DataSaveDetail.contractValidEndDate)
-        .subtract(2, 'month')
-        .format('YYYY-MM-DD');
-      let a2 = moment(DataSaveDetail.contractValidEndDate)
-        .subtract(1, 'month')
-        .format('YYYY-MM-DD');
-      setTipTime([a1, a2]);
-    }
-  }, [DataSaveDetail]);
-
-  // 监听图片列表
-  useEffect(() => {
-    if (FileImg != null) {
-      let obj = new Array();
-      for (var i in FileImg) {
-        let a = {
-          uid: i,
-          name: FileImg[i].fileName,
-          status: 'done',
-          type: FileImg[i].fileName.match(/\.([^\.]+)$/)[1].toLowerCase(),
-          url: FileImg[i].fileUrl,
-        };
-        obj.push(a);
-      }
-      setFileList([...obj]);
-    } else {
-      setFileList([]);
-    }
-  }, [FileImg]);
-
-  return (
-    <Spin spinning={loading}>
-      {DataSaveDetail ? (
-        <div className="base">
-          {/* 头部组件 */}
-          <div className="box">
-            <div className="item1">Detail Contract</div>
-            <button className="item3" onClick={goToReturn}>
-              <LeftOutlined />
-              Back
-            </button>
-          </div>
-          <div className="">
-            <Descriptions title="" bordered layout="vertical">
-              <Descriptions.Item label="Contract Number :">
-                {DataSaveDetail.contractNumber}
-              </Descriptions.Item>
-              <Descriptions.Item label="Party A :">
-                {DataSaveDetail.contractPartyA}
-              </Descriptions.Item>
-              <Descriptions.Item label="Party B :">
-                {DataSaveDetail.contractPartyB}
-              </Descriptions.Item>
-              <Descriptions.Item label="Contract Title :" span={2}>
-                {DataSaveDetail.contractTitle}
-              </Descriptions.Item>
-              <Descriptions.Item label="Community Name :">
-                {DataSaveDetail.communityName}
-              </Descriptions.Item>
-
-              <Descriptions.Item label="Date :">
-                <p>
-                  {DataSaveDetail.contractValidStartDate} ~ {DataSaveDetail.contractValidEndDate}
-                </p>
-                <p style={{ marginBottom: 0, color: '#999' }}>
-                  The system will send e-mail notification in the{' '}
-                  <span style={{ color: 'red' }}>{tipTime[0]}</span> and{' '}
-                  <span style={{ color: 'red' }}>{tipTime[1]}</span> that the contract is about to
-                  expire !
-                </p>
-                {/* <p style={{ marginBottom: 0 }}>
-                  <span style={{ color: 'red' }}>*</span> If the time has passed, it will not be
-                  sent
-                </p> */}
-              </Descriptions.Item>
-              <Descriptions.Item label="Contacts :">
-                {DataSaveDetail.communityAccount}
-              </Descriptions.Item>
-              <Descriptions.Item label="Phone :">{DataSaveDetail.communityPhone}</Descriptions.Item>
-
-              <Descriptions.Item label="Contract Annex :" span={3}>
-                {fileList.map((item: any, index: number) => {
-                  return <PreView OpenUrl={item} key={index}></PreView>;
-                })}
-              </Descriptions.Item>
-              <Descriptions.Item label="Contract Remarks :">
-                {DataSaveDetail.contractRemindContent}
-              </Descriptions.Item>
-            </Descriptions>
-          </div>
-        </div>
-      ) : (
-        ''
-      )}
-    </Spin>
-  );
-};
-
-function mapStateToProps(state: any) {
-  const { Contract } = state;
-  const { FileImg } = Contract;
-  const loading = state.loading.models.Contract || false;
-  return {
-    Contract,
-    FileImg,
-    loading,
-  };
-}
-export default connect(mapStateToProps)(ContractDetail);