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

src/components/Page/LeftIcon.jsx

@@ -18,16 +18,13 @@ const IconStyle = {
 };
 
 export default (props) => {
-  const { children, back } = props;
+  const { children, back, navigatenum } = props;
   const navigate = useNavigate();
   const goBack = (e) => {
- 
-    const router = useRoute();
-    console.log(router);
     e.preventDefault();
     e.stopPropagation();
 
-    navigate(-1);
+    navigate(navigatenum);
   };
   return (
     <Typography.Title
@@ -35,7 +32,15 @@ export default (props) => {
       style={{ fontWeight: 400, flex: "none", margin: "0" }}
     >
       <div style={titleStyle}>
-        {back ? <LeftCircleFilled onClick={goBack} style={IconStyle} /> : ""}
+        {back ? (
+          <LeftCircleFilled
+            onClick={goBack}
+            style={IconStyle}
+            navigatenum={navigatenum}
+          />
+        ) : (
+          ""
+        )}
         {children}
       </div>
     </Typography.Title>

src/components/Page/index.jsx

@@ -9,8 +9,8 @@ const pageStyle = {
   minHeight: "calc(100% - 24px)",
 };
 
-
 export default (props) => {
+  const { back = false, navigatenum = -1 } = props;
   const { meta = {} } = useRoute() || {};
   const style = meta.noLayout ? { height: "100%" } : pageStyle;
 
@@ -19,7 +19,9 @@ export default (props) => {
   return (
     <div style={style}>
       {title && !meta.noLayout && (
-        <LeftIcon back={props?.back}> {title}</LeftIcon>
+        <LeftIcon back={back} navigatenum={navigatenum}>
+          {title}
+        </LeftIcon>
       )}
       {props.children}
     </div>

src/main.jsx

@@ -7,12 +7,16 @@ import { Provider } from "./store";
 import { initTokenIfExists } from "./utils/sso";
 import { renderToPipeableStream } from "react-dom/server";
 import { hydrateRoot } from "react-dom/client";
-
+import { ConfigProvider } from "antd";
+import zhCN from "antd/es/locale/zh_CN";
+import "moment/dist/locale/zh-cn";
 initTokenIfExists();
 
 ReactDOM.createRoot(document.getElementById("root")).render(
-  <Provider>
-    {/* <Background /> */}
-    <Router />
-  </Provider>
+  <ConfigProvider locale={zhCN}>
+    <Provider>
+      {/* <Background /> */}
+      <Router />
+    </Provider>
+  </ConfigProvider>
 );

src/pages/finance/index.jsx

@@ -2,7 +2,7 @@ import List from '@/components/Page/List'
 import React, { useRef } from 'react'
 import { getTfFinance, deleteTfFinance } from '@/services/tfFinance'
 import { queryDict } from '@/utils/request'
-import { Button, ConfigProvider } from 'antd'
+import { Button } from 'antd'
 import { ProFormDateTimeRangePicker } from '@ant-design/pro-components'
 import { useNavigate } from 'react-router-dom'
 

src/pages/financeItem/index.jsx

@@ -2,7 +2,7 @@ import List from '@/components/Page/List'
 import React, { useRef } from 'react'
 import { getTfItemFinance, deleteTfItemFinance } from '@/services/tfFinanceItem'
 import { queryDict } from '@/utils/request'
-import { Button, ConfigProvider } from 'antd'
+import { Button } from 'antd'
 import { ProFormDateTimeRangePicker } from '@ant-design/pro-components'
 import { useNavigate } from 'react-router-dom'
 

src/pages/member/components/ModalNewCard.jsx

@@ -13,7 +13,13 @@ import React from "react";
 import SelectPackageModal from "./SelectPackageModal";
 import SelectCardModal from "./SelectCardModal";
 export default (props) => {
-  const { isModalOpen, setIsModalOpen, modalTitle, modalObj } = props;
+  const {
+    isModalOpen,
+    setIsModalOpen,
+    modalTitle,
+    modalObj,
+    reload,
+  } = props;
   const formRef = React.useRef();
 
   const handleOk = () => {
@@ -41,10 +47,11 @@ export default (props) => {
           .then((result) => {
             setIsModalOpen(false);
           })
-          .catch((err) => { });
+          .catch((err) => {});
       } else {
         // 开卡
         postTaMemberCardIdActive(x).then((res) => {
+          reload();
           setIsModalOpen(false);
         });
       }

src/pages/member/index.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useRef } from "react";
 import { getTaMember } from "@/services/taMember";
 import List from "@/components/Page/List";
 import moment from "moment";
@@ -76,11 +76,16 @@ export default (props) => {
   const onWrite = (id) => {
     // putTaMemberCardIdWrite().then((res) => {});
   };
+const actionRef=useRef()
+
+const reload=()=>{
+  return actionRef?.current?.reload()
+}
 
   return (
     <>
       <List
-        // actionRef={actionRef}
+        actionRef={actionRef}
         rowKey="memberId"
         // onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
         columnOptionRender={(_, record) => {
@@ -128,7 +133,8 @@ export default (props) => {
         setIsModalOpen={setIsModalOpen}
         modalTitle={modalTitle}
         modalObj={modalObj}
-      />
+        reload={reload}
+      /> 
     </>
   );
 };

src/pages/project/Edit.jsx

@@ -1,49 +1,49 @@
-import React, { useState, useEffect } from 'react'
-import Page from '@/components/Page'
-import { useNavigate, useSearchParams } from 'react-router-dom'
-import ProjectMessage from './components/ProjectMessage'
-import ProjectDeploy from './components/ProjectDeploy'
-import { Card } from 'antd'
+import React, { useState, useEffect } from "react";
+import Page from "@/components/Page";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import ProjectMessage from "./components/ProjectMessage";
+import ProjectDeploy from "./components/ProjectDeploy";
+import { Card } from "antd";
 
 export default (props) => {
-  const [activeTabKey, setActiveTabKey] = useState('tab1')
-  const navigate = useNavigate()
+  const [activeTabKey, setActiveTabKey] = useState("tab1");
+  const navigate = useNavigate();
 
-  const [params] = useSearchParams()
-  const tab = params.get('tab')
+  const [params] = useSearchParams();
+  const tab = params.get("tab");
 
   useEffect(() => {
     if (tab) {
-      setActiveTabKey(tab)
+      setActiveTabKey(tab);
     }
-  }, [tab])
+  }, [tab]);
 
   const tabList = [
     {
-      key: 'tab1',
-      tab: '项目信息',
+      key: "tab1",
+      tab: "项目信息",
     },
     {
-      key: 'tab2',
-      tab: '部署信息',
+      key: "tab2",
+      tab: "部署信息",
     },
-  ]
+  ];
 
   const contentList = {
     tab1: <ProjectMessage />,
     tab2: <ProjectDeploy />,
-  }
+  };
 
   return (
-    <Page back>
+    <Page back navigatenum={"/project/project"}>
       <Card
-        style={{ backgroundColor: '#F0F2F5' }}
+        style={{ backgroundColor: "#F0F2F5" }}
         tabList={tabList}
         activeTabKey={activeTabKey}
-        onTabChange={(key) => navigate(`?tab=${key}`)}
+        onTabChange={setActiveTabKey}
       >
         {contentList[activeTabKey]}
       </Card>
     </Page>
-  )
-}
+  );
+};

src/pages/project/components/Custom.jsx

@@ -1,13 +1,6 @@
 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

src/pages/project/index.jsx

@@ -1,108 +1,107 @@
-import List from '@/components/Page/List'
-import React, { useRef } from 'react'
-import { getTaProject, deleteTaProject } from '@/services/taProject'
-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'
+import List from "@/components/Page/List";
+import React, { useRef } from "react";
+import { getTaProject, deleteTaProject } from "@/services/taProject";
+import { getTaCustom } from "@/services/taCustom";
+import { queryDict } from "@/utils/request";
+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 queryCustom = queryDict(getTaCustom, {
-    labelKey: 'customName',
-    valueKey: 'customId',
-  })
+    labelKey: "customName",
+    valueKey: "customId",
+  });
 
   const columns = [
     {
-      title: '项目日期',
-      dataIndex: 'startTime1',
+      title: "项目日期",
+      dataIndex: "startTime1",
       search: {
         transform: (value) => {
           return {
             startTime: value[0],
             endTime: value[1],
-          }
+          };
         },
       },
-      valueType: 'dateRange',
+      valueType: "dateRange",
       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,
       ellipsis: true,
     },
     {
-      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,
       valueEnum: {
-        0: '未开始',
-        1: '处理中',
-        2: '已完成',
+        0: "未开始",
+        1: "处理中",
+        2: "已完成",
       },
     },
     {
-      title: '状态',
-      dataIndex: 'status',
+      title: "状态",
+      dataIndex: "status",
       valueEnum: {
-        0: '禁用',
-        1: '正常',
+        0: "禁用",
+        1: "正常",
       },
       search: false,
     },
@@ -117,9 +116,9 @@ export default (props) => {
     //   search: false,
     // },
     {
-      title: '所属客户',
-      dataIndex: 'customId',
-      valueType: 'select',
+      title: "所属客户",
+      dataIndex: "customId",
+      valueType: "select",
       request: queryCustom,
       search: false,
     },
@@ -139,32 +138,30 @@ export default (props) => {
     //   title: '更新时间',
     //   dataIndex: 'updatedAt',
     // }
-  ]
+  ];
 
-  const actionRef = useRef()
+  const actionRef = useRef();
   const onAdd = () => {
-    navigate('/project/project/edit')
-  }
+    navigate("/project/project/edit");
+  };
   return (
-    <ConfigProvider locale={zhCN}>
-      <List
-        scroll={{ x: 1800 }}
-        actionRef={actionRef}
-        rowKey="projectId"
-        onEdit={(record) => navigate(`/project/project/edit?id=${record.projectId}`)}
-        onDelete={(record) =>
-          deleteTaProject(record.projectId).then(() =>
-            actionRef.current.reload()
-          )
-        }
-        toolBarRender={() => [
-          <Button key="1" type="primary" onClick={onAdd}>
-            新增
-          </Button>,
-        ]}
-        request={getTaProject}
-        columns={columns}
-      />
-    </ConfigProvider>
-  )
-}
+    <List
+      scroll={{ x: 1800 }}
+      actionRef={actionRef}
+      rowKey="projectId"
+      onEdit={(record) =>
+        navigate(`/project/project/edit?id=${record.projectId}`)
+      }
+      onDelete={(record) =>
+        deleteTaProject(record.projectId).then(() => actionRef.current.reload())
+      }
+      toolBarRender={() => [
+        <Button key="1" type="primary" onClick={onAdd}>
+          新增
+        </Button>,
+      ]}
+      request={getTaProject}
+      columns={columns}
+    />
+  );
+};

src/pages/project/zh-cn.js

@@ -1,113 +0,0 @@
-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.
-  }
-
-}
-);