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

src/layouts/AuthLayout/components/Header/User.jsx

@@ -1,19 +1,14 @@
-import React, {
-  useState,
-  forwardRef,
-  useRef,
-  useImperativeHandle,
-} from "react";
-import { Avatar, Dropdown } from "antd";
+import React, { useState, forwardRef, useRef, useImperativeHandle } from 'react'
+import { Avatar, Dropdown } from 'antd'
 import {
   ModalForm,
   ProFormText,
   ProFormDependency,
-} from "@ant-design/pro-components";
-import md5 from "md5";
-import { changePassword } from "@/services/login";
+} from '@ant-design/pro-components'
+import md5 from 'md5'
+import { changePassword } from '@/services/login'
 
-const DefaultAvatar = ({ color = "#1296db" }) => (
+const DefaultAvatar = ({ color = '#1296db' }) => (
   <svg
     viewBox="0 0 1024 1024"
     version="1.1"
@@ -26,26 +21,25 @@ const DefaultAvatar = ({ color = "#1296db" }) => (
       fill={color}
     ></path>
   </svg>
-);
+)
 
 const ChangePassword = forwardRef((props, ref) => {
-
-  const [visible, setVisible] = useState(false);
+  const [visible, setVisible] = useState(false)
 
   const onFinish = async (values) => {
     const data = {
       password: values.newPassword,
-    };
-    await changePassword(data);
+    }
+    await changePassword(data)
 
-    return true;
-  };
+    return true
+  }
 
   useImperativeHandle(ref, () => {
     return {
       show: () => setVisible(true),
-    };
-  });
+    }
+  })
 
   return (
     <ModalForm
@@ -58,28 +52,28 @@ const ChangePassword = forwardRef((props, ref) => {
       <ProFormText.Password
         label="原始密码"
         name="password"
-        rules={[{ required: true, message: "请输入原始密码!" }]}
+        rules={[{ required: true, message: '请输入原始密码!' }]}
       />
       <ProFormText.Password
         label="新密码"
         name="newPassword"
-        rules={[{ required: true, message: "请输入新密码!" }]}
+        rules={[{ required: true, message: '请输入新密码!' }]}
       />
 
-      <ProFormDependency name={["newPassword"]}>
+      <ProFormDependency name={['newPassword']}>
         {({ newPassword }) => (
           <ProFormText.Password
             label="确认新密码"
             name="newPassword2"
             rules={[
-              { required: true, message: "请输入新密码!" },
+              { required: true, message: '请输入新密码!' },
               () => ({
-                validator (_, value) {
+                validator(_, value) {
                   if (!value || value == newPassword) {
-                    return Promise.resolve();
+                    return Promise.resolve()
                   }
 
-                  return Promise.reject("两次输入密码不一致");
+                  return Promise.reject('两次输入密码不一致')
                 },
               }),
             ]}
@@ -87,32 +81,31 @@ const ChangePassword = forwardRef((props, ref) => {
         )}
       </ProFormDependency>
     </ModalForm>
-  );
-});
+  )
+})
 
 export default (props) => {
   const items = [
     {
-      key: "changePassword",
-      label: "修改密码",
+      key: 'changePassword',
+      label: '修改密码',
     },
-  ];
-
-  const passRef = useRef();
-  const { user = {} } = props;
+  ]
 
+  const passRef = useRef()
+  const { user = {} } = props
   const onClick = ({ key }) => {
-    if (key === "changePassword") {
-      passRef.current.show();
+    if (key === 'changePassword') {
+      passRef.current.show()
     }
-  };
+  }
   return (
     <Dropdown menu={{ items, onClick }}>
       <div className="user-info">
         <Avatar size={24} src={<DefaultAvatar />} />
-        <span className="font">{user?.userName}</span>
+        <span className="font">{user?.user?.userName}</span>
         <ChangePassword user={user} ref={passRef} />
       </div>
     </Dropdown>
-  );
-};
+  )
+}

src/pages/projectContact/Edit.jsx

