111

src/pages/issue/index.jsx

@@ -1,3 +1,4 @@
+// 此页面包含两个接口  后端需要注意
 import React from "react";
 import { Button, Badge } from "antd";
 import { useNavigate } from "react-router-dom";
@@ -43,7 +44,6 @@ export default (props) => {
       isResponsible ? exportTaOrgIssue : exportTaIssue,
     ];
   }, [isResponsible, org]);
-
   const columns = [
     {
       title: "问题单号",
@@ -149,7 +149,7 @@ export default (props) => {
       search: false,
       ellipsis: true,
       render: (_, row) => {
-        if (row.endDate) return row.endDate.replace("T", "-");
+        if (row.endDate) return row.endDate.replace("T", " ");
         return row.endDate;
       },
     },

src/pages/org/components/Form.jsx

@@ -1,102 +1,90 @@
-import React from 'react';
-import { Button, Radio, Form, Input, Select } from 'antd';
-import useBool from '@/utils/hooks/useBool';
+import React from "react";
+import { Button, Radio, Form, Input, Select } from "antd";
+import useBool from "@/utils/hooks/useBool";
 import { postSysOrg, putSysOrg, getSysOrgById } from "@/service/sysorg";
-import { formItemLayout, tailFormItemLayout } from '@/utils/form';
+import { formItemLayout, tailFormItemLayout } from "@/utils/form";
 
 export default (props) => {
   const { org, list, parentId, onChange } = props;
 
   const [submiting, startSubmit, cancelSubmit] = useBool();
   const [form] = Form.useForm();
-  
+
   const onFinish = (values) => {
     startSubmit();
     if (org?.orgId) {
       // 修改
-      putSysOrg(org.orgId, values).then((res) => {
-        cancelSubmit();
-        onChange(res);
-      }).catch(() => {
-        cancelSubmit();
-      });
+      putSysOrg(org.orgId, values)
+        .then((res) => {
+          cancelSubmit();
+          onChange(res);
+        })
+        .catch(() => {
+          cancelSubmit();
+        });
     } else {
       // 新增
-      postSysOrg(values).then((res) => {
-        cancelSubmit();
-        onChange(res);
-      }).catch(() => {
-        cancelSubmit();
-      });
+      postSysOrg(values)
+        .then((res) => {
+          cancelSubmit();
+          onChange(res);
+        })
+        .catch(() => {
+          cancelSubmit();
+        });
     }
-  }
+  };
 
   React.useEffect(() => {
     form.resetFields();
     if (org) {
       form.setFieldsValue(org);
     } else {
-      form.setFieldValue('orgPId', parentId);
-      form.setFieldValue('isResponsible', true);
+      form.setFieldValue("orgPId", parentId);
+      form.setFieldValue("isResponsible", true);
     }
 
     console.log(org, parentId);
   }, [org, parentId]);
 
   return (
-    <Form onFinish={onFinish} form={form} {...formItemLayout} style={{width: '800px'}}>
+    <Form
+      onFinish={onFinish}
+      form={form}
+      {...formItemLayout}
+      style={{ width: "90%" }}
+    >
       <Form.Item
         name="name"
         label="机构名称"
-        rules={[
-          {required: true, message: '请填写机构名称'}
-        ]}
+        rules={[{ required: true, message: "请填写机构名称" }]}
       >
         <Input />
       </Form.Item>
-      <Form.Item
-        name="orgPId"
-        label="上级单位"
-      >
+      <Form.Item name="orgPId" label="上级单位">
         <Select>
-          {
-            (list || []).map(x => (
-              <Select.Option key={x.orgId}>
-                {x.name}
-              </Select.Option>
-            ))
-          }
+          {(list || []).map((x) => (
+            console.log(x),
+            <Select.Option key={x.orgId}>{x.name}</Select.Option>
+          ))}
         </Select>
       </Form.Item>
 
-      <Form.Item
-        name="isResponsible"
-        label="责任单位"
-      >
+      <Form.Item name="isResponsible" label="责任单位">
         <Radio.Group>
           <Radio value={true}>是</Radio>
           <Radio value={false}>否</Radio>
         </Radio.Group>
       </Form.Item>
 
-      <Form.Item
-        name="sortNo"
-        label="排序"
-      >
+      <Form.Item name="sortNo" label="排序">
         <Input />
       </Form.Item>
 
-
-      <Form.Item
-        name="status"
-        label="状态"
-      >
-        <Select
-          style={{ width: '100%' }}
-          placeholder="请选择状态"
-        >
-          <Option value={0}>不正常</Option>
-          <Option value={1}>正常</Option>
+      <Form.Item name="status" label="状态">
+        <Select style={{ width: "100%" }} placeholder="请选择状态">
+          <Select.Option value={0}>不正常</Select.Option>
+          <Select.Option value={1}>正常</Select.Option>
         </Select>
       </Form.Item>
       <Form.Item {...tailFormItemLayout}>
@@ -105,5 +93,5 @@ export default (props) => {
         </Button>
       </Form.Item>
     </Form>
-  )
-}
+  );
+};

src/pages/role/list.jsx

