feats

src/pages/org/edit/index.jsx

@@ -0,0 +1,113 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Card, Form, Input, Select } from 'antd';
+import useBool from '@/utils/hooks/useBool';
+import { postSysOrg, putSysOrg, getSysOrgById } from "@/service/sysorg";
+import { useSearchParams, useNavigate } from 'react-router-dom';
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 8,
+    },
+  },
+};
+
+const { Option } = Select;
+
+export default (props) => {
+
+  const [loading, startLoading, cancelLoading] = useBool();
+  const [submiting, startSubmit, cancelSubmit] = useBool();
+  const [form] = Form.useForm();
+  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const [data, setDate] = useState();
+
+  useEffect(() => {
+    if (id) {
+      getSysOrgById(id).then((res) => {
+        form.setFieldsValue(res);
+        setDate(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = (values) => {
+    if (id) {
+      startLoading();
+      // 修改
+      putTaOrgConfig(id, values).then((res) => {
+        navigate(-1);
+      });
+    } else {
+      // 新增
+      postTaOrgConfig(values).then((res) => {
+        navigate(-1);
+      });
+    }
+  }
+
+
+  return (
+    <Card loading={loading}>
+      <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
+        <Form.Item
+          name="orgId"
+          label="机构ID"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="configCode"
+          label="配置编码"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="configValue"
+          label="配置项值"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="status"
+          label="状态"
+        >
+          <Select
+            style={{ width: '100%' }}
+            placeholder="请选择状态"
+          >
+            <Option key={0}>不正常</Option>
+            <Option key={1}>正常</Option>
+          </Select>
+        </Form.Item>
+        <Form.Item {...tailFormItemLayout}>
+          <Button loading={submiting} type="primary" htmlType="submit">
+            保存
+          </Button>
+          <Button style={{ marginLeft: '2em' }} onClick={() => navigate(-1)}>
+            返回
+          </Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  )
+}
+
+

src/pages/org/list/index.jsx

@@ -0,0 +1,137 @@
+import React from "react";
+import { useNavigate } from "react-router-dom";
+import { queryTable } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button, message, Popconfirm } from "antd";
+import { getSysOrg, deleteSysOrg } from "@/service/sysorg";
+
+const querySysOrgList = queryTable(getSysOrg);
+
+export default (props) => {
+  const actionRef = React.useRef();
+  const navigate = useNavigate();
+
+  // const updateStatus = (user) => {
+  //   const status = user.status === 1 ? 0 : 1;
+  //   const hide = message.loading("请稍候...", 0);
+  //   updateUserStatus(user.id, status)
+  //     .then((res) => {
+  //       hide();
+  //       actionRef.current.reload();
+  //     })
+  //     .catch(() => {
+  //       hide();
+  //     });
+  // };
+  const handleDelete = (id) => {
+    if (id) {
+      deleteSysOrg(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "机构ID",
+      dataIndex: "orgId",
+    },
+    {
+      title: "机构编码",
+      dataIndex: "orgCode",
+    },
+    {
+      title: "机构名称",
+      dataIndex: "name",
+    },
+    {
+      title: "上级单位",
+      dataIndex: "orgPId",
+    },
+
+    {
+      title: "排序",
+      dataIndex: "sortNo",
+    },
+
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueEnum: {
+        1: {
+          text: "正常",
+          status: "Processing",
+        },
+        0: {
+          text: "禁用",
+          status: "Error",
+        },
+      },
+    },
+    {
+      title: "创建人",
+      dataIndex: "createUser",
+    },
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        // <Button
+        //   key={1}
+        //   style={{ padding: 0 }}
+        //   type="link"
+        //   onClick={() => {
+        //     updateStatus(record);
+        //   }}
+        // >
+        //   {record.status === 1 ? "禁用" : "启用"}
+        // </Button>,
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, "]]");
+            navigate(`/system/org/edit?id=${record.id}`);
+          }}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      rowKey="orgId"
+      search={false}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/system/org/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      request={querySysOrgList}
+      columns={columns}
+    />
+  );
+};

src/pages/position/edit/index.jsx

@@ -0,0 +1,115 @@
+import React from 'react';
+import { Button, Card, Form, Input, Select } from 'antd';
+import useBool from '@/utils/hooks/useBool';
+import { postSysPosition, putSysPosition } from "@/service/sysposition";
+import { useSearchParams, useNavigate } from 'react-router-dom';
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 8,
+    },
+  },
+};
+
+const { Option } = Select;
+export default (props) => {
+
+  const [loading, startLoading, cancelLoading] = useBool();
+  const [submiting, startSubmit, cancelSubmit] = useBool();
+  const [form] = Form.useForm();
+  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const id = searchParams.get("id");
+
+
+  const onFinish = async (values) => {
+    if (id) {
+      // 修改
+      putSysPosition(id, values).then((res) => {
+        navigate(-1);
+      });
+    } else {
+      // 新增
+      postSysPosition({ ...values }).then((res) => {
+        navigate(-1);
+      });
+    }
+    return false;
+  }
+
+
+  return (
+    <Card loading={loading}>
+      <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
+        <Form.Item
+          name="name"
+          label="岗位名称"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="positionPId"
+          label="上级岗位"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="orgId"
+          label="所属单位"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="sortNum"
+          label="排序"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="status"
+          label="状态"
+        >
+          <Select
+            style={{ width: '100%' }}
+            placeholder="请选择状态"
+          >
+            <Option key={0}>不正常</Option>
+            <Option key={1}>正常</Option>
+          </Select>
+        </Form.Item>
+        <Form.Item
+          name="createUser"
+          label="创建人"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item {...tailFormItemLayout}>
+          <Button loading={submiting} type="primary" htmlType="submit">
+            保存
+          </Button>
+          <Button style={{ marginLeft: '2em' }} onClick={() => navigate(-1)}>
+            返回
+          </Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  )
+}
+
+

