feats

src/pages/locType/edit/index.jsx

@@ -0,0 +1,119 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Card, Form, Input, Select } from 'antd';
+import useBool from '@/utils/hooks/useBool';
+import { postTdLocType, putTdLocType, getTdLocTypeById } from "@/service/tdloctype";
+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");
+
+  useEffect(() => {
+    if (id) {
+      getTdLocTypeById(id).then((res) => {
+        form.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = (values) => {
+    startSubmit();
+    console.log('locType修改id', id);
+    if (id) {
+      // 修改
+      putTdLocType(id, values).then((res) => {
+        navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
+      });
+    } else {
+      // 新增
+      postTdLocType(values).then((res) => {
+        navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
+      });
+    }
+  }
+
+
+  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="desc"
+          label="分类描述"
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          name="sortNo"
+          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/locType/list/index.jsx

@@ -0,0 +1,127 @@
+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 { getTdLocType, deleteTdLocType } from "@/service/tdloctype";
+
+const queryTdLocTypeList = queryTable(getTdLocType);
+
+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) {
+      deleteTdLocType(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "分类ID",
+      dataIndex: "typeId",
+    },
+    {
+      title: "分类名称",
+      dataIndex: "name",
+    },
+    {
+      title: "分类描述",
+      dataIndex: "desc",
+    },
+    {
+      title: "排序",
+      dataIndex: "sortNo",
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueEnum: {
+        1: {
+          text: "正常",
+          status: "Processing",
+        },
+        0: {
+          text: "禁用",
+          status: "Error",
+        },
+      },
+    },
+    {
+      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/locType/edit?id=${record.typeId}`);
+          }}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.typeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      rowKey="typeId"
+      search={false}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/system/locType/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      request={queryTdLocTypeList}
+      columns={columns}
+    />
+  );
+};

src/pages/org/edit/index.jsx

@@ -37,28 +37,31 @@ export default (props) => {
   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);
+        // setDate(res);
       });
     }
   }, [id]);
 
   const onFinish = (values) => {
+    startSubmit();
     if (id) {
-      startLoading();
       // 修改
-      putTaOrgConfig(id, values).then((res) => {
+      putSysOrg(id, values).then((res) => {
         navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
       });
     } else {
       // 新增
-      postTaOrgConfig(values).then((res) => {
+      postSysOrg(values).then((res) => {
         navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
       });
     }
   }
@@ -68,23 +71,32 @@ export default (props) => {
     <Card loading={loading}>
       <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
         <Form.Item
-          name="orgId"
-          label="机构ID"
+          name="orgCode"
+          label="机构编码"
         >
           <Input />
         </Form.Item>
         <Form.Item
-          name="configCode"
-          label="配置编码"
+          name="name"
+          label="机构名称"
         >
           <Input />
         </Form.Item>
         <Form.Item
-          name="configValue"
-          label="配置项值"
+          name="orgPId"
+          label="上级单位"
         >
           <Input />
         </Form.Item>
+
+        <Form.Item
+          name="sortNo"
+          label="排序"
+        >
+          <Input />
+        </Form.Item>
+
+
         <Form.Item
           name="status"
           label="状态"
@@ -97,6 +109,12 @@ export default (props) => {
             <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">
             保存

src/pages/org/list/index.jsx

@@ -93,7 +93,7 @@ export default (props) => {
           type="link"
           onClick={() => {
             console.log(record, "]]");
-            navigate(`/system/org/edit?id=${record.id}`);
+            navigate(`/system/org/edit?id=${record.orgId}`);
           }}
         >
           编辑
@@ -101,7 +101,7 @@ export default (props) => {
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.id)}
+          onConfirm={() => handleDelete(record.orgId)}
           okText="确定"
           cancelText="取消"
         >

src/pages/position/edit/index.jsx

@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import { Button, Card, Form, Input, Select } from 'antd';
 import useBool from '@/utils/hooks/useBool';
-import { postSysPosition, putSysPosition } from "@/service/sysposition";
+import { getSysPosition, postSysPosition, putSysPosition, getSysPositionById } from "@/service/sysposition";
 import { useSearchParams, useNavigate } from 'react-router-dom';
 
 const formItemLayout = {
@@ -34,26 +34,51 @@ export default (props) => {
   const [submiting, startSubmit, cancelSubmit] = useBool();
   const [form] = Form.useForm();
   const navigate = useNavigate();
+  const actionRef = useRef();
   const [searchParams, setSearchParams] = useSearchParams();
   const id = searchParams.get("id");
+  const [sysPositionList, setSysPositionList] = useState([]);
 
+  useEffect(() => {
+    if (id) {
+      getSysPositionById(id).then((res) => {
+        form.setFieldsValue(res);
+      });
+    }
+  }, [id]);
 
-  const onFinish = async (values) => {
+  useEffect(() => {
+    getSysPosition({ pageSize: 999 }).then((res) => {
+      console.log('res', res.records);
+      setSysPositionList(res.records);
+    })
+  }, [])
+
+  const onFinish = (values) => {
+    startSubmit();
+    console.log('fff', id);
     if (id) {
+
       // 修改
       putSysPosition(id, values).then((res) => {
         navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
       });
     } else {
       // 新增
-      postSysPosition({ ...values }).then((res) => {
+      postSysPosition(values).then((res) => {
         navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
       });
     }
-    return false;
   }
 
 
+  console.log('tiantian', sysPositionList);
+
+
   return (
     <Card loading={loading}>
       <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
@@ -73,7 +98,13 @@ export default (props) => {
           name="orgId"
           label="所属单位"
         >
-          <Input />
+          <Select allowClear>
+            {sysPositionList.map((item) => (
+              <Option value={item.positionId} key={item.positionId}>
+                {item.orgId}
+              </Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           name="sortNum"

src/pages/position/list/index.jsx

@@ -92,7 +92,7 @@ export default (props) => {
           type="link"
           onClick={() => {
             console.log(record, "]]");
-            navigate(`/system/position/edit?id=${record.id}`);
+            navigate(`/system/position/edit?id=${record.positionId}`);
           }}
         >
           编辑
@@ -100,7 +100,7 @@ export default (props) => {
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.id)}
+          onConfirm={() => handleDelete(record.positionId)}
           okText="确定"
           cancelText="取消"
         >

src/routes/routes.jsx

@@ -25,6 +25,9 @@ import OrgList from "@/pages/org/list";
 import OrgEdit from "@/pages/org/edit";
 import PositionList from "@/pages/position/list";
 import PositionEdit from "@/pages/position/edit";
+import LocTypeList from "@/pages/locType/list";
+import LocTypeEdit from "@/pages/locType/edit";
+
 /**
  * meta 用来扩展自定义数据数据
  * {
@@ -119,6 +122,27 @@ export const authRoutes = [
           // permission: 'form',
         },
       },
+      ,
+      {
+        path: "locType/list",
+        element: <LocTypeList />,
+        meta: {
+          title: '点位分类',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
+      ,
+      {
+        path: "locType/edit",
+        element: <LocTypeEdit />,
+        meta: {
+          hideInMenu: true,
+          title: '点位分类编辑',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
     ]
   },
 

src/service/tdloctype.js

@@ -15,8 +15,11 @@ export const postTdLocType = (data) => request('/api/tdLocType', { data, method:
  */
 export const getTdLocTypeById = (id) => request(`/api/tdLocType/${id}`);
 
-/*
+/**
  * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
  */
 export const putTdLocType = (id, data) => request(`/api/tdLocType/${id}`, { data, method: 'put' });