f

src/pages/adUser/index.jsx

@@ -29,15 +29,15 @@ export default (props) => {
       title: "手机号",
       dataIndex: "phone",
     },
-    {
-      title: "标签",
-      dataIndex: "tag",
-      search: false,
-    },
+    // {
+    //   title: "标签",
+    //   dataIndex: "tag",
+    //   search: false,
+    // },
     {
       title: "状态",
       dataIndex: "status",
-      render: (t) => (t == 0 ? "未激活" : t == 1 ? "已激活" : "停用"),
+      render: (_,row) => (row.status == 0 ? "未激活" : row.status == 1 ? "已激活" : "停用"),
       valueEnum: {
         0: "未激活",
         1: "已激活",
@@ -49,15 +49,15 @@ export default (props) => {
       title: "创建时间",
       dataIndex: "createdAt",
       search: false,
-      render:(t)=>moment(t).format("YYYY-MM-DD HH:mm:ss")
+      render: (_,row)=>row.createdAt?moment(row.createdAt).format("YYYY-MM-DD HH:mm:ss"):""
     },
    
-    {
-      title: "更新时间",
-      dataIndex: "updatedAt",
-      search: false,
-      render:(t)=>moment(t).format("YYYY-MM-DD HH:mm:ss")
-    },
+    // {
+    //   title: "更新时间",
+    //   dataIndex: "updatedAt",
+    //   search: false,
+    //   render: (_,row)=>row.updatedAt?moment(row.updatedAt).format("YYYY-MM-DD HH:mm:ss"):""
+    // },
   ];
 
   return (

src/pages/dept/components/Form.jsx

@@ -1,101 +1,93 @@
-import React from "react";
-import { Button, Form, Input, Select } from "antd";
-import useBool from "@/utils/hooks/useBool";
-import { postDept, putDeptId } from "@/services/sysDept";
-import { formItemLayout, tailFormItemLayout } from "@/utils/form";
+import React from 'react'
+import { Button, Card, Form, Input, Select, InputNumber } from 'antd'
+import useBool from '@/utils/hooks/useBool'
+import { postDept, putDeptId } from '@/services/sysDept'
+import { formItemLayout, tailFormItemLayout } from '@/utils/form'
 
 export default (props) => {
-  const { dept, list, parentId, onChange } = props;
+  const { dept, list, parentId, onChange } = props
+
+  const [submiting, startSubmit, cancelSubmit] = useBool()
+  const [form] = Form.useForm()
 
-  const [submiting, startSubmit, cancelSubmit] = useBool();
-  const [form] = Form.useForm();
   const onFinish = (values) => {
-    startSubmit();
+    startSubmit()
     if (dept?.deptId) {
+      const deptId = dept.deptId
       // 修改
-      putDeptId(dept.deptId, values)
+      putDeptId(dept.deptId, { ...values, deptId, tenantName: 'pc.admin' })
         .then((res) => {
-          cancelSubmit();
-          onChange(res);
+          cancelSubmit()
+          onChange(res)
         })
         .catch(() => {
-          cancelSubmit();
-        });
+          cancelSubmit()
+        })
     } else {
       // 新增
-      postDept(values)
+      postDept({ ...values, tenantName: 'pc.admin' })
         .then((res) => {
-          cancelSubmit();
-          onChange(res);
+          cancelSubmit()
+          onChange(res)
         })
         .catch(() => {
-          cancelSubmit();
-        });
+          cancelSubmit()
+        })
     }