@@ -1,23 +1,23 @@
-import React from 'react';
-import { Button, Input, List, Popconfirm, Spin, Modal, message } from 'antd';
-import useBool from '@/utils/hooks/useBool';
-import classNames from 'classnames';
+import React from "react";
+import { Button, Input, List, Popconfirm, Spin, Modal, message } from "antd";
+import useBool from "@/utils/hooks/useBool";
+import classNames from "classnames";
 import {
   getSysRole,
   postSysRole,
   putSysRole,
   deleteSysRole,
-} from '@/service/sysrole';
-import './style.less';
+} from "@/service/sysrole";
+import "./style.less";
 
 const Header = (props) => {
   return (
-    <div className='role-list-header'>
-      <div className='role-list-header-body'>{props.children}</div>
-      <div className='role-list-header-action'>{props.action}</div>
+    <div className="role-list-header">
+      <div className="role-list-header-body">{props.children}</div>
+      <div className="role-list-header-action">{props.action}</div>
     </div>
-  )
-}
+  );
+};
 
 export default (props) => {
   const { current, onChange } = props;
@@ -32,30 +32,32 @@ export default (props) => {
     openModel();
     setInText();
     onChange();
-  }
+  };
 
   const onEdit = (item) => {
     openModel();
     setInText(item.name);
     onChange(item);
-  }
+  };
 
   const onDelete = (item) => {
     startLoading();
     // 删除角色
-    deleteSysRole(item.roleId).then(() => {
-      setList(list.filter(x => x.roleId !== item.roleId));
-      cancelLoading();
-      hideModel();
-      onChange();
-    }).catch(() => {
-      cancelLoading();
-    })
-  }
+    deleteSysRole(item.roleId)
+      .then(() => {
+        setList(list.filter((x) => x.roleId !== item.roleId));
+        cancelLoading();
+        hideModel();
+        onChange();
+      })
+      .catch(() => {
+        cancelLoading();
+      });
+  };
 
   const handleOk = () => {
     if (!inText) {
-      message.warn('请输入角色名称');
+      message.warn("请输入角色名称");
       return;
     }
     startLoading();
@@ -63,43 +65,49 @@ export default (props) => {
 
     if (current) {
       // 修改角色
-      putSysRole(current.roleId, data).then(res => {
-        setList(list.map(x => x.roleId === current.roleId ? res : x));
-        cancelLoading();
-        hideModel();
-      }).catch(() => {
-        cancelLoading();
-      })
+      putSysRole(current.roleId, data)
+        .then((res) => {
+          setList(list.map((x) => (x.roleId === current.roleId ? res : x)));
+          cancelLoading();
+          hideModel();
+        })
+        .catch(() => {
+          cancelLoading();
+        });
     } else {
       // 新增角色
-      postSysRole(data).then((res) => {
-        setList([res].concat(list));
-        cancelLoading();
-        hideModel();
-        onChange(res);
-      }).catch(() => {
-        cancelLoading();
-      })
+      postSysRole(data)
+        .then((res) => {
+          setList([res].concat(list));
+          cancelLoading();
+          hideModel();
+          onChange(res);
+        })
+        .catch(() => {
+          cancelLoading();
+        });
     }
-  }
+  };
 
   const handleCancel = () => {
     if (loading) {
-      return ;
+      return;
     }
 
     hideModel();
-  }
+  };
 
   const queryRoles = React.useCallback((params) => {
     startLoading();
-    getSysRole(params).then(res => {
-      setList(res.records);
-      cancelLoading();
-      setFinished(res.current >= res.pages);
-    }).catch(() => {
-      cancelLoading();
-    });
+    getSysRole(params)
+      .then((res) => {
+        setList(res.records);
+        cancelLoading();
+        setFinished(res.current >= res.pages);
+      })
+      .catch(() => {
+        cancelLoading();
+      });
   }, []);
 
   React.useEffect(() => {
@@ -109,19 +117,39 @@ export default (props) => {
   return (
     <Spin spinning={loading}>
       <List
-        header={<Header action={<Button type='primary' onClick={onAdd}>新增</Button>}>角色列表</Header>}
-        style={{ background: '#fff' }}
+        header={
+          <Header
+            action={
+              <Button type="primary" onClick={onAdd}>
+                新增
+              </Button>
+            }
+          >
+            角色列表
+          </Header>
+        }
+        style={{ background: "#fff" }}
         bordered
         dataSource={list}
-        renderItem={item => (
+        renderItem={(item) => (
           <List.Item
-            className={classNames('role-list-item', { active: current && current.roleId === item.roleId })}
+            className={classNames("role-list-item", {
+              active: current && current.roleId === item.roleId,
+            })}
             onClick={() => onChange(item)}
             actions={[
-              <Button key='edit' type='link' onClick={() => onEdit(item)}>编辑</Button>,
-              <Popconfirm key='delete' title="确认删除?" onConfirm={() => onDelete(item)}>
-                <Button type='link' danger>删除</Button>
-              </Popconfirm>
+              <Button key="edit" type="link" onClick={() => onEdit(item)}>
+                编辑
+              </Button>,
+              <Popconfirm
+                key="delete"
+                title="确认删除?"
+                onConfirm={() => onDelete(item)}
+              >
+                <Button type="link" danger>
+                  删除
+                </Button>
+              </Popconfirm>,
             ]}
           >
             {item.name}
@@ -134,8 +162,8 @@ export default (props) => {
         onOk={handleOk}
         onCancel={handleCancel}
       >
-        <Input value={inText} onChange={e => setInText(e.target.value)} />
+        <Input value={inText} onChange={(e) => setInText(e.target.value)} />
       </Modal>
     </Spin>
-  )
-}
+  );
+};