Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/pages/custom/Edit.jsx

@@ -1,6 +1,87 @@
-import React from 'react'
+import React, { useRef } from 'react'
+import { Button, Card, Form, Input, Select } from 'antd'
+import {
+  ProForm,
+  ProFormDateTimeRangePicker,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components'
+import useBool from '@/utils/hooks/useBool'
+import { useSearchParams, useNavigate } from 'react-router-dom'
+import Page from '@/components/Page'
+import { formItemLayout, tailFormItemLayout } from '@/utils/form'
+import { postTaCustom, putTaCustom, getTaCustomId } from '@/services/taCustom'
+const { Option } = Select
+
 export default (props) => {
-return (
-<div></div>
-)
-}
+  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')
+
+  React.useEffect(() => {
+    if (id) {
+      getTaCustomId(id).then((res) => {
+        formRef.current.setFieldsValue(res)
+      })
+    }
+  })
+
+  const onFinish = (values) => {
+    startSubmit()
+    if (id) {
+      //修改
+      putTaCustom(id, values)
+        .then((res) => {
+          cancelSubmit()
+          navigate(-1)
+        })
+        .catch(() => {
+          cancelSubmit()
+        })
+    } else {
+      //新增
+      postTaCustom(values)
+        .then((res) => {
+          cancelSubmit()
+          navigate(-1)
+        })
+        .catch(() => {
+          cancelSubmit()
+        })
+    }
+  }
+
+  return (
+    <Page>
+      <Card loading={loading}>
+        <ProForm
+          formRef={formRef}
+          onFinish={onFinish}
+          layout="horizontal"
+          submitter={{
+            render: (_, doms) => [
+              doms.find((dom) => dom.props?.children === '提交'),
+              <Button onClick={() => navigate(-1)}>返回</Button>,
+            ],
+          }}
+        >
+          <ProFormText name="customName" label="客户公司" />
+          <ProFormText name="dutyParagraph" label="客户税号" />
+          <ProFormText name="openingBank" label="开户行" />
+          <ProFormText name="account" label="客户账号" />
+          <ProFormText name="contactsName" label="联系人姓名" />
+          <ProFormText name="contactsTitle" label="联系人头衔" />
+          <ProFormText name="contactsPhone" label="联系人手机" />
+          <ProFormText name="contactsEmail" label="联系人邮箱" />
+        </ProForm>
+      </Card>
+    </Page>
+  )
+}

src/pages/custom/index.jsx

@@ -1,6 +1,123 @@
 import React from 'react'
