F

src/pages/custom/Edit.jsx

@@ -1,5 +1,5 @@
 import React, { useRef } from 'react'
-import { Button, Card, Form, Input, Select } from 'antd'
+import { Button, Card, Form, Input, Select, Row, Col } from 'antd'
 import {
   ProForm,
   ProFormDateTimeRangePicker,
@@ -28,7 +28,7 @@ export default (props) => {
   React.useEffect(() => {
     if (id) {
       getTaCustomId(id).then((res) => {
-        formRef.current.setFieldsValue(res)
+        formRef.current?.setFieldsValue(res)
       })
     }
   })
@@ -37,7 +37,8 @@ export default (props) => {
     startSubmit()
     if (id) {
       //修改
-      putTaCustom(id, values)
+      const customId = id
+      putTaCustom(id, { customId, ...values })
         .then((res) => {
           cancelSubmit()
           navigate(-1)
@@ -65,14 +66,23 @@ export default (props) => {
           formRef={formRef}
           onFinish={onFinish}
           layout="horizontal"
+          {...formItemLayout}
           submitter={{
             render: (_, doms) => [
-              doms.find((dom) => dom.props?.children === '提交'),
-              <Button onClick={() => navigate(-1)}>返回</Button>,
+              <Row>
+                <Col offset={6}>
+                  <Button type="primary" htmlType="submit">
+                    提交
+                  </Button>
+                </Col>
+                <Col offset={1}>
+                  <Button onClick={() => navigate(-1)}>返回</Button>
+                </Col>
+              </Row>,
             ],
           }}
         >
-          <ProFormText name="customName" label="客户公司" />
+          <ProFormText name="customName" label="客户名" />
           <ProFormText name="dutyParagraph" label="客户税号" />
           <ProFormText name="openingBank" label="开户行" />
           <ProFormText name="account" label="客户账号" />
@@ -80,6 +90,14 @@ export default (props) => {
           <ProFormText name="contactsTitle" label="联系人头衔" />
           <ProFormText name="contactsPhone" label="联系人手机" />
           <ProFormText name="contactsEmail" label="联系人邮箱" />
+          <ProFormSelect
+            name="isOrg"
+            label="是否企业"
+            options={[
+              { label: '否', value: 0 },
+              { label: '是', value: 1 },
+            ]}
+          />
         </ProForm>
       </Card>
     </Page>

src/pages/custom/index.jsx

@@ -23,8 +23,8 @@ export default (props) => {
 
   const columns = [
     {
-      title: "公司",
-      dataIndex: "customName",
+      title: '客户名',
+      dataIndex: 'customName',
       ellipsis: true,
     },
     {
@@ -49,11 +49,16 @@ export default (props) => {
       ellipsis: true,
     },
     {
-      title: "联系人头衔",
-      dataIndex: "contactsTitle",
-      search: false,
+      title: '联系人头衔',
+      dataIndex: 'contactsTitle',
       ellipsis: true,
+      search: false,
     },
+    // {
+    //   title: '状态',
+    //   dataIndex: 'status',
+    //   ellipsis: true,
+    // },
     {
       title: "联系人手机",
       dataIndex: "contactsPhone",
@@ -65,10 +70,26 @@ export default (props) => {
       search: false,
       ellipsis: true,
     },
+    {
+      title: '是否企业',
+      dataIndex: 'isOrg',
+      ellipsis: true,
+      valueType: 'select',
+      valueEnum: {
+        0: '否',
+        1: '是',
+      },
+    },
+    // {
+    //   title: '租户号',
+    //   dataIndex: 'tenantId',
+    //   ellipsis: true,
+    // },
     // {
-    //   title: '联系人地址',
-    //   dataIndex: 'address',
+    //   title: '创建人',
+    //   dataIndex: 'createdBy',
     //   ellipsis: true,
+    //   search: false,
     // },
     {
       title: "操作",

src/pages/project/Edit.jsx

@@ -1,55 +1,72 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from 'react'
 import {
   postTaProject,
   putTaProject,
   getTaProjectId,
-} from "@/services/taProject";
-import Page from "@/components/Page";
-import { Button, Card } from "antd";
+} from '@/services/taProject'
+import { getTaCustom } from '@/services/taCustom'
+import Page from '@/components/Page'
+import { Button, Card, Row, Col } from 'antd'
 import {
   ProForm,
   ProFormDateTimeRangePicker,
   ProFormMoney,
   ProFormSelect,
   ProFormText,
-} from "@ant-design/pro-components";
-import { useNavigate, useSearchParams } from "react-router-dom";
-import moment from "moment";
+  ProFormTextArea,
+} from '@ant-design/pro-components'
+import { formItemLayout, tailFormItemLayout } from '@/utils/form'
+import { useNavigate, useSearchParams } from 'react-router-dom'
+import moment from 'moment'
+
 export default (props) => {
-  const formRef = useRef();
-  const navigate = useNavigate();
+  const formRef = useRef()
+  const navigate = useNavigate()
 
-  const [params] = useSearchParams();
-  const id = params.get("id");
+  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)] 
-        });
-      });
+          ...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);
+    }
+    console.log(data)
     if (!id) {
       postTaProject(data).then((res) => {
-        navigate(-1);
-      });
+        navigate(-1)
+      })
     } else if (id) {
       putTaProject(id, data).then((res) => {
-        navigate(-1);
-      });
+        navigate(-1)
+      })
     }
