f

src/pages/custom/Edit.jsx

@@ -6,6 +6,7 @@ import {
   ProFormMoney,
   ProFormSelect,
   ProFormText,
+  ProFormRadio,
 } from '@ant-design/pro-components'
 import useBool from '@/utils/hooks/useBool'
 import { useSearchParams, useNavigate } from 'react-router-dom'
@@ -16,11 +17,9 @@ const { Option } = Select
 
 export default (props) => {
   const formRef = useRef()
-  const [loading, startLoading, cancelLoading] = useBool()
   const [submiting, startSubmit, cancelSubmit] = useBool()
 
   const [searchParams] = useSearchParams()
-  // const [form] = Form.useForm()
   const navigate = useNavigate()
 
   const id = searchParams.get('id')
@@ -61,7 +60,7 @@ export default (props) => {
 
   return (
     <Page>
-      <Card loading={loading}>
+      <Card>
         <ProForm
           formRef={formRef}
           onFinish={onFinish}
@@ -90,7 +89,7 @@ export default (props) => {
           <ProFormText name="contactsTitle" label="联系人头衔" />
           <ProFormText name="contactsPhone" label="联系人手机" />
           <ProFormText name="contactsEmail" label="联系人邮箱" />
-          <ProFormSelect
+          <ProFormRadio.Group
             name="isOrg"
             label="是否企业"
             options={[

src/pages/project/Edit.jsx

@@ -1,129 +1,37 @@
-import React, { useEffect, useRef, useState } from 'react'
-import {
-  postTaProject,
-  putTaProject,
-  getTaProjectId,
-} from '@/services/taProject'
-import { getTaCustom } from '@/services/taCustom'
+import React, { useState } from 'react'
 import Page from '@/components/Page'
-import { Button, Card, Row, Col } from 'antd'
-import {
-  ProForm,
-  ProFormDateTimeRangePicker,
-  ProFormMoney,
-  ProFormSelect,
-  ProFormText,
-  ProFormTextArea,
-} from '@ant-design/pro-components'
-import { formItemLayout, tailFormItemLayout } from '@/utils/form'
-import { useNavigate, useSearchParams } from 'react-router-dom'
-import moment from 'moment'
+import ProjectMessage from './components/ProjectMessage'
+import ProjectDeploy from './components/ProjectDeploy'
+import { Card } from 'antd'
 
 export default (props) => {
-  const formRef = useRef()
-  const navigate = useNavigate()
+  const [activeTabKey, setActiveTabKey] = useState('tab1')
 
-  const [params] = useSearchParams()
-  const id = params.get('id')
-  const [customSelect, setCustomSelect] = useState()
+  const tabList = [
+    {
+      key: 'tab1',
+      tab: '项目信息',
+    },
+    {
+      key: 'tab2',
+      tab: '部署信息',
+    },
+  ]
 
-  useEffect(() => {
-    if (id) {
-      getTaProjectId(id).then((res) => {
-        formRef.current?.setFieldsValue({
-          ...res,
-          time: [moment(res.startTime), moment(res.endTime)],
-        })
-      })
-    }
-
-    //所属客户下拉
-    getTaCustom().then((res) => {
-      setCustomSelect(
-        res.records?.map(
-          (x) =>
-            ({
-              label: x.customName,
-              value: x.customId,
-            } || [])
-        )
-      )
-    })
-  }, [])
-  const onFinish = (values) => {
-    const data = {
-      ...values,
-      startTime: values.time[0],
-      endTime: values.time[1],
-    }
-    console.log(data)
-    if (!id) {
-      postTaProject(data).then((res) => {
-        navigate(-1)
-      })
-    } else if (id) {
-      putTaProject(id, data).then((res) => {
-        navigate(-1)
-      })
-    }
+  const contentList = {
+    tab1: <ProjectMessage />,
+    tab2: <ProjectDeploy />,
   }
+
   return (
     <Page>
-      <Card>
-        <ProForm
-          formRef={formRef}
-          onFinish={onFinish}
-          layout="horizontal"
-          {...formItemLayout}
-          submitter={{
-            render: (_, doms) => [
-              // doms.find((dom) => dom.props?.children === '提交'),
-              <Row>
-                <Col offset={6}>
-                  <Button type="primary" htmlType="submit">
-                    提交
-                  </Button>
-                </Col>
-                <Col offset={1}>
-                  <Button onClick={() => navigate(-1)}>返回</Button>
-                </Col>
-              </Row>,
-            ],
-          }}
-        >
-          <ProFormText name="partyA" label="甲方联系人" />
-          <ProFormText name="partyAName" label="甲方名称" />
-          <ProFormText name="partyB" label="乙方联系人" />
-          <ProFormText name="partyBName" label="乙方名称" />
-          <ProFormText name="projectName" label="项目名称" />
-          <ProFormTextArea name="introduction" label="项目简介" />
-          <ProFormDateTimeRangePicker name="time" label="工作周期" />
-          <ProFormMoney name="quotation" label="合同报价" />
-          <ProFormMoney name="receivedMoney" label="已收款" />
-          <ProFormMoney name="invoicedMoney" label="已开票额" />
-          <ProFormSelect
-            name="stageName"
-            label="阶段名称"
-            options={[
-              { label: '未开始', value: '0' },
-              { label: '处理中', value: '1' },
-              { label: '已完成', value: '2' },
-            ]}
-          />
-          <ProFormSelect
-            name="status"
-            label="项目状态"
-            options={[
-              { label: '禁用', value: 0 },
-              { label: '正常', value: 1 },
-            ]}
-          />
-          <ProFormSelect
-            options={customSelect}
-            name="customId"
-            label="所属客户"
-          />
-        </ProForm>
+      <Card
+        style={{ backgroundColor: '#F0F2F5' }}
+        tabList={tabList}
+        activeTabKey={activeTabKey}
+        onTabChange={(key) => setActiveTabKey(key)}
+      >
+        {contentList[activeTabKey]}
       </Card>
     </Page>
   )

src/pages/project/components/Custom.jsx

@@ -0,0 +1,56 @@
+import React, { useState } from 'react'
+import { Button, Card, Form, Input, Select, Row, Col, Descriptions } from 'antd'
+import {
+  ProForm,
+  ProFormDateTimeRangePicker,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+  ProFormRadio,
+} from '@ant-design/pro-components'
+import Page from '@/components/Page'
+import { postTaCustom, putTaCustom, getTaCustomId } from '@/services/taCustom'
+const { Option } = Select
+
+export default (props) => {
+  const { customId } = props
+  const [list, setList] = useState()
+
+  React.useEffect(() => {
+    if (customId) {
+      getTaCustomId(customId).then((res) => {
+        setList(res)
+      })
+    }
+  }, [customId])
+  console.log('customId', customId)
+  return (
+    <Card title={<div style={{ fontWeight: 'bold' }}>客户基本信息</div>}>
+      <Descriptions bordered={true} column={1}>
+        <Descriptions.Item label="客户名">{list?.customName}</Descriptions.Item>
+        <Descriptions.Item label="客户税号">
+          {list?.isOrg == 1 ? list?.dutyParagraph : ''}
+        </Descriptions.Item>
+        <Descriptions.Item label="开户行">
+          {list?.openingBank}
+        </Descriptions.Item>
+        <Descriptions.Item label="客户账号">{list?.account}</Descriptions.Item>
+        <Descriptions.Item label="联系人姓名">
+          {list?.contactsName}
+        </Descriptions.Item>
+        <Descriptions.Item label="联系人头衔">
+          {list?.contactsTitle}
+        </Descriptions.Item>
+        <Descriptions.Item label="联系人手机">
+          {list?.contactsPhone}
+        </Descriptions.Item>
+        <Descriptions.Item label="联系人邮箱">
+          {list?.contactsEmail}
+        </Descriptions.Item>
+        <Descriptions.Item label="是否企业">
+          {customId && (list?.isOrg == 1 ? '是' : '否')}
+        </Descriptions.Item>
+      </Descriptions>
+    </Card>
+  )
+}

src/pages/project/components/Finance.jsx

@@ -0,0 +1,97 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { getTfFinance } from '@/services/tfFinance'
+import { Button, Card, Row, Col } from 'antd'
+import { ProTable } from '@ant-design/pro-components'
+import FinanceModalForm from './FinanceModalForm'
+
+export default (props) => {
+  const actionRef = useRef()
+  const [open, setOpen] = useState(false)
+
+  const columns = [
+    {
+      title: '记录名称',
+      dataIndex: 'financeName',
+      ellipsis: true,
+    },
+    {
+      title: '项目状态',
+      dataIndex: 'bizStatus',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '总费用',
+      dataIndex: 'totalCharges',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '毛利润',
+      dataIndex: 'grossProfits',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '总成本',
+      dataIndex: 'totalCost',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '已支出',
+      dataIndex: 'expense',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '已收款',
+      dataIndex: 'received',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '尾款',
+      dataIndex: 'balancePayment',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '发票',
+      dataIndex: 'invoice',
+      search: false,
+      ellipsis: true,
+    },
+  ]
+
+  const onAdd = () => {
+    setOpen(true)
+  }
+  const onCancel = () => {
+    setOpen(false)
+  }
+  return (
+    <Card title={<div style={{ fontWeight: 'bold' }}>收付款信息</div>}>
+      <ProTable
+        toolBarRender={() => [
+          <Button key="1" type="primary" onClick={onAdd}>
+            新增
+          </Button>,
+        ]}
+        // title={() => {
+        //   return (
+        //     <div style={{ fontWeight: 'bold', fontSize: '16px' }}>
+        //       收付款信息
+        //     </div>
+        //   )
+        // }}
+        options={false}
+        actionRef={actionRef}
+        rowKey="financeId"
+        request={getTfFinance}
+        columns={columns}
+      />
+      <FinanceModalForm open={open} onAdd={onAdd} onCancel={onCancel} />
+    </Card>
+  )
+}

src/pages/project/components/FinanceModalForm.jsx

@@ -0,0 +1,37 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { Form } from 'antd'
+import { postTfFinance } from '@/services/tfFinance'
+import {
+  ModalForm,
+  ProFormText,
+  ProFormMoney,
+} from '@ant-design/pro-components'
+
+export default (props) => {
+  const { open, onCancel } = props
+  const [form] = Form.useForm()
+
+  const onFinish = () => {}
+  return (
+    <ModalForm
+      form={form}
+      title="收付款维护"
+      open={open}
+      grid={true}
+      labelCol={{ sm: 3 }}
+      layout="horizontal"
+      onFinish={onFinish}
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: onCancel,
+      }}
+    >
+      <ProFormText name="ycItemName" label="收支名称" />
+      <ProFormMoney name="money" label="收支金额" />
+      <ProFormText name="itemType" label="明细类型" />
+      <ProFormText name="ycType" label="收支类型" />
+      <ProFormText name="fromOrg" label="来源机构" />
+      <ProFormText name="toOrg" label="目的机构" />
+    </ModalForm>
+  )
+}

src/pages/project/components/ProjectDeploy.jsx

@@ -0,0 +1,121 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { ProTable } from '@ant-design/pro-components'
+import { queryTable } from '@/utils/request'
+import { getTaProjectDeploy } from '@/services/taProjectDeploy'
+
+export default (props) => {
+  const actionRef = useRef()
+  const projectDeployList = queryTable(getTaProjectDeploy)
+
+  const columns = [
+    {
+      title: '服务名称',
+      dataIndex: 'serviceName',
+      ellipsis: true,
+    },
+    {
+      title: '服务类型',
+      dataIndex: 'serviceType',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '服务商',
+      dataIndex: 'isp',
+      ellipsis: true,
+    },
+    {
+      title: '主机IP',
+      dataIndex: 'ip',
+      ellipsis: true,
+    },
+    {
+      title: '端口',
+      dataIndex: 'port',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '进程',
+      dataIndex: 'process',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '系统服务名称',
+      dataIndex: 'sysServiceName',
+      ellipsis: true,
+    },
+    {
+      title: '访问地址',
+      dataIndex: 'webUrl',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: 'OSS',
+      dataIndex: 'ossBucket',
+      ellipsis: true,
+    },
+    {
+      title: '账户',
+      dataIndex: 'account',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '密码',
+      dataIndex: 'password',
+      render: () => '******',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '函数计算信息',
+      dataIndex: 'serverlessInfo',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '小程序服务商',
+      dataIndex: 'miniappIsp',
+      ellipsis: true,
+    },
+    {
+      title: '小程序名称',
+      dataIndex: 'miniappName',
+      ellipsis: true,
+    },
+    // {
+    //   title: '操作',
+    //   valueType: 'option',
+    //   key: 'option',
+    //   ellipsis: true,
+    //   fixed: 'right',
+    //   render: (_, record) => [],
+    // },
+  ]
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      rowKey="serviceId"
+      // scroll={{ x: 1300 }}
+      // onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
+      // onDelete={(record) => handleDelete(record.memberId)}
+      // toolBarRender={() => [
+      //   <Button
+      //     key="1"
+      //     type="primary"
+      //     onClick={() => {
+      //       navigate("/member/edit");
+      //     }}
+      //   >
+      //     新增
+      //   </Button>,
+      // ]}
+      request={projectDeployList}
+      columns={columns}
+    />
+  )
+}

src/pages/project/components/ProjectEdit.jsx

@@ -0,0 +1,165 @@
+import React, { useEffect, useRef, useState } from 'react'
+import {
+  postTaProject,
+  putTaProject,
+  getTaProjectId,
+} from '@/services/taProject'
+import { getTaCustom } from '@/services/taCustom'
+import { Button, Card, Row, Col } from 'antd'
+import {
+  ProForm,
+  ProFormDateTimeRangePicker,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormRadio,
+} from '@ant-design/pro-components'
+import { useNavigate, useSearchParams } from 'react-router-dom'
+import moment from 'moment'
+
+export default (props) => {
+  const { setCustomId } = props
+  const formRef = useRef()
+  const navigate = useNavigate()
+
+  const [params] = useSearchParams()
+  const id = params.get('id')
+  const [customSelect, setCustomSelect] = useState()
+
+  useEffect(() => {
+    if (id) {
+      getTaProjectId(id).then((res) => {
+        formRef.current?.setFieldsValue({
+          ...res,
+          time: [moment(res.startTime), moment(res.endTime)],
+        })
+        setCustomId(res?.customId)
+      })
+    }
+
+    //所属客户下拉
+    getTaCustom().then((res) => {
+      setCustomSelect(
+        res.records?.map(
+          (x) =>
+            ({
+              label: x.customName,
+              value: x.customId,
+            } || [])
+        )
+      )
+    })
+  }, [])
+  const onFinish = (values) => {
+    const data = {
+      ...values,
+      startTime: values.time[0],
+      endTime: values.time[1],
+    }
+
+    if (!id) {
+      postTaProject(data).then((res) => {})
+    } else if (id) {
+      putTaProject(id, data).then((res) => {})
+    }
+  }
+  let formatter = new Intl.NumberFormat('zh-CN', {
+    minimumFractionDigits: 4,
+    maximumFractionDigits: 4,
+  })
+  return (
+    <Card
+      title={<div style={{ fontWeight: 'bold' }}>项目维护</div>}
+      style={{
+        marginRight: '24px',
+        marginBottom: '24px',
+        paddingBottom: '26px',
+      }}
+    >
+      <ProForm
+        formRef={formRef}
+        onFinish={onFinish}
+        layout="horizontal"
+        grid={true}
+        submitter={{
+          render: (_, doms) => [
+            <Row justify="center">
+              <Col>
+                <Button type="primary" htmlType="submit">
+                  提交
+                </Button>
+              </Col>
+              <Col offset={1}>
+                <Button onClick={() => navigate(-1)}>返回</Button>
+              </Col>
+            </Row>,
+          ],
+        }}
+      >
+        <ProFormText
+          colProps={{ xl: 12 }}
+          labelCol={{ sm: 4 }}
+          name="partyA"
+          label="甲方"
+        />
+        <ProFormText colProps={{ xl: 12 }} name="partyAName" label="甲方名称" />
+        <ProFormText
+          colProps={{ xl: 12 }}
+          labelCol={{ sm: 4 }}
+          name="partyB"
+          label="乙方"
+        />
+        <ProFormText colProps={{ xl: 12 }} name="partyBName" label="乙方名称" />
+        <ProFormText
+          colProps={{ xl: 12 }}
+          name="projectName"
+          label="项目名称"
+        />
+        <ProFormSelect
+          colProps={{ xl: 12 }}
+          options={customSelect}
+          name="customId"
+          label="所属客户"
+        />
+        <ProFormMoney colProps={{ xl: 12 }} name="quotation" label="合同报价" />
+        <ProFormMoney
+          colProps={{ xl: 12 }}
+          labelCol={{ sm: 4 }}
+          name="receivedMoney"
+          label="已收款"
+        />
+        <ProFormMoney
+          colProps={{ xl: 12 }}
+          name="invoicedMoney"
+          label="已开票额"
+        />
+        <ProFormSelect
+          colProps={{ xl: 12 }}
+          name="stageName"
+          label="阶段名称"
+          options={[
+            { label: '未开始', value: '0' },
+            { label: '处理中', value: '1' },
+            { label: '已完成', value: '2' },
+          ]}
+        />
+        <ProFormRadio.Group
+          colProps={{ xl: 12 }}
+          name="status"
+          label="项目状态"
+          options={[
+            { label: '正常', value: 1 },
+            { label: '禁用', value: 0 },
+          ]}
+        />
+        <ProFormDateTimeRangePicker
+          colProps={{ xl: 12 }}
+          name="time"
+          label="工作周期"
+        />
+        <ProFormTextArea name="introduction" label="项目简介" />
+      </ProForm>
+    </Card>
+  )
+}

src/pages/project/components/ProjectMessage.jsx

@@ -0,0 +1,26 @@
+import React, { useState } from 'react'
+import { Row, Col } from 'antd'
+import ProjectEdit from './ProjectEdit'
+import Finance from './Finance'
+import ProjectNode from './ProjectNode'
+import Custom from './Custom'
+import style from './style.module.less'
+
+export default (props) => {
+  const [customId, setCustomId] = useState()
+
+  return (
+    <div>
+      <div className={style.box}>
+        <div className={style.flex1d5}>
+          <ProjectEdit setCustomId={setCustomId} />
+        </div>
+        <div className={style.flex1}>
+          <Custom customId={customId} />
+        </div>
+      </div>
+      <Finance />
+      <ProjectNode />
+    </div>
+  )
+}

src/pages/project/components/ProjectNode.jsx

@@ -0,0 +1,47 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { getTaProjectNode } from '@/services/taProjectNode'
+import { Button, Card, Row, Col } from 'antd'
+import { queryTable } from '@/utils/request'
+import { ProTable } from '@ant-design/pro-components'
+import moment from 'moment'
+
+export default (props) => {
+  const actionRef = useRef()
+  const projectNodeList = queryTable(getTaProjectNode)
+
+  const columns = [
+    {
+      title: '跟进状态',
+      dataIndex: 'bizStatus',
+      ellipsis: true,
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '业务发生时间',
+      dataIndex: 'bizDate',
+      render: (t) => moment(t).format('YYYY-MM-DD'),
+      search: false,
+      ellipsis: true,
+    },
+  ]
+
+  return (
+    <Card
+      title={<div style={{ fontWeight: 'bold' }}>跟进信息</div>}
+      style={{ marginTop: '24px' }}
+    >
+      <ProTable
+        options={false}
+        actionRef={actionRef}
+        rowKey="nodeId"
+        request={projectNodeList}
+        columns={columns}
+      />
+    </Card>
+  )
+}

src/pages/project/components/style.module.less

@@ -0,0 +1,9 @@
+.box {
+  display: flex;
+  .flex1d5 {
+    flex: 1.5;
+  }
+  .flex1 {
+    flex: 1;
+  }
+}

src/pages/projectContact/index.jsx

@@ -1,95 +1,95 @@
-import React, { useRef } from "react";
+import React, { useRef } from 'react'
 import {
   getTaProjectContact,
   deleteTaProjectContact,
-} from "@/services/taProjectContact";
-import { Button } from "antd";
-import List from "@/components/Page/List";
-import { useNavigate } from "react-router-dom";
-import moment from "moment";
+} from '@/services/taProjectContact'
+import { Button } from 'antd'
+import List from '@/components/Page/List'
+import { useNavigate } from 'react-router-dom'
+import moment from 'moment'
 export default (props) => {
-  const navigate = useNavigate();
-  const actionRef = useRef();
+  const navigate = useNavigate()
+  const actionRef = useRef()
 
   const columns = [
-    {
-      title: "发生周期",
-      dataIndex: "startTime1",
-      search: {
-        transform: (value) => {
-          return {
-            startTime: value[0],
-            endTime: value[1],
-          };
-        },
-      },
+    // {
+    //   title: "发生周期",
+    //   dataIndex: "startTime1",
+    //   search: {
+    //     transform: (value) => {
+    //       return {
+    //         startTime: value[0],
+    //         endTime: value[1],
+    //       };
+    //     },
+    //   },
 
-      hideInTable: true,
-    },
+    //   hideInTable: true,
+    // },
 
     {
-      title: "联系人名称",
-      dataIndex: "personName",
+      title: '联系人名称',
+      dataIndex: 'personName',
     },
     {
-      title: "性别",
-      dataIndex: "sex",
+      title: '性别',
+      dataIndex: 'sex',
       search: false,
-      render: (t) => (t == 1 ? "男" : t == 2 ? "女" : "未知"),
+      render: (t) => (t == 1 ? '男' : t == 2 ? '女' : '未知'),
     },
     {
-      title: "年龄",
-      dataIndex: "age",
+      title: '年龄',
+      dataIndex: 'age',
       search: false,
     },
     {
-      title: "生日",
-      dataIndex: "birthDay",
+      title: '生日',
+      dataIndex: 'birthDay',
       search: false,
-      render: (t) => moment(t).format("YYYY-MM-DD"),
+      render: (t) => moment(t).format('YYYY-MM-DD'),
     },
 
     {
-      title: "手机号",
-      dataIndex: "phone",
+      title: '手机号',
+      dataIndex: 'phone',
     },
     {
-      title: "邮箱",
-      dataIndex: "email",
+      title: '邮箱',
+      dataIndex: 'email',
     },
     {
-      title: "职位",
-      dataIndex: "position",
+      title: '职位',
+      dataIndex: 'position',
     },
     {
-      title: "是否默认联系人",
-      dataIndex: "isDefault",
-      render: (t) => (t == 1 ? "是" : "否"),
+      title: '是否默认联系人',
+      dataIndex: 'isDefault',
+      render: (t) => (t == 1 ? '是' : '否'),
     },
-  ];
+  ]
   return (
     <List
       rowKey="personId"
       actionRef={actionRef}
-      //   onEdit={(record) => navigate(`/project/edit?id=${record.personId}`)}
+      //   onEdit={(record) => navigate(`/projectContact/edit?id=${record.personId}`)}
       onDelete={(record) =>
         deleteTaProjectContact(record.projectId).then(() =>
           actionRef.current.reload()
         )
       }
-      //   toolBarRender={() => [
-      //     <Button
-      //       key="1"
-      //       type="primary"
-      //       onClick={() => {
-      //         navigate("/project/edit");
-      //       }}
-      //     >
-      //       新增
-      //     </Button>,
-      //   ]}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate('/projectContact/edit')
+          }}
+        >
+          新增
+        </Button>,
+      ]}
       request={getTaProjectContact}
       columns={columns}
     />
-  );
-};
+  )
+}