+import { useNavigate } from 'react-router-dom'
+import { Button, Popconfirm, message } from 'antd'
+import { ProTable } from '@ant-design/pro-components'
+import { queryTable } from '@/utils/request'
+import { getTaCustom, deleteTaCustom } from '@/services/taCustom'
+import Page from '@/components/Page'
+
+const customList = queryTable(getTaCustom)
+
 export default (props) => {
-return (
-<div></div>
-)
-}
+  const actionRef = React.useRef()
+  const navigate = useNavigate()
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteTaCustom(id).then((res) => {
+        actionRef.current.reload()
+      })
+    }
+  }
+
+  const columns = [
+    {
+      title: '公司',
+      dataIndex: 'customName',
+      ellipsis: true,
+    },
+    {
+      title: '税号',
+      dataIndex: 'dutyParagraph',
+      ellipsis: true,
+      search: false,
+    },
+    {
+      title: '开户行',
+      dataIndex: 'openingBank',
+      ellipsis: true,
+    },
+    {
+      title: '账号',
+      dataIndex: 'account',
+      ellipsis: true,
+    },
+    {
+      title: '联系人姓名',
+      dataIndex: 'contactsName',
+      ellipsis: true,
+    },
+    {
+      title: '联系人头衔',
+      dataIndex: 'contactsTitle',
+      search: false,
+      ellipsis: true,
+    },
+    {
+      title: '联系人手机',
+      dataIndex: 'contactsPhone',
+      ellipsis: true,
+    },
+    {
+      title: '联系人邮箱',
+      dataIndex: 'contactsEmail',
+      search: false,
+      ellipsis: true,
+    },
+    // {
+    //   title: '联系人地址',
+    //   dataIndex: 'address',
+    //   ellipsis: true,
+    // },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={3}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/custom/edit?id=${record.customId}`)
+          }}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={4}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.customId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ]
+
+  return (
+    <Page>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="customId"
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            onClick={() => {
+              navigate('/custom/edit')
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={customList}
+        columns={columns}
+      />
+    </Page>
+  )
+}

src/pages/project/index.jsx

@@ -1,95 +1,97 @@
-import List from "@/components/Page/List";
-import React, { useRef } from "react";
-import { getTaProject, deleteTaProject } from "@/services/taProject";
-import { Button } from "antd";
-import { useNavigate } from "react-router-dom";
-import moment from "moment";
+import List from '@/components/Page/List'
+import React, { useRef } from 'react'
+import { getTaProject, deleteTaProject } from '@/services/taProject'
+import { Button } from 'antd'
+import { ProFormDateTimeRangePicker } from '@ant-design/pro-components'
+import { useNavigate } from 'react-router-dom'
+import moment from 'moment'
 export default (props) => {
-  const navigate = useNavigate();
+  const navigate = useNavigate()
 
   const columns = [
     {
-      title: "项目日期",
-      dataIndex: "startTime1",
+      title: '项目日期',
+      dataIndex: 'startTime1',
       search: {
         transform: (value) => {
           return {
             startTime: value[0],
             endTime: value[1],
-          };
+          }
         },
       },
-
+      valueType: 'dateRange',
+      // render: () => [<ProFormDateTimeRangePicker />],
       hideInTable: true,
     },
 
     {
-      title: "甲方",
-      dataIndex: "partyA",
+      title: '甲方',
+      dataIndex: 'partyA',
       search: false,
     },
     {
-      title: "甲方名称",
-      dataIndex: "partyAName",
+      title: '甲方名称',
+      dataIndex: 'partyAName',
     },
     {
-      title: "已方",
-      dataIndex: "partyB",
+      title: '已方',
+      dataIndex: 'partyB',
       search: false,
     },
     {
-      title: "已方名称",
-      dataIndex: "partyBName",
+      title: '已方名称',
+      dataIndex: 'partyBName',
     },
 
     {
-      title: "项目名称",
-      dataIndex: "projectName",
+      title: '项目名称',
+      dataIndex: 'projectName',
     },
     {
-      title: "项目简介",
-      dataIndex: "introduction",
+      title: '项目简介',
+      dataIndex: 'introduction',
       search: false,
     },
 
     {
-      title: "开始日期",
-      dataIndex: "startTime",
-      render: (t) => moment(t).format("YYYY-MM-DD"),
+      title: '开始日期',
+      dataIndex: 'startTime',
+      render: (t) => moment(t).format('YYYY-MM-DD'),
       search: false,
     },
     {
-      title: "结束日期",
-      dataIndex: "endTime",
-      render: (t) => moment(t).format("YYYY-MM-DD"),
+      title: '结束日期',
+      dataIndex: 'endTime',
+      render: (t) => moment(t).format('YYYY-MM-DD'),
       search: false,
     },
     {
-      title: "合同报价",
-      dataIndex: "quotation",
+      title: '合同报价',
+      dataIndex: 'quotation',
       search: false,
     },
     {
-      title: "已收款",
-      dataIndex: "receivedMoney",
+      title: '已收款',
+      dataIndex: 'receivedMoney',
       search: false,
     },
     {
-      title: "已开票额",
-      dataIndex: "invoicedMoney",
+      title: '已开票额',
+      dataIndex: 'invoicedMoney',
       search: false,
     },
     {
-      title: "阶段名称",
-      dataIndex: "stageName",
+      title: '阶段名称',
+      dataIndex: 'stageName',
       search: false,
     },
     {
-      title: "状态",
-      dataIndex: "status",
+      title: '状态',
+      dataIndex: 'status',
     },
-  ];
-  const actionRef = useRef();
+  ]
+  const actionRef = useRef()
   return (
     <List
       actionRef={actionRef}
@@ -103,7 +105,7 @@ export default (props) => {
           key="1"
           type="primary"
           onClick={() => {
-            navigate("/project/edit");
+            navigate('/project/edit')
           }}
         >
           新增
@@ -112,5 +114,5 @@ export default (props) => {
       request={getTaProject}
       columns={columns}
     />
-  );
-};
+  )
+}

src/services/taCustom.js

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