@@ -0,0 +1,107 @@
+import React, { useEffect, useRef, useState, forwardRef } from 'react'
+import {
+  postTaProjectContact,
+  putTaProjectContact,
+  getTaProjectContactId,
+} from '@/services/taProjectContact'
+import { Button, Card, Row, Col, Form, Input } from 'antd'
+import {
+  ProForm,
+  ProFormDateTimeRangePicker,
+  ProFormDatePicker,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormRadio,
+} from '@ant-design/pro-components'
+import Page from '@/components/Page'
+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 [params] = useSearchParams()
+  const id = params.get('id')
+
+  useEffect(() => {
+    if (id) {
+      getTaProjectContactId(id).then((res) => {
+        formRef.current?.setFieldsValue(res)
+      })
+    }
+  }, [])
+
+  const onFinish = (values) => {
+    if (!id) {
+      postTaProjectContact(values).then((res) => {
+        navigate(-1)
+      })
+    } else if (id) {
+      let personId = id
+      putTaProjectContact(id, { personId, ...values }).then((res) => {
+        navigate(-1)
+      })
+    }
+  }
+
+  let formatter = new Intl.NumberFormat('zh-CN', {
+    minimumFractionDigits: 4,
+    maximumFractionDigits: 4,
+  })
+
+  return (
+    <Page>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          onFinish={onFinish}
+          layout="horizontal"
+          initialValues={{ isDefault: 0 }}
+          {...formItemLayout}
+          submitter={{
+            render: (_, doms) => [
+              <Row>
+                <Col offset={8}>
+                  <Button type="primary" htmlType="submit">
+                    提交
+                  </Button>
+                </Col>
+                <Col offset={1}>
+                  <Button onClick={() => navigate(-1)}>返回</Button>
+                </Col>
+              </Row>,
+            ],
+          }}
+        >
+          <ProFormText name="personName" label="名称" />
+          <ProFormSelect
+            name="sex"
+            label="性别"
+            options={[
+              { label: '男', value: 1 },
+              { label: '女', value: 2 },
+              { label: '未知', value: 9 },
+            ]}
+          />
+          <ProFormText name="age" label="年龄" />
+          <ProFormText name="phone" label="手机号" />
+          <ProFormText name="email" label="邮箱" />
+          <ProFormText name="position" label="职位" />
+          <ProFormDatePicker name="birthDay" label="生日" />
+          <ProFormRadio.Group
+            name="isDefault"
+            label="是否默认联系人"
+            options={[
+              { label: '是', value: 1 },
+              { label: '否', value: 0 },
+            ]}
+          />
+        </ProForm>
+      </Card>
+    </Page>
+  )
+}

src/pages/projectContact/index.jsx

@@ -30,6 +30,7 @@ export default (props) => {
     {
       title: '联系人名称',
       dataIndex: 'personName',
+      ellipsis: true,
     },
     {
       title: '性别',
@@ -45,8 +46,8 @@ export default (props) => {
     {
       title: '生日',
       dataIndex: 'birthDay',
-      search: false,
-      render: (t) => moment(t).format('YYYY-MM-DD'),
+      // render: (t) => moment(t).format('YYYY-MM-DD'),
+      valueType: 'date',
     },
 
     {
@@ -56,6 +57,8 @@ export default (props) => {
     {
       title: '邮箱',
       dataIndex: 'email',
+      ellipsis: true,
+      search: false,
     },
     {
       title: '职位',
@@ -64,6 +67,7 @@ export default (props) => {
     {
       title: '是否默认联系人',
       dataIndex: 'isDefault',
+      search: false,
       render: (t) => (t == 1 ? '是' : '否'),
     },
   ]
@@ -71,9 +75,11 @@ export default (props) => {
     <List
       rowKey="personId"
       actionRef={actionRef}
-      //   onEdit={(record) => navigate(`/projectContact/edit?id=${record.personId}`)}
+      onEdit={(record) =>
+        navigate(`/projectContact/edit?id=${record?.personId}`)
+      }
       onDelete={(record) =>
-        deleteTaProjectContact(record.projectId).then(() =>
+        deleteTaProjectContact(record?.personId).then(() =>
           actionRef.current.reload()
         )
       }

src/routes/routes.jsx

@@ -5,6 +5,10 @@ import {
   HeartOutlined,
   HourglassTwoTone,
   StopFilled,
+  UserAddOutlined,
+  UsergroupAddOutlined,
+  TransactionOutlined,
+  PayCircleOutlined,
 } from '@ant-design/icons'
 import { Outlet, Navigate } from 'react-router-dom'
 import AuthLayout from '@/layouts/AuthLayout'
@@ -15,6 +19,7 @@ import AdUserEdit from '@/pages/adUser/Edit'
 import Project from '@/pages/project'
 import ProjectEdit from '@/pages/project/Edit'
 import ProjectContact from '@/pages/projectContact'
+import ProjectContactEdit from '@/pages/projectContact/Edit'
 import ProjectDeploy from '@/pages/projectDeploy'
 import ProjectDeployEdit from '@/pages/project/components/ProjectDeployEdit'
 import ProjectNode from '@/pages/projectNode'
@@ -98,7 +103,15 @@ export const authRoutes = [
     element: <ProjectContact />,
     meta: {
       title: '项目联系人管理',
-      icon: <FileTextOutlined />,
+      icon: <UserAddOutlined />,
+    },
+  },
+  {
+    path: 'projectContact/edit',
+    element: <ProjectContactEdit />,
+    meta: {
+      title: '项目联系人维护',
+      hideInMenu: true,
     },
   },
   // {
@@ -154,7 +167,7 @@ export const authRoutes = [
     element: <Custom />,
     meta: {
       title: '客户管理',
-      icon: <StopFilled />,
+      icon: <UsergroupAddOutlined />,
     },
   },
   {
@@ -203,7 +216,7 @@ export const authRoutes = [
     element: <Finance />,
     meta: {
       title: '公司财务管理',
-      icon: <HourglassTwoTone />,
+      icon: <TransactionOutlined />,
     },
   },
   {
@@ -219,7 +232,7 @@ export const authRoutes = [
     element: <FinanceItem />,
     meta: {
       title: '收付款管理',
-      icon: <HourglassTwoTone />,
+      icon: <PayCircleOutlined />,
     },
   },
   {