src/routes/routes.jsx

@@ -5,29 +5,28 @@ import {
   HeartOutlined,
   HourglassTwoTone,
   StopFilled,
-} from "@ant-design/icons";
-import { Outlet, Navigate } from "react-router-dom";
-import AuthLayout from "@/layouts/AuthLayout";
-import Login from "@/pages/login";
-import Page404 from "@/pages/404";
-import AdUser from "@/pages/adUser";
-import AdUserEdit from "@/pages/adUser/Edit";
-import Project from "@/pages/project";
-import ProjectEdit from "@/pages/project/Edit";
-import ProjectContact from "@/pages/projectContact";
-import ProjectDeploy from "@/pages/projectDeploy";
-import ProjectNode from "@/pages/projectNode";
-
-import Role from "@/pages/role";
-import Dept from "@/pages/dept";
-import Package from "@/pages/package";
-import PackageEdit from "@/pages/package/Edit";
-import Member from "@/pages/member";
-import MemberEdit from "@/pages/member/Edit";
-import Custom from "@/pages/custom";
-import CustomEdit from "@/pages/custom/Edit";
-import Finance from "@/pages/finance";
+} from '@ant-design/icons'
+import { Outlet, Navigate } from 'react-router-dom'
+import AuthLayout from '@/layouts/AuthLayout'
+import Login from '@/pages/login'
+import Page404 from '@/pages/404'
+import AdUser from '@/pages/adUser'
+import AdUserEdit from '@/pages/adUser/Edit'
+import Project from '@/pages/project'
+import ProjectEdit from '@/pages/project/Edit'
+import ProjectContact from '@/pages/projectContact'
+import ProjectDeploy from '@/pages/projectDeploy'
+import ProjectNode from '@/pages/projectNode'
 