src/pages/position/list/index.jsx

@@ -0,0 +1,136 @@
+import React from "react";
+import { useNavigate } from "react-router-dom";
+import { queryTable } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button, message, Popconfirm } from "antd";
+import { getSysPosition, deleteSysPosition } from "@/service/sysposition";
+
+const querySysPositionList = queryTable(getSysPosition);
+
+export default (props) => {
+  const actionRef = React.useRef();
+  const navigate = useNavigate();
+
+  // const updateStatus = (user) => {
+  //   const status = user.status === 1 ? 0 : 1;
+  //   const hide = message.loading("请稍候...", 0);
+  //   updateUserStatus(user.id, status)
+  //     .then((res) => {
+  //       hide();
+  //       actionRef.current.reload();
+  //     })
+  //     .catch(() => {
+  //       hide();
+  //     });
+  // };
+  const handleDelete = (id) => {
+    if (id) {
+      deleteSysPosition(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "岗位ID",
+      dataIndex: "positionId",
+    },
+    {
+      title: "岗位名称",
+      dataIndex: "name",
+    },
+    {
+      title: "上级岗位",
+      dataIndex: "positionPId",
+    },
+    {
+      title: "所属单位",
+      dataIndex: "orgId",
+    },
+
+    {
+      title: "排序",
+      dataIndex: "sortNum",
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueEnum: {
+        1: {
+          text: "正常",
+          status: "Processing",
+        },
+        0: {
+          text: "禁用",
+          status: "Error",
+        },
+      },
+    },
+    {
+      title: "创建人",
+      dataIndex: "createUser",
+    },
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        // <Button
+        //   key={1}
+        //   style={{ padding: 0 }}
+        //   type="link"
+        //   onClick={() => {
+        //     updateStatus(record);
+        //   }}
+        // >
+        //   {record.status === 1 ? "禁用" : "启用"}
+        // </Button>,
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, "]]");
+            navigate(`/system/position/edit?id=${record.id}`);
+          }}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      rowKey="positionId"
+      search={false}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/system/position/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      request={querySysPositionList}
+      columns={columns}
+    />
+  );
+};

src/routes/routes.jsx

@@ -15,7 +15,10 @@ import Index from '@/pages/index';
 import Home from "@/pages/sample/home";
 import BasicForm from '@/pages/sample/form';
 import BasicTable from '@/pages/sample/table';
-
+import OrgList from "@/pages/org/list";
+import OrgEdit from "@/pages/org/edit";
+import PositionList from "@/pages/position/list";
+import PositionEdit from "@/pages/position/edit";
 /**
  * meta 用来扩展自定义数据数据
  * {
@@ -61,6 +64,45 @@ export const authRoutes = [
           // permission: 'form',
         },
       },
+      {
+        path: "org/list",
+        element: <OrgList />,
+        meta: {
+          title: '机构管理',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
+      {
+        path: "org/edit",
+        element: <OrgEdit />,
+        meta: {
+          hideInMenu: true,
+          title: '机构管理编辑',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
+      {
+        path: "position/list",
+        element: <PositionList />,
+        meta: {
+          title: '岗位管理',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
+      ,
+      {
+        path: "position/edit",
+        element: <PositionEdit />,
+        meta: {
+          hideInMenu: true,
+          title: '岗位管理编辑',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
     ]
   },
 

src/service/sysorg.js

@@ -15,8 +15,12 @@ export const postSysOrg = (data) => request('/api/sysOrg', { data, method: 'post
  */
 export const getSysOrgById = (id) => request(`/api/sysOrg/${id}`);
 
-/*
+/** 
  * 更新数据
+ * 
+ * @param {*} id
+ * @param {*} data
+ * @returns
  */
 export const putSysOrg = (id, data) => request(`/api/sysOrg/${id}`, { data, method: 'put' });
 

src/service/taorgconfig.js

@@ -15,8 +15,11 @@ export const postTaOrgConfig = (data) => request('/api/taOrgConfig', { data, met
  */
 export const getTaOrgConfigById = (id) => request(`/api/taOrgConfig/${id}`);
 
-/*
+/**
  * 更新数据
+ *  @param {*} id
+ * @param {*} data
+ * @returns
  */
 export const putTaOrgConfig = (id, data) => request(`/api/taOrgConfig/${id}`, { data, method: 'put' });
 

vite.config.js

@@ -8,7 +8,7 @@ export default defineConfig({
     port: 3000,
     proxy: {
       '/api': {
-        target: 'http://192.168.89.147:9087',
+        target: 'http://localhost:9087',
         changeOrigin: true,
       },
     }