-  };
+  }
 
   React.useEffect(() => {
-    form.resetFields();
+    form.resetFields()
     if (dept) {
-      form.setFieldsValue(dept);
+      form.setFieldsValue(dept)
     } else {
-      form.setFieldValue("parentId", parentId);
+      form.setFieldValue('parentId', parentId)
     }
-
-  }, [dept, parentId]);
-
+  }, [dept, parentId])
   return (
     <Form
       form={form}
       {...formItemLayout}
-      style={{ maxWidth: "800px" }}
+      style={{ maxWidth: '800px' }}
       onFinish={onFinish}
     >
       <Form.Item
         name="deptName"
         label="部门名称"
-        rules={[{ required: true, message: "请填写部门名称" }]}
+        rules={[{ required: true, message: '请填写部门名称' }]}
       >
         <Input />
       </Form.Item>
-      <Form.Item
-        name="tenantName"
-        label="租户名称"
-        rules={[{ required: true, message: "请填写租户名称" }]}
+      {/* <Form.Item
+        name="orgId"
+        label="机构名称"
+        rules={[{ required: true, message: "请填写部门名称" }]}
       >
-        <Input />
-      </Form.Item>
-      <Form.Item name="parentId" label="上级单位">
-        <Select disabled={true}>
+        <Select disabled>
+          {(orgList || []).map((x) => (
+            <Select.Option key={x.orgId}>{x.name}</Select.Option>
+          ))}
+        </Select>
+      </Form.Item> */}
+      <Form.Item name="parentId" label="上级部门">
+        <Select disabled>
           {(list || []).map((x) => (
             <Select.Option key={x.deptId}>{x.deptName}</Select.Option>
           ))}
         </Select>
       </Form.Item>
-      <Form.Item
-        name="sortNo"
-        label="排序"
-        rules={[{ required: true, message: "请填写排序" }]}
-      >
-        <Input />
-      </Form.Item>
 
-      {/* <Form.Item
-        name="status"
-        label="状态"
-        initialValue={1}
-        rules={[{ required: true, message: "请填写状态" }]}
-      >
-        <Select style={{ width: "100%" }} placeholder="请选择状态">
-          <Select.Option value={0}>禁用</Select.Option>
-          <Select.Option value={1}>启用</Select.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>
       <Form.Item {...tailFormItemLayout}>
         <Button loading={submiting} type="primary" htmlType="submit">
           保存
         </Button>
       </Form.Item>
     </Form>
-  );
-};
+  )
+}

src/pages/dept/components/List.jsx

@@ -1,101 +0,0 @@
-import React from "react";
-import { Modal } from "antd";
-import PureList from "@/components/Page/PureList";
-import AuthSwitch from "@/components/Auth/AuthSwitch";
-import Form from "./Form";
-import { getDept, deleteDeptId } from "@/services/sysDept";
-
-export default (props) => {
-  const { parentId = -1, allData, onFinish } = props;
-
-  const [current, setCurrernt] = React.useState();
-  const [open, setOpen] = React.useState(false);
-  const params = React.useMemo(() => ({ parentId }), [parentId]);
-  const listRef = React.useRef();
-
-  const columns = [
-    {
-      title: "部门名称",
-      dataIndex: "deptName",
-    },
-    {
-      title: "租户名称",
-      dataIndex: "tenantName",
-      search: false,
-    },
-    {
-      title: "排序",
-      dataIndex: "sortNo",
-      search: false,
-    },
-    // {
-    //   title: "状态",
-    //   dataIndex: "status",
-    //   search: false,
-    //   render: (_, row) => (
-    //     <AuthSwitch
-    //       checkedChildren="启用"
-    //       unCheckedChildren="禁用"
-    //       checked={row.status == 1}
-    //       fallback={row.status == 1 ? '启用' : '禁用'}
-    //       onChange={(checked) => onStatusChange(row, checked)}
-    //     />
-    //   )
-    // },
-  ];
-
-  const onStatusChange = () => {};
-
-  const onAdd = () => {
-    setCurrernt({ parentId });
-    setOpen(true);
-  };
-
-  const onEdit = (row) => {
-    setCurrernt(row);
-    setOpen(true);
-  };
-
-  const onDelete = (row) => {
-    deleteDeptId(row?.deptId)
-      .then(() => {
-        listRef.current.reload();
-      })
-      .catch((err) => {});
-  };
-
-  const handleFinish = () => {
-    setOpen(false);
-    listRef.current.reload();
-    onFinish();
-  };
-
-  return (
-    <>
-      <PureList
-        rowKey="deptId"
-        ref={listRef}
-        columns={columns}
-        request={getDept}
-        params={params}
-        onAdd={onAdd}
-        onEdit={onEdit}
-        onDelete={onDelete}
-      />
-      <Modal
-        title="部门维护"
-        open={open}
-        footer={null}
-        maskClosable={false}
-        onCancel={() => setOpen(false)}
-      >
-        <Form
-          dept={current}
-          parentId={parentId}
-          list={allData}
-          onChange={handleFinish}
-        />
-      </Modal>
-    </>
-  );
-};

src/pages/dept/index.jsx

@@ -1,37 +1,152 @@
-import React from 'react';
-import { Card } from 'antd';
-import Page from '@/components/Page';
-import DeptTree from '@/components/DeptTree';
-import List from './components/List';
+import React from "react";
+import { PlusOutlined, DeleteOutlined } from "@ant-design/icons";
+import { Button, Card, Row, Col, Tree, Tooltip, Popconfirm, Spin } from "antd";
+import Page from "@/components/Page";
+import { getDept, deleteDeptId } from "@/services/sysDept";
+import { arr2Tree } from "@/utils/array";
+import useBool from "@/utils/hooks/useBool";
+import Form from "./components/Form";
 
 export default (props) => {
+  const [loading, startLoading, stopLoading] = useBool();
+  const [list, setList] = React.useState([]);
+  const [current, setCurrernt] = React.useState();
+  const [parentId, setParentId] = React.useState();
 
-  const [deptList, setDeptList] = React.useState([])
-  const treeRef = React.useRef();
-  const [current, setCurrernt] = React.useState()
+  const [parentList, treeData] = React.useMemo(() => {
+    const plist = [{ deptId: "-1", deptName: "根节点" }].concat(list);
+    const [tree] = arr2Tree(
+      (list || []).map((x) => ({
+        title: x.deptName,
+        key: x.deptId,
+        parentId: x.parentId,
+        raw: x,
+      }))
+    );
+    return [plist, tree];
+  }, [list]);
 
-  const onFinish = () => {
-    treeRef.current.reload();
-  }
+  const changeCurrent = (dept) => {
+    setCurrernt(dept);
+    setParentId(dept?.deptPId || "-1");
+  };
 
-  const onSelect = (e) => {
-    setCurrernt(deptList.find(x => x.deptId == e))
-  }
+  const onSelect = (selectedKeys, e) => {
+    changeCurrent(e.node.raw);
+  };
 
+  const onClick = (dept) => {
+    changeCurrent(dept);
+  };
+
+  const onAdd = (parentId = "-1") => {
+    setParentId(parentId);
+    setCurrernt({ parentId });
+  };
+
+  const onDelete = (dept) => {
+    deleteDeptId(dept.deptId).then(() => {
+      queryList();
+    });
+  };
+
+  const queryList = React.useCallback(() => {
+    startLoading();
+    getDept({ pageSize: 500 }).then((res) => {
+      setList(res.records || []);
+      stopLoading();
+    });
+  }, []);
+
+  const onFormChange = () => {
+    // 重新查一次数据
+    queryList();
+  };
+
+  React.useEffect(() => {
+    queryList();
+  }, []);
   return (
     <Page>
-      <div className="flex">
-        {/* <Card className="flex-0" style={{ width: '480px', marginRight: '24px' }}>
-          <DeptTree ref={treeRef} onList={setDeptList} onSelect={onSelect} />
-        </Card> */}
-        <div className="flex-1">
-          <List
-            parentId={current?.deptId}
-            allData={deptList}
-            onFinish={onFinish}
-          />
-        </div>
-      </div>
+      <Row gutter={24}>
+        <Col span={8} style={{ overflow: "hidden" }}>
+          <Card
+            title="部门"
+            extra={
+              <Button type="link" onClick={() => onAdd()}>
+                新增
+              </Button>
+            }
+          >
+            <Spin spinning={loading}>
+              <Tree
+                blockNode
+                defaultExpandParent={true}
+                treeData={treeData}
+                onSelect={onSelect}
+                titleRender={(node) => (
+                  <div
+                    style={{ display: "flex" }}
+                    onClick={(e) => e.stopPropagation()}
+                  >
+                    <div
+                      style={{
+                        lineHeight: "32px",
+                        flex: 1,
+                        width: 0,
+                      }}
+                      onClick={() => onClick(node.raw)}
+                    >
+                      <div
+                        style={{
+                          overflow: "hidden",
+                          whiteSpace: "nowrap",
+                          textOverflow: "ellipsis",
+                        }}
+                      >
+                        {node.title}
+                      </div>
+                    </div>
+                    <div style={{ width: "80px", flex: "none" }}>
+                      <Tooltip title="新增子节点">
+                        <Button
+                          type="link"
+                          icon={<PlusOutlined />}
+                          onClick={() => onAdd(node.raw.deptId)}
+                        ></Button>
+                      </Tooltip>
+                      <Tooltip title="删除节点">
+                        <Popconfirm
+                          title="确认进行删除操作?"
+                          onConfirm={() => onDelete(node.raw)}
+                        >
+                          <Button
+                            type="link"
+                            danger
+                            icon={<DeleteOutlined />}
+                          ></Button>
+                        </Popconfirm>
+                      </Tooltip>
+                    </div>
+                  </div>
+                )}
+              />
+            </Spin>
+          </Card>
+        </Col>
+        <Col span={16}>
+          <Card>
+            {parentId && (
+              <Form
+                dept={current}
+                parentId={parentId}
+                list={parentList}
+                onChange={onFormChange}
+              />
+            )}
+          </Card>
+        </Col>
+      </Row>
     </Page>
-  )
-}
+  );
+};