+import Role from '@/pages/role'
+import Dept from '@/pages/dept'
+import Package from '@/pages/package'
+import PackageEdit from '@/pages/package/Edit'
+import Member from '@/pages/member'
+import MemberEdit from '@/pages/member/Edit'
+import Custom from '@/pages/custom'
+import CustomEdit from '@/pages/custom/Edit'
+import Finance from '@/pages/finance'
 
 // import RoleEdit from "@/pages/role/Edit";
 /**
@@ -49,186 +48,184 @@ export const authRoutes = [
     element: <Navigate to="/aduser" replace={true} />,
   },
   {
-    path: "aduser",
+    path: 'aduser',
     element: <AdUser />,
     meta: {
-      title: "用户管理",
+      title: '用户管理',
       icon: <SolutionOutlined />,
     },
   },
   {
-    path: "aduser/edit",
+    path: 'aduser/edit',
     element: <AdUserEdit />,
     meta: {
-      title: "用户维护",
+      title: '用户维护',
       hideInMenu: true,
     },
   },
   {
-    path: "project",
+    path: 'project',
     element: <Project />,
     meta: {
-      title: "项目管理",
+      title: '项目管理',
       icon: <FileTextOutlined />,
     },
   },
   {
-    path: "project/edit",
+    path: 'project/edit',
     element: <ProjectEdit />,
     meta: {
-      title: "项目维护",
+      title: '项目维护',
       hideInMenu: true,
     },
   },
   {
-    path: "projectContact",
+    path: 'projectContact',
     element: <ProjectContact />,
     meta: {
-      title: "项目联系人管理",
+      title: '项目联系人管理',
       icon: <FileTextOutlined />,
     },
   },
-  {
-    path: "projectDeploy",
-    element: <ProjectDeploy />,
-    meta: {
-      title: "服务器管理",
-      icon: <FileTextOutlined />,
-    },
-  },
-  {
-    path: "projectNode",
-    element: <ProjectNode />,
-    meta: {
-      title: "流程节点管理",
-      icon: <FileTextOutlined />,
-    },
-  },
-  {
-    path: "dept",
+  // {
+  //   path: "projectDeploy",
+  //   element: <ProjectDeploy />,
+  //   meta: {
+  //     title: "服务器管理",
+  //     icon: <FileTextOutlined />,
+  //   },
+  // },
+  // {
+  //   path: "projectNode",
+  //   element: <ProjectNode />,
+  //   meta: {
+  //     title: "流程节点管理",
+  //     icon: <FileTextOutlined />,
+  //   },
+  // },
+  {
+    path: 'dept',
     element: <Dept />,
     meta: {
-      title: "部门管理",
+      title: '部门管理',
       icon: <HeartOutlined />,
     },
   },
 
   {
-    path: "role",
+    path: 'role',
     element: <Role />,
     meta: {
-      title: "角色管理",
+      title: '角色管理',
       icon: <UserOutlined />,
     },
   },
   {
-    path: "custom",
+    path: 'custom',
     element: <Custom />,
     meta: {
-      title: "客户管理",
+      title: '客户管理',
       icon: <StopFilled />,
     },
   },
   {
-    path: "custom/edit",
+    path: 'custom/edit',
     element: <CustomEdit />,
     meta: {
-      title: "客户维护",
+      title: '客户维护',
       hideInMenu: true,
     },
   },
 
-
   {
-    path: "package",
+    path: 'package',
     element: <Package />,
     meta: {
-      title: "套餐管理",
+      title: '套餐管理',
       icon: <HourglassTwoTone />,
     },
   },
   {
-    path: "package/edit",
+    path: 'package/edit',
     element: <PackageEdit />,
     meta: {
-      title: "套餐维护",
+      title: '套餐维护',
       hideInMenu: true,
     },
   },
   {
-    path: "member",
+    path: 'member',
     element: <Member />,
     meta: {
-      title: "会员管理",
+      title: '会员管理',
       icon: <HourglassTwoTone />,
     },
   },
   {
-    path: "member/edit",
+    path: 'member/edit',
     element: <MemberEdit />,
     meta: {
-      title: "会员管理",
+      title: '会员管理',
       hideInMenu: true,
     },
   },
 
-  
   {
-    path: "finance",
+    path: 'finance',
     element: <Finance />,
     meta: {
-      title: "公司财务管理",
+      title: '公司财务管理',
       icon: <HourglassTwoTone />,
     },
   },
-];
+]
 
 export const defaultRoutes = [
   {
-    path: "/",
+    path: '/',
     element: <AuthLayout />,
     children: [
       {
-        path: "*",
+        path: '*',
         element: <Page404 />,
       },
     ],
   },
   {
-    path: "/login",
+    path: '/login',
     element: <Login />,
   },
   {
-    path: "*",
+    path: '*',
     element: <Page404 />,
   },
-];
+]
 
 export function mergeAuthRoutes(r1, r2) {
-  const r = r1.slice();
-  const children = r1[0].children.slice();
-  r[0].children = children.concat(r2);
-  return r;
+  const r = r1.slice()
+  const children = r1[0].children.slice()
+  r[0].children = children.concat(r2)
+  return r
 }
 
 // 全部路由
-export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
-function getPath(parent = "/", current = "") {
-  if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
-    return current;
-  return `${parent}/${current}`.replace(/\/\//g, "/");
+export const routes = mergeAuthRoutes(defaultRoutes, authRoutes)
+function getPath(parent = '/', current = '') {
+  if (current.indexOf('/') === 0 || current.indexOf('http') === 0)
+    return current
+  return `${parent}/${current}`.replace(/\/\//g, '/')
 }
 
 // 路由数组, 一维数组
 export const routeArr = (() => {
-  const flatten = (routes, parentPath = "/") => {
+  const flatten = (routes, parentPath = '/') => {
     return routes.reduce((acc, route) => {
-      const path = getPath(parentPath, route.path);
-      const children = route.children ? flatten(route.children, path) : [];
+      const path = getPath(parentPath, route.path)
+      const children = route.children ? flatten(route.children, path) : []
 
-      return acc.concat([{ ...route, path }].concat(children));
-    }, []);
-  };
+      return acc.concat([{ ...route, path }].concat(children))
+    }, [])
+  }
 
-  return flatten(routes);
-})();
+  return flatten(routes)
+})()

src/services/tfFinance.js

@@ -0,0 +1,12 @@
+import request from "@/utils/request";
+
+
+/*
+ * 分页查询
+ */
+export const getTfFinance = (params) => request(`/tfFinance`, { params });
+
+/*
+ * 新增数据
+ */
+export const postTfFinance = (data) => request('/tfFinance', { data, method: 'post' });