-  };
+  }
   return (
     <Page>
       <Card>
@@ -57,10 +74,20 @@ export default (props) => {
           formRef={formRef}
           onFinish={onFinish}
           layout="horizontal"
+          {...formItemLayout}
           submitter={{
             render: (_, doms) => [
-              doms.find((dom) => dom.props?.children === "提交"),
-              <Button onClick={() => navigate(-1)}>返回</Button>,
+              // 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>,
             ],
           }}
         >
@@ -69,15 +96,35 @@ export default (props) => {
           <ProFormText name="partyB" label="乙方联系人" />
           <ProFormText name="partyBName" label="乙方名称" />
           <ProFormText name="projectName" label="项目名称" />
-          <ProFormText name="introduction" label="项目简介" />
+          <ProFormTextArea name="introduction" label="项目简介" />
           <ProFormDateTimeRangePicker name="time" label="工作周期" />
           <ProFormMoney name="quotation" label="合同报价" />
           <ProFormMoney name="receivedMoney" label="已收款" />
           <ProFormMoney name="invoicedMoney" label="已开票额" />
-          <ProFormText name="stageName" label="阶段名称" />
-          <ProFormSelect name="status" 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>
     </Page>
-  );
-};
+  )
+}

src/pages/project/index.jsx

@@ -1,12 +1,21 @@
 import List from '@/components/Page/List'
 import React, { useRef } from 'react'
 import { getTaProject, deleteTaProject } from '@/services/taProject'