src/pages/package/Edit.jsx

@@ -33,9 +33,9 @@ export default (props) => {
   ];
   const contentList = {
     // 套餐项目
-    tab1: <Package id={id} packageList={packageList} />,
+    tab1: <Package key="1" id={id} packageList={packageList} />,
     // 套餐内容
-    tab2: <PackageItem id={id}   />,
+    tab2: <PackageItem key="2" id={id}   />,
   };
 
   return (

src/pages/package/components/ModalPackageItem.jsx

@@ -13,6 +13,11 @@ import {
 import { Modal } from "antd";
 import { postTaPackageItem, putTaPackageItem } from "@/services/taPackageItem";
 import { getTaPackage } from "@/services/taPackage";
+const LAYOUT_TYPE_HORIZONTAL = "horizontal";
+const formItemLayout = {
+  labelCol: { span: 4 },
+  wrapperCol: { span: 14 },
+};
 export default forwardRef((props, ref) => {
   const { curd, open, setOpen } = props;
   const formRef = useRef();
@@ -70,7 +75,8 @@ export default forwardRef((props, ref) => {
       onCancel={() => setOpen(false)}
     >
       <ProForm
-        layout="horizontal"
+        {...formItemLayout}
+        layout={LAYOUT_TYPE_HORIZONTAL}
         formRef={formRef}
         onFinish={onFinish}
         submitter={{

src/pages/package/components/Package.jsx

@@ -33,9 +33,9 @@ export default (props) => {
     }
   };
 
-  const onChange=(file)=>{
-    console.log(file)
-  }
+  const onChange = (file) => {
+    console.log(file);
+  };
   return (
     <ProForm
       formRef={formRef}
@@ -51,7 +51,7 @@ export default (props) => {
       <ProFormText name="packageName" label="套餐名称" />
       <ProFormText name="packageType" label="套餐类型" />
       <ProForm.Item name="thumb" label="图片">
-        <UploadImage onChange={onChange}/>
+        <UploadImage onChange={onChange} />
       </ProForm.Item>
       <ProFormMoney name="charge" label="价格" />
       <ProFormText name="limitType" label="是否限制型消费" />
@@ -67,7 +67,20 @@ export default (props) => {
         ]}
       />
       <ProFormText name="desc" label="说明" />
-      <ProFormSelect name="status" label="状态" />
+      <ProFormSelect
+        name="status"
+        label="状态"
+        options={[
+          {
+            label: "下架",
+            value: 0,
+          },
+          {
+            label: "上架",
+            value: 1,
+          },
+        ]}
+      />
     </ProForm>
   );
 };

src/pages/package/components/PackageItem.jsx

@@ -14,6 +14,7 @@ import moment from "moment";
 import { useNavigate } from "react-router-dom";
 import ModalPackageItem from "./ModalPackageItem";
 import { Button } from "antd";
+import PureList from "@/components/Page/PureList";
 export default (props) => {
   const { id } = props;
   const [open, setOpen] = useState(false);
@@ -57,7 +58,7 @@ export default (props) => {
 //   const [params, setParams] = useState();
   return (
     <>
-      <List
+      <PureList
         actionRef={actionRef}
         rowKey="packageItemId"
         onEdit={(record) => onEdit(record)}

src/pages/package/index.jsx

@@ -21,14 +21,8 @@ export default (props) => {
       title: "图片",
       dataIndex: "thumb",
       search: false,
-      render: (t) => (
-        <Image
-          src={t}
-          height={60}
-          style={{ borderRadius: "15px" }}
-          // fallback="/image/default_1.png"
-        />
-      ),
+      valueType:"image"
+    
     },
     {
       title: "价格",
@@ -52,9 +46,15 @@ export default (props) => {
       dataIndex: "limitUnit",
       search: false,
     },
+
     {
       title: "状态",
       dataIndex: "status",
+      render:(_,row)=>row.status==0?"下架":"上架" ,
+      valueEnum: {
+        0: "下架",
+        1: "上架",
+      },
     },
 
     {

src/pages/role/list.jsx

@@ -9,7 +9,6 @@ import {
   putSysRoleId,
   deleteSysRoleId
 } from "@/services/sysrole";
-import "./style.less";
 
 const Header = (props) => {
   return (

src/pages/role/menus.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import { Button, Card, Tree, message, Row, Col } from "antd";
 import { useModel } from "@/store";
 import { arr2Tree } from "@/utils/array";
+import styles from './style.module.less';
 
 export default (props) => {
   const { roleId, value, onChange, onMenuChange } = props;
@@ -107,7 +108,7 @@ export default (props) => {
   };
 
   return (
-    <Card title="菜单">
+    <Card title="菜单" className={styles.cardTree}>
       <Tree
         disabled={!roleId}
         multiple={false}

src/pages/role/style.less → src/pages/role/style.module.less

@@ -17,11 +17,13 @@
   }
 }
 
-.ant-col-16{
-  .ant-card-body {
-    .ant-row {
-      overflow-y: scroll !important;
-      height: 500px !important;
+.cardTree {
+  :global(.ant-col-16) {
+    .ant-card-body {
+      .ant-row {
+        overflow-y: scroll !important;
+        max-height: 500px !important;
+      }
     }
-}
-}
+  }
+}

src/pages/tenant/Edit.jsx

@@ -0,0 +1,97 @@
+import React, { useEffect } from "react";
+import { postFxTenant, putFxTenant, getFxTenantId } from "@/services/fxtenant";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import {
+  ProForm,
+  ProFormText,
+  ProFormDateRangePicker,
+  ProFormSelect,
+} from "@ant-design/pro-components";
+import { Card, Form } from "antd";
+import Page from "@/components/Page";
+import moment from "moment";
+export default (props) => {
+  const [form] = Form.useForm();
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  useEffect(() => {
+    if (id) {
+      getFxTenantId(id).then((res) => {
+        form.setFieldsValue({
+          ...res,
+          // time:[moment(res.startTime).format("YYYY-mm-dd"),moment(res.endTime).format("YYYY-mm-dd")],
+          time: [res.startTime, res.endTime],
+          status:
+            res.status == 0 ? "未激活" : res.status == 1 ? "已激活" : "停用",
+        });
+      });
+    }
+  }, []);
+
+  const onFinish = (values) => {
+    console.log(values);
+    const data = {
+      ...values,
+      startTime: values?.time[0],
+      endTime: values?.time[1],
+      status: values.status == "未激活" ? 0 : values.status == "已激活" ? 1 : 2,
+    };
+    if (!id) {
+      postFxTenant(data).then((res) => {
+        navigate(-1);
+      });
+    } else {
+      putFxTenant(id, data).then((res) => {
+        navigate(-1);
+      });
+    }
+  };
+
+  return (
+    <Page>
+      <Card>
+        <ProForm form={form} onFinish={onFinish} layout="horizontal">
+          <ProFormText
+            name="tenantName"
+            label="租户名称"
+            placeholder="请输入租户名称"
+            rules={[{ required: true, message: "租户名称不能为空" }]}
+          />
+          <ProFormDateRangePicker
+            name={["time"]}
+            label="合同生效时间"
+            rules={[{ required: true, message: "合同生效时间不能为空" }]}
+          />
+          <ProFormText
+            name="tenantCode"
+            label="租户编号"
+            placeholder="请输入租户编号"
+          />
+
+          <ProFormText
+            name="manager"
+            label="管理员名称"
+            placeholder="请输入管理员名称"
+          />
+          <ProFormText
+            name="phone"
+            label="手机号 "
+            placeholder="请输入手机号"
+            rules={[{ required: true, message: "手机号不能为空" }]}
+
+          />
+          <ProFormSelect
+            label="状态 "
+            name="status"
+            valueEnum={{
+              0: "未激活",
+              1: "已激活",
+              2: "停用",
+            }}
+          />
+        </ProForm>
+      </Card>
+    </Page>
+  );
+};

src/pages/tenant/index.jsx

@@ -0,0 +1,122 @@
+import List from "@/components/Page/List";
+import React from "react";
+
+import { getFxTenant, deleteFxTenant } from "@/services/fxtenant";
+
+import { useNavigate } from "react-router-dom";
+import { Button } from "antd";
+import moment from "moment";
+export default (props) => {
+  const navigate = useNavigate();
+  const actionRef = React.useRef();
+  const columns = [
+    {
+      title: "时间",
+      dataIndex: "time",
+      valueType: "dateRange",
+      hideInTable: true,
+      search: {
+        transform: (value) => {
+          return {
+            startTime: value[0],
+            endTime: value[1],
+          };
+        },
+      },
+    },
+    {
+      title: "租户编号",
+      dataIndex: "tenantCode",
+    },
+    {
+      title: "租户名称",
+      dataIndex: "tenantName",
+    },
+    {
+      title: "开始时间",
+      dataIndex: "startTime",
+      render: (_,row) =>row.startTime? moment(row.startTime).format("YYYY-MM-DD HH:mm") :"",
+      search: false,
+    },
+    {
+      title: "结束时间",
+      dataIndex: "endTime",
+      render: (_,row) =>row.endTime? moment(row.endTime).format("YYYY-MM-DD HH:mm") :"",
+      search: false,
+    },
+    // {
+    //   title: "管理人名称",
+    //   dataIndex: "manager",
+    // },
+    {
+      title: "手机号",
+      dataIndex: "phone",
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueType: "select",
+      render: (_, record) =>
+        record.status == 0 ? "未激活" : record.status == 1 ? "已激活" : "停用",
+      valueEnum: {
+        0: "未激活",
+        1: "已激活",
+        2: "停用",
+      },
+    },
+    // {
+    //   title: "创建人",
+    //   dataIndex: "createdBy",
+    //   key: "createdBy",
+    //   search: false,
+    // },
+    {
+      title: "创建时间",
+      dataIndex: "createdAt",
+      key: "createdAy",
+      search: false,
+      render: (t) => moment(t).format("YYYY-MM-DD HH:mm:ss"),
+      // new Date(t).toLocaleString("zh")
+    },
+    {
+      title: "更新人",
+      dataIndex: "updatedBy",
+      key: "updatedBy",
+      search: false,
+    },
+    {
+      title: "更新时间",
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      search: false,
+      render: (t) => moment(t).format("YYYY-MM-DD HH:mm:ss"),
+    },
+  ];
+
+  const DeleteFxUser = (record) => {
+    deleteFxTenant(record.tenantId).then((res) => {
+      actionRef.current.reload();
+    });
+  };
+  return (
+    <List
+      rowKey="tenantId"
+      actionRef={actionRef}
+      request={getFxTenant}
+      onEdit={(record) => navigate(`/tenant/edit?id=${record.tenantId}`)}
+      onDelete={DeleteFxUser}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      columns={columns}
+    />
+  );
+};

src/routes/routes.jsx

@@ -15,7 +15,6 @@ import AdUserEdit from '@/pages/adUser/Edit'
 import Project from '@/pages/project'
 import ProjectEdit from '@/pages/project/Edit'
 import ProjectContact from '@/pages/projectContact'
-import ProjectDeployEdit from '@/pages/project/components/ProjectDeployEdit'
 import ProjectDeploy from '@/pages/projectDeploy'
 import ProjectNode from '@/pages/projectNode'
 
@@ -28,6 +27,8 @@ import MemberEdit from '@/pages/member/Edit'
 import Custom from '@/pages/custom'
 import CustomEdit from '@/pages/custom/Edit'
 import Finance from '@/pages/finance'
+import Tenant from '@/pages/tenant'
+import TenantEdit from '@/pages/tenant/Edit'
 
 // import RoleEdit from "@/pages/role/Edit";
 /**
@@ -81,37 +82,29 @@ export const authRoutes = [
     },
   },
   {
-    path: 'projectDeploy/edit',
-    element: <ProjectDeployEdit />,
+    path: 'projectContact',
+    element: <ProjectContact />,
     meta: {
-      title: '部署维护',
-      hideInMenu: true,
+      title: '项目联系人管理',
+      icon: <FileTextOutlined />,
     },
   },
   {
-    path: 'projectContact',
-    element: <ProjectContact />,
+    path: 'projectDeploy',
+    element: <ProjectDeploy />,
     meta: {
-      title: '项目联系人管理',
+      title: '服务器管理',
+      icon: <FileTextOutlined />,
+    },
+  },
+  {
+    path: 'projectNode',
+    element: <ProjectNode />,
+    meta: {
+      title: '流程节点管理',
       icon: <FileTextOutlined />,
     },
   },
-  // {
-  //   path: "projectDeploy",
-  //   element: <ProjectDeploy />,
-  //   meta: {
-  //     title: "服务器管理",
-  //     icon: <FileTextOutlined />,
-  //   },
-  // },
-  // {
-  //   path: "projectNode",
-  //   element: <ProjectNode />,
-  //   meta: {
-  //     title: "流程节点管理",
-  //     icon: <FileTextOutlined />,
-  //   },
-  // },
   {
     path: 'dept',
     element: <Dept />,
@@ -120,7 +113,22 @@ export const authRoutes = [
       icon: <HeartOutlined />,
     },
   },
-
+  {
+    path: 'tenant',
+    element: <Tenant />,
+    meta: {
+      title: '租户管理',
+      icon: <UserOutlined />,
+    },
+  },
+  {
+    path: 'tenant/edit',
+    element: <TenantEdit />,
+    meta: {
+      title: '租户编辑',
+      hideInMenu: true,
+    },
+  },
   {
     path: 'role',
     element: <Role />,

src/services/fxTenant.js

@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+/*
+ * 分页查询
+ */
+export const getFxTenant = (params) => request(`/fxTenant`, { params });
+
+/*
+ * 新增数据
+ */
+export const postFxTenant = (data) => request('/fxTenant', { data, method: 'post' });
+
+/*
+ * 更新数据
+ */
+export const putFxTenant = (id, data) => request(`/fxTenant/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteFxTenant = (id) => request(`/fxTenant/${id}`, { method: 'delete' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getFxTenantId = (id) => request(`/fxTenant/${id}`);

src/services/taMemberCard.js

@@ -0,0 +1,43 @@
+import request from "@/utils/request";
+
+/**
+ * 部门查询
+ */
+export const getTaMemberCard = (params) =>
+  request("/taMemberCard", {
+    params,
+  });
+
+/**
+ * 新增数据
+ */
+
+export const postTaMemberCard = (data) => request("/taMemberCard", { method: "post", data });
+
+/**
+ * ID查询
+ */
+export const getTaMemberCardId = (id, data) => request(`/taMemberCard/${id}`, { data });
+
+/**
+ * 更新数据
+ */
+export const putTaMemberCardId = (id, data) =>
+  request(`/taMemberCard/${id}`, { method: "put", data });
+
+/**
+ * 删除数据
+ */
+export const deleteTaMemberCardId = (id) =>
+  request(`/taMemberCard/${id}`, { method: "delete" });
+
+  /**
+   * 开卡
+   */
+  export const postTaMemberCardIdActive = (cardId) =>
+  request(`/taMemberCard/${cardId}/active`, { method: "post" });
+
+  /**
+   * 核销卡
+   */ export const putTaMemberCardIdWrite = (cardId) =>
+  request(`/taMemberCard/${cardId}/write`, { method: "post" });

vite.config.js

@@ -11,7 +11,7 @@ export default defineConfig({
     host: "0.0.0.0",
     proxy: {
       '/api/admin': {
-        target: 'http://192.168.89.25:9101',
+        target: 'http://localhost:9101',
         changeOrigin: true,
       },
     },