-import { Button } from 'antd'
+import { getTaCustom } from '@/services/taCustom'
+import { queryDict } from '@/utils/request'
+import { Button, ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
 import { ProFormDateTimeRangePicker } from '@ant-design/pro-components'
 import { useNavigate } from 'react-router-dom'
 import moment from 'moment'
+import './zh-cn.js'
+
 export default (props) => {
   const navigate = useNavigate()
+  const queryCustom = queryDict(getTaCustom, {
+    labelKey: 'customName',
+    valueKey: 'customId',
+  })
 
   const columns = [
     {
@@ -21,10 +30,8 @@ export default (props) => {
         },
       },
       valueType: 'dateRange',
-      // render: () => [<ProFormDateTimeRangePicker />],
       hideInTable: true,
     },
-
     {
       title: '甲方',
       dataIndex: 'partyA',
@@ -35,15 +42,14 @@ export default (props) => {
       dataIndex: 'partyAName',
     },
     {
-      title: '已方',
+      title: '乙方',
       dataIndex: 'partyB',
       search: false,
     },
     {
-      title: '已方名称',
+      title: '乙方名称',
       dataIndex: 'partyBName',
     },
-
     {
       title: '项目名称',
       dataIndex: 'projectName',
@@ -53,15 +59,14 @@ export default (props) => {
       dataIndex: 'introduction',
       search: false,
     },
-
     {
-      title: '开始日期',
+      title: '项目开始日期',
       dataIndex: 'startTime',
       render: (t) => moment(t).format('YYYY-MM-DD'),
       search: false,
     },
     {
-      title: '结束日期',
+      title: '项目结束日期',
       dataIndex: 'endTime',
       render: (t) => moment(t).format('YYYY-MM-DD'),
       search: false,
@@ -85,34 +90,83 @@ export default (props) => {
       title: '阶段名称',
       dataIndex: 'stageName',
       search: false,
+      valueEnum: {
+        0: '未开始',
+        1: '处理中',
+        2: '已完成',
+      },
     },
     {
       title: '状态',
       dataIndex: 'status',
+      valueEnum: {
+        0: '禁用',
+        1: '正常',
+      },
+      search: false,
+    },
+
+    // {
+    //   title: '创建时间',
+    //   dataIndex: 'createdAt',
+    // },
+    // {
+    //   title: '创建人',
+    //   dataIndex: 'createdBy',
+    //   search: false,
+    // },
+    {
+      title: '所属客户',
+      dataIndex: 'customId',
+      valueType: 'select',
+      request: queryCustom,
+      search: false,
     },
+    // {
+    //   title: '删除标志',
+    //   dataIndex: 'deleted',
+    // },
+    // {
+    //   title: '阶段ID',
+    //   dataIndex: 'stageId',
+    // },
+    // {
+    //   title: '租户号',
+    //   dataIndex: 'tenantId',
+    // },
+    // {
+    //   title: '更新时间',
+    //   dataIndex: 'updatedAt',
+    // }
   ]
+
   const actionRef = useRef()
   return (
-    <List
-      actionRef={actionRef}
-      rowKey="projectId"
-      onEdit={(record) => navigate(`/project/edit?id=${record.projectId}`)}
-      onDelete={(record) =>
-        deleteTaProject(record.projectId).then(() => actionRef.current.reload())
-      }
-      toolBarRender={() => [
-        <Button
-          key="1"
-          type="primary"
-          onClick={() => {
-            navigate('/project/edit')
-          }}
-        >
-          新增
-        </Button>,
-      ]}
-      request={getTaProject}
-      columns={columns}
-    />
+    <ConfigProvider locale={zhCN}>
+      <List
+        scroll={{ x: 1800 }}
+        actionRef={actionRef}
+        rowKey="projectId"
+        onEdit={(record) => navigate(`/project/edit?id=${record.projectId}`)}
+        onDelete={(record) =>
+          deleteTaProject(record.projectId).then(() =>
+            actionRef.current.reload()
+          )
+        }
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            onClick={() => {
+              navigate('/project/edit')
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={getTaProject}
+        columns={columns}
+      />
+    </ConfigProvider>
   )
 }

src/pages/project/zh-cn.js

@@ -0,0 +1,113 @@
+import moment from 'moment'
+moment.defineLocale('zh-cn', {
+  months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+  weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+  weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+  longDateFormat: {
+    LT: 'Ah点mm分',
+    LTS: 'Ah点m分s秒',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY年MMMD日',
+    LLL: 'YYYY年MMMD日Ah点mm分',
+    LLLL: 'YYYY年MMMD日ddddAh点mm分',
+    l: 'YYYY-MM-DD',
+    ll: 'YYYY年MMMD日',
+    lll: 'YYYY年MMMD日Ah点mm分',
+    llll: 'YYYY年MMMD日ddddAh点mm分'
+  },
+  meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+  meridiemHour: function (hour, meridiem) {
+    if (hour === 12) {
+      hour = 0;
+    }
+    if (meridiem === '凌晨' || meridiem === '早上' ||
+      meridiem === '上午') {
+      return hour;
+    } else if (meridiem === '下午' || meridiem === '晚上') {
+      return hour + 12;
+    } else {
+      // '中午'
+      return hour >= 11 ? hour : hour + 12;
+    }
+  },
+  meridiem: function (hour, minute, isLower) {
+    var hm = hour * 100 + minute;
+    if (hm < 600) {
+      return '凌晨';
+    } else if (hm < 900) {
+      return '早上';
+    } else if (hm < 1130) {
+      return '上午';
+    } else if (hm < 1230) {
+      return '中午';
+    } else if (hm < 1800) {
+      return '下午';
+    } else {
+      return '晚上';
+    }
+  },
+  calendar: {
+    sameDay: function () {
+      return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+    },
+    nextDay: function () {
+      return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+    },
+    lastDay: function () {
+      return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+    },
+    nextWeek: function () {
+      var startOfWeek, prefix;
+      startOfWeek = moment().startOf('week');
+      prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+      return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+    },
+    lastWeek: function () {
+      var startOfWeek, prefix;
+      startOfWeek = moment().startOf('week');
+      prefix = this.unix() < startOfWeek.unix() ? '[上]' : '[本]';
+      return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+    },
+    sameElse: 'LL'
+  },
+  ordinalParse: /\d{1,2}(日|月|周)/,
+  ordinal: function (number, period) {
+    switch (period) {
+      case 'd':
+      case 'D':
+      case 'DDD':
+        return number + '日';
+      case 'M':
+        return number + '月';
+      case 'w':
+      case 'W':
+        return number + '周';
+      default:
+        return number;
+    }
+  },
+  relativeTime: {
+    future: '%s内',
+    past: '%s前',
+    s: '几秒',
+    m: '1 分钟',
+    mm: '%d 分钟',
+    h: '1 小时',
+    hh: '%d 小时',
+    d: '1 天',
+    dd: '%d 天',
+    M: '1 个月',
+    MM: '%d 个月',
+    y: '1 年',
+    yy: '%d 年'
+  },
+  week: {
+    // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+    dow: 1, // Monday is the first day of the week.
+    doy: 4  // The week that contains Jan 4th is the first week of the year.
+  }
+
+}
+);

src/utils/form.js

@@ -2,11 +2,11 @@
 export const formItemLayout = {
   labelCol: {
     xs: { span: 24 },
-    sm: { span: 8 },
+    sm: { span: 4 },
   },
   wrapperCol: {
     xs: { span: 24 },
-    sm: { span: 16 },
+    sm: { span: 12 },
   },
 };
 export const tailFormItemLayout = {