Merge branch 'znh' into 'develop'

Znh See merge request !15

Merge branch 'znh' into 'develop'
Znh See merge request !15
zhongnanhuang
2 parents 2fd6e5cb 2ca7483f
Showing 27 changed files with 1796 additions and 125 deletions
.umirc.ts
package.json
src/access.ts
src/app.ts
src/assets/icons/down.svg
src/assets/icons/up.svg
src/pages/Login/index.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.less
src/pages/Order/index.tsx
src/pages/OrderPrint/OrderPrintModal.tsx
src/pages/OrderPrint/PrinterCSS.tsx
src/pages/OrderPrint/components/HoujiePrinter.tsx
src/pages/OrderReport/components/OrderDualAxes.tsx
src/pages/OrderReport/components/OrderStatisticCard.tsx
@@ -39,6 +39,13 @@ export default defineConfig({
       icon: 'ProfileOutlined',
     },
     {
+      name: '订单报表',
+      path: '/orderReport',
+      component: './OrderReport',
+      icon: 'LineChartOutlined',
+      access: 'canReadAdmin',
+    },
+    {
       name: '打印',
       path: '/print',
       component: './OrderPrint',
@@ -12,6 +12,7 @@
     "start": "npm run dev"
   },
   "dependencies": {
+    "@ant-design/charts": "^1.4.3",
     "@ant-design/icons": "^5.2.6",
     "@ant-design/pro-components": "^2.6.32",
     "@inspir/assembly-css": "1.0.0-alpha",
 export default (initialState: API.UserInfo) => {
   // 在这里按照初始化数据定义项目中的权限，统一管理
   // 参考文档 https://umijs.org/docs/max/access
-  const canSeeAdmin = !!(
-    initialState && initialState.name !== 'dontHaveAccess'
-  );
+  const { roleSmallVO } = initialState;
+
+  console.log(roleSmallVO?.code === 'admin');
   return {
-    canSeeAdmin,
+    canReadAdmin: roleSmallVO?.code === 'admin',
   };
 };
@@ -7,12 +7,12 @@ import { message } from &#39;antd&#39;;
 import { RESPONSE_CODE } from './constants/enum';
 import './style/global.css';
+import { getUserInfo } from './utils';
 // 全局初始化数据配置，用于 Layout 用户信息和权限初始化
 // 更多信息见文档：https://umijs.org/docs/api/runtime-config#getinitialstate
-export async function getInitialState(): Promise<{ name: string }> {
-  // getUserInfo();
-  return { name: '' };
+export async function getInitialState() {
+  return getUserInfo();
 }
 export const layout = () => {
@@ -24,7 +24,7 @@ export const layout = () =&gt; {
       // rightContentRender: () => <RightContent />,
       // footerRender: () => <Footer />,
     },
-    collapsed: true,
+    // collapsed: true,
   };
 };
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702266081134" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1723" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M866.742857 762.148571l-20.48-170.788571a6.948571 6.948571 0 0 0-11.702857-4.022857l-50.834286 51.2-232.594285-232.594286a14.262857 14.262857 0 0 0-19.382858 0l-87.04 87.04L207.36 256a6.948571 6.948571 0 0 0-9.508571 0L159.085714 294.765714a6.948571 6.948571 0 0 0 0 9.508572l275.748572 276.114285a13.531429 13.531429 0 0 0 19.382857 0l87.405714-87.405714 193.828572 193.828572-50.834286 50.834285a6.948571 6.948571 0 0 0 4.022857 11.702857l170.422857 20.48a6.582857 6.582857 0 0 0 7.68-7.68z" p-id="1724" fill="#1DB302"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702266075667" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1549" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M859.062857 256l-170.788571 20.48a6.948571 6.948571 0 0 0-4.022857 11.702857l50.834285 49.005714-193.462857 193.828572-87.405714-87.405714a13.897143 13.897143 0 0 0-19.382857 0l-275.748572 275.748571a7.314286 7.314286 0 0 0 0 9.874286L197.851429 768a6.948571 6.948571 0 0 0 9.508571 0l237.348571-236.982857 87.04 87.04a14.262857 14.262857 0 0 0 19.382858 0l232.594285-232.594286 50.834286 50.834286a6.948571 6.948571 0 0 0 11.702857-4.022857l20.48-170.788572a6.582857 6.582857 0 0 0-7.68-5.485714z" p-id="1550" fill="#d81e06"></path></svg>
 \ No newline at end of file
@@ -9,7 +9,7 @@ import {
   ProConfigProvider,
   ProFormText,
 } from '@ant-design/pro-components';
-import { history, useModel } from '@umijs/max';
+import { useModel } from '@umijs/max';
 import { Button, theme } from 'antd';
 import { useEffect, useState } from 'react';
@@ -27,6 +27,7 @@ export default () =&gt; {
   useEffect(() => {
     fetchCode();
   }, []);
+
   return (
     <ProConfigProvider hashed={false}>
       <div
@@ -43,7 +44,10 @@ export default () =&gt; {
               if (res.result === RESPONSE_CODE.SUCCESS) {
                 setUserLocalInfo(res.data.token, res.data?.user);
-                history.push('/order');
+                /**
+                 * 使用history.push或者history.replace会导致菜单路由无法更新，需要再次刷新页面
+                 */
+                window.location.href = '/order';
               } else {
                 fetchCode();
               }
 import { RESPONSE_CODE } from '@/constants/enum';
-import { postServiceOrderCheckOrder } from '@/services';
+import {
+  postServiceOrderCheckOrder,
+  postServiceOrderFinanceCheckOrder,
+} from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
-export default ({ setCheckVisible, data, subOrders, onClose }) => {
+import { CHECK_TYPE } from '../constant';
+export default ({
+  setCheckVisible,
+  data,
+  subOrders,
+  orderCheckType,
+  onClose,
+}) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
   let subOrderIds: any[] = [];
   //是单条子订单审核
@@ -11,6 +21,7 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
   } else {
     subOrderIds = subOrders.map((subOrder) => subOrder.id);
   }
+
   async function doCheck(body: object) {
     const data = await postServiceOrderCheckOrder({
       data: body,
@@ -20,6 +31,31 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
       onClose();
     }
   }
+
+  /**
+   *
+   * @param body 财务审核
+   */
+  async function doFinancailCheck(body: object) {
+    const data = await postServiceOrderFinanceCheckOrder({
+      data: body,
+    });
+    if (data.result === RESPONSE_CODE.SUCCESS) {
+      message.success(data.message);
+      onClose();
+    }
+  }
+
+  /**
+   * 审核类型
+   */
+  function checkType(check: string) {
+    if (orderCheckType === check) {
+      return true;
+    }
+    return false;
+  }
+
   return (
     <ModalForm<{
       name: string;
@@ -40,30 +76,74 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
       }}
       submitter={{
         render: (props, defaultDoms) => {
-          return [
+          let myDoms = [];
+          myDoms.push(
             <Button
               key="驳回"
               onClick={() => {
-                doCheck({
-                  flag: false,
-                  ids: subOrderIds,
+                if (checkType(CHECK_TYPE.NORMAL)) {
+                  doCheck({
+                    flag: false,
+                    ids: subOrderIds,
+                    externalProcurement: 0,
+                    checkNotes: form.getFieldValue('name'),
+                  });
+                  return;
+                }
+
+                //财务审核
+                doFinancailCheck({
                   checkNotes: form.getFieldValue('name'),
+                  ids: subOrderIds,
+                  checkPassOrReject: false,
                 });
               }}
             >
               驳回
             </Button>,
-            defaultDoms[1],
-          ];
+          );
+
+          //如果不是财务审核，那么显示这个外部采购
+          if (checkType(CHECK_TYPE.NORMAL)) {
+            myDoms.push(
+              <Button
+                key="外部采购"
+                onClick={() => {
+                  doCheck({
+                    flag: false,
+                    ids: subOrderIds,
+                    externalProcurement: 1,
+                    checkNotes: form.getFieldValue('name'),
+                  });
+                }}
+              >
+                外部采购
+              </Button>,
+            );
+          }
+
+          //确认
+          myDoms.push(defaultDoms[1]);
+          return myDoms;
         },
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        //审核通过
-        return doCheck({
-          flag: true,
-          ids: subOrderIds,
+        if (checkType(CHECK_TYPE.NORMAL)) {
+          //审核通过
+          return doCheck({
+            flag: true,
+            ids: subOrderIds,
+            externalProcurement: 0,
+            checkNotes: values.name,
+          });
+        }
+
+        //财务审核
+        return doFinancailCheck({
           checkNotes: values.name,
+          ids: subOrderIds,
+          checkPassOrReject: true,
         });
       }}
       onOpenChange={setCheckVisible}
 import { RESPONSE_CODE } from '@/constants/enum';
-import { postServiceOrderSendProduct } from '@/services';
+import {
+  postServiceOrderSendProduct,
+  postServiceOrderSupplierSendOrder,
+} from '@/services';
 import { enumToSelect } from '@/utils';
 import {
   ProColumns,
@@ -11,17 +14,31 @@ import {
 import { Button, Input, InputNumber, Modal, Select, message } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
-import { LOGISTICS_STATUS_OPTIONS } from '../constant';
+import { CHECK_TYPE, LOGISTICS_STATUS_OPTIONS } from '../constant';
 const DeliverModal = ({
   data: propsData,
   isSendProduct,
   setVisible,
+  sendType,
   onClose,
 }) => {
   const [data, setData] = useState(propsData || {});
   const form = useRef();
+  /**
+   * 是供应商发货还是普通发货
+   * @param typeString
+   * @returns
+   */
+  function optType(typeString: string) {
+    if (sendType === typeString) {
+      return true;
+    }
+
+    return false;
+  }
+
   useEffect(() => {
     setData(propsData);
   }, [propsData]);
@@ -126,7 +143,9 @@ const DeliverModal = ({
             logisticsMethod: item.logisticsMethod,
             serialNumber: item.serialNumber,
             packageNumber:
-              item.packageNumber === undefined ? 1 : item.packageNumber,
+              item.packageNumber === null || item.packageNumber === undefined
+                ? 1
+                : item.packageNumber,
           };
         });
         let body = { id: data[0].mainOrderId, list: list, flag: false };
@@ -134,7 +153,13 @@ const DeliverModal = ({
           body.flag = true;
         }
         //发货请求
-        const res = await postServiceOrderSendProduct({ data: body });
+        let res;
+        if (optType(CHECK_TYPE.SUPPLIER)) {
+          res = await postServiceOrderSupplierSendOrder({ data: body });
+        } else {
+          res = await postServiceOrderSendProduct({ data: body });
+        }
+
         if (res.result === RESPONSE_CODE.SUCCESS) {
           message.success(res.message);
           onClose();
@@ -4,17 +4,35 @@ import {
   postServiceOrderEditOrder,
   postServiceOrderInvoicing,
 } from '@/services';
+import { enumToSelect } from '@/utils';
 import {
   DrawerForm,
   ProFormDatePicker,
+  ProFormSelect,
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
+import { useEffect, useState } from 'react';
+import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
-export default ({ mainOrder, subOrders, isEdit, onClose }) => {
+export default ({
+  mainOrder,
+  subOrders,
+  isEdit,
+  isMainOrder,
+  cancel,
+  onClose,
+}) => {
+  const [invoicingStatus, setInvoicingStatus] = useState('');
   const subIds = subOrders.map((item) => item.id);
-  console.log(subOrders);
+  useEffect(() => {
+    // 在组件挂载或数据变化时，更新组件状态
+    if (mainOrder) {
+      setInvoicingStatus(subOrders[0]?.invoicingStatus);
+    }
+  }, [mainOrder]);
+
   const [form] = Form.useForm<{ name: string; company: string }>();
   return (
     <DrawerForm<{
@@ -44,6 +62,8 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
           subIds: subIds,
           collectMoneyTime: form.getFieldValue('collectMoneyTime'),
           invoicingNotes: form.getFieldValue('invoicingNotes'),
+          invoicingStatus: form.getFieldValue('invoicingStatus'),
+          mainorderOrSubOrderInvoicing: isMainOrder,
         };
         if (isEdit) {
           res = await postServiceOrderEditOrder({ data: body });
@@ -56,9 +76,25 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
         }
       }}
       onOpenChange={(val) => {
-        return !val && onClose();
+        return !val && cancel();
       }}
     >
+      {isMainOrder ? (
+        <ProFormSelect
+          placeholder="选择是否需要开票"
+          name="invoicingStatus"
+          width="lg"
+          label="是否需要开票"
+          options={enumToSelect(INVOCING_STATUS_OPTIONS_OLD)}
+          onChange={setInvoicingStatus}
+          initialValue={subOrders[0]?.invoicingStatus}
+          // disabled={mainInfoDisbled}
+          rules={[{ required: true, message: '是否需要开票必填' }]}
+        />
+      ) : (
+        ''
+      )}
+
       <ProFormText
         width="lg"
         name="invoiceIdentificationNumber"
@@ -80,26 +116,35 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
         placeholder="请输入开户银行账号"
         disabled
       />
-      <ProFormDatePicker
-        width="lg"
-        name="invoicingTime"
-        label="开票时间"
-        disabled={isEdit}
-        rules={[{ required: !isEdit ? true : false, message: '这是必填项' }]}
-        initialValue={subOrders[0].invoicingTime}
-      />
-      <ProFormDatePicker
-        width="lg"
-        name="collectMoneyTime"
-        label="收款时间"
-        initialValue={subOrders[0].collectMoneyTime}
-      />
+
+      {invoicingStatus !== 'UN_INVOICE'
+        ? [
+            <ProFormDatePicker
+              key="invoicingTime"
+              width="lg"
+              name="invoicingTime"
+              label="开票时间"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.invoicingTime}
+            />,
+            <ProFormDatePicker
+              key="collectMoneyTime"
+              width="lg"
+              name="collectMoneyTime"
+              label="收款时间"
+              initialValue={subOrders[0]?.collectMoneyTime}
+            />,
+          ]
+        : ''}
       <ProFormTextArea
         width="lg"
         name="invoicingNotes"
         label="备注"
-        initialValue={subOrders[0].invoicingNotes}
+        initialValue={subOrders[0]?.invoicingNotes}
       />
     </DrawerForm>
   );
@@ -2,7 +2,11 @@ import { postServiceOrderQueryHistoryOrderRecord } from &#39;@/services&#39;;
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd';
 import { useEffect, useState } from 'react';
-import { HISTORY_OPT_TYPE, ORDER_STATUS_OPTIONS } from '../constant';
+import {
+  FINANCIAL_STATUS_OPTIONS,
+  HISTORY_OPT_TYPE,
+  ORDER_STATUS_OPTIONS,
+} from '../constant';
 export default ({ subOrders, onClose }) => {
   let subOrderIds = subOrders?.map((subOrder: any) => {
@@ -50,7 +54,7 @@ export default ({ subOrders, onClose }) =&gt; {
           <Row className="max-h-[500px] overflow-auto" gutter={[0, 14]}>
             {data.map((item) => {
               return (
-                <Col span={24} key="key">
+                <Col span={24} key={i}>
                   <Flex vertical>
                     <div>
                       <span className="py-2 text-[#5E5E5E]">
@@ -64,7 +68,7 @@ export default ({ subOrders, onClose }) =&gt; {
                     <Flex vertical>
                       {item.historySubOrderRecordDto?.map((history) => {
                         return (
-                          <div className="py-1" key="key">
+                          <div className="py-1" key={history.id}>
                             <span className="pr-2 text-[#5E5E5E]">
                               {formatDateTime(history.createTime)}
                             </span>
@@ -88,7 +92,10 @@ export default ({ subOrders, onClose }) =&gt; {
                                 history.status,
                                 ORDER_STATUS_OPTIONS,
                               ) === undefined
-                                ? '已开票'
+                                ? enumValueToLabel(
+                                    history.status,
+                                    FINANCIAL_STATUS_OPTIONS,
+                                  )
                                 : enumValueToLabel(
                                     history.status,
                                     ORDER_STATUS_OPTIONS,
@@ -27,6 +27,7 @@ import { cloneDeep } from &#39;lodash&#39;;
 import { useEffect, useRef, useState } from 'react';
 import {
   INVOCING_STATUS_OPTIONS,
+  INVOCING_STATUS_OPTIONS_OLD,
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
@@ -44,6 +45,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     return orderOptType === type;
   }
+  /**
+   *
+   * @returns 获取开票选项
+   */
+  function getInvoicingSelect() {
+    if (optType('edit') || optType('copy')) {
+      return enumToSelect(INVOCING_STATUS_OPTIONS_OLD);
+    }
+    return enumToSelect(INVOCING_STATUS_OPTIONS);
+  }
+
   const fileList: any = [];
   useEffect(() => {
@@ -77,6 +89,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     });
   }
+  //复制的时候，如果是不需要开票，要把开票信息清空
+  if (optType('copy') && data.invoicingStatus === 'UN_INVOICE') {
+    data.invoiceIdentificationNumber = undefined;
+  }
+
   if (subOrders !== undefined && subOrders.length > 0) {
     data.list = subOrders;
   }
@@ -259,6 +276,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     >
       <h2>订单基本信息</h2>
       <ProFormText
+        key="id"
         name="id"
         width="lg"
         disabled
@@ -268,6 +286,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormSelect
         name="salesCode"
+        key="salesCode"
         width="lg"
         showSearch
         label="销售代表"
@@ -277,7 +296,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         // disabled={mainInfoDisbled}
       />
       <ProFormSelect
-        key="key"
+        key="customerName"
         label="收货人"
         width="lg"
         showSearch
@@ -372,6 +391,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="customerContactNumber"
         name="customerContactNumber"
         label="联系方式"
         placeholder="请输入联系方式"
@@ -380,6 +400,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="institution"
         name="institution"
         label="单位"
         placeholder="请输入单位"
@@ -388,6 +409,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="institutionContactName"
         name="institutionContactName"
         label="单位联系人"
         placeholder="请输入单位联系人"
@@ -396,6 +418,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormTextArea
         width="lg"
+        key="customerShippingAddress"
         name="customerShippingAddress"
         label="收货地址"
         placeholder="请输入收货地址"
@@ -406,6 +429,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         <ProFormDigit
           name="totalPayment"
           width="lg"
+          key="totalPayment"
           label="支付总额（￥）"
           rules={[{ required: true, message: '支付总额必填' }]}
           tooltip="点击计算，合计所有子订单金额"
@@ -428,6 +452,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="请输入支付渠道"
         name="paymentChannel"
         width="lg"
+        key="paymentChannel"
         label="支付渠道"
         options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
         rules={[{ required: true, message: '支付渠道必填' }]}
@@ -437,6 +462,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="请输入支付方式"
         name="paymentMethod"
         width="lg"
+        key="paymentMethod"
         label="支付方式"
         options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
         rules={[{ required: true, message: '支付方式必填' }]}
@@ -446,8 +472,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="选择是否需要开票"
         name="invoicingStatus"
         width="lg"
+        key="invoicingStatus"
         label="是否需要开票"
-        options={enumToSelect(INVOCING_STATUS_OPTIONS)}
+        options={getInvoicingSelect()}
         // disabled={mainInfoDisbled}
         onChange={(_, option) => {
           setInvoicingStatus(option.value);
@@ -463,6 +490,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         name="invoiceIdentificationNumber"
         label="开票信息"
+        key="invoiceIdentificationNumber"
         // disabled={mainInfoDisbled}
         hidden={invoicingStatus === 'UN_INVOICE'}
         placeholder="请输入开票信息"
@@ -477,6 +505,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       {getUserInfo().roleSmallVO?.code === 'admin' ? (
         <ProFormDateTimePicker
           width="lg"
+          key="invoicingTime"
           name="invoicingTime"
           // disabled={mainInfoDisbled}
           hidden={invoicingStatus === 'UN_INVOICE'}
@@ -489,6 +518,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       <ProFormText
         width="lg"
         name="bank"
+        key="bank"
         label="开户银行"
         // disabled={mainInfoDisbled}
         hidden={invoicingStatus === 'UN_INVOICE'}
@@ -496,6 +526,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="bankAccountNumber"
         name="bankAccountNumber"
         hidden={invoicingStatus === 'UN_INVOICE'}
         label="银行账号"
@@ -506,6 +537,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         name="notes"
         label="备注"
+        key="notes"
         // disabled={mainInfoDisbled}
         placeholder="请输入备注"
         rules={[
@@ -651,7 +683,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   }}
                 />,
                 <ProFormText
-                  key="productCode"
+                  key={'productCode' + listMeta.index}
                   width="lg"
                   name="productCode"
                   disabled
@@ -666,7 +698,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   placeholder="未输入商品名称"
                 />,
                 <ProFormText
-                  key="parameters"
+                  key={'parameters' + listMeta.index}
                   width="lg"
                   name="parameters"
                   label="商品参数"
@@ -674,7 +706,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品参数必填' }]}
                 />,
                 <ProFormDigit
-                  key="quantity"
+                  key={'quantity' + listMeta.index}
                   width="lg"
                   name="quantity"
                   label="商品数量"
@@ -688,7 +720,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品数量必填' }]}
                 />,
                 <ProFormDigit
-                  key="productPrice"
+                  key={'productPrice' + listMeta.index}
                   width="lg"
                   name="productPrice"
                   label="商品单价"
@@ -702,7 +734,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品单价必填' }]}
                 />,
                 <ProFormText
-                  key="unit"
+                  key={'unit' + listMeta.index}
                   width="lg"
                   name="unit"
                   label="商品单位"
@@ -712,7 +744,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 <ProFormDigit
                   width="lg"
-                  key="subOrderPayment"
+                  key={'subOrderPayment' + listMeta.index}
                   name="subOrderPayment"
                   label="子订单金额"
                   placeholder="请输入子订单金额"
@@ -720,7 +752,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '子订单金额必填' }]}
                 />,
                 <ProFormSelect
-                  key="productBelongBusiness"
+                  key={'productBelongBusiness' + listMeta.index}
                   placeholder="请输入所属事业部"
                   name="productBelongBusiness"
                   width="lg"
@@ -731,7 +763,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   // disabled={mainInfoDisbled}
                 />,
                 <ProFormText
-                  key="notes"
+                  key={'notes' + listMeta.index}
                   width="lg"
                   name="notes"
                   label="备注"
@@ -745,7 +777,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 />,
                 <>
                   <ProFormUploadDragger
-                    key="filePaths"
+                    key={'filePaths' + listMeta.index}
                     label="附件"
                     name="filePaths"
                     action="/api/service/order/fileProcess"
@@ -9,10 +9,12 @@ export const PAYMENT_CHANNEL_OPTIONS = {
 };
 export const PAYMENT_METHOD_OPTIONS = {
-  PAYMENT_IN_ADVANCE: '预付',
-  CASH_ON_DELIVERY: '货到付款',
   UNPAID: '未付款',
+  TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
+  PAYMENT_IN_ADVANCE: '预付款',
+  WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
   PLATFORM_SETTLEMENT: '平台结算',
+  CASH_ON_DELIVERY: '货到付款',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -23,13 +25,19 @@ export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
   EXPERIMENTAL_CONSUMABLES: '实验耗材事业部门',
 };
-export const INVOCING_STATUS_OPTIONS = {
+export const INVOCING_STATUS_OPTIONS_OLD = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
   COMMON_INVOICED: '普票',
   INVOICED: '需要开票',
 };
+export const INVOCING_STATUS_OPTIONS = {
+  UN_INVOICE: '不需开票',
+  SPECIALLY_INVOICED: '专票',
+  COMMON_INVOICED: '普票',
+};
+
 export const INVOCING_STATUS = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
@@ -38,11 +46,23 @@ export const INVOCING_STATUS = {
 };
 /**
+ * 普通审核
+ * 财务审核
+ * 采购审核
+ */
+export const CHECK_TYPE = {
+  NORMAL: 'NORMAL',
+  FINALCIAL: 'FINALCIAL',
+  PROCURE: 'PROCURE',
+  SUPPLIER: 'SUPPLIER',
+};
+
+/**
  * 是否需要开票
  * @param subOrder
  */
 export const getNeedInvoicing = (subOrder: any) => {
-  if (subOrder.invoicingTime !== undefined) {
+  if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
     return '已开票';
   }
   if (subOrder.invoicingStatus === 'UN_INVOICE') {
@@ -73,15 +93,26 @@ export const LOGISTICS_STATUS_OPTIONS = {
   JINGDONG_LOGISTICS: '京东',
   SF_EXPRESS: '顺丰',
   DEBANG_LOGISTICS: '德邦物流',
+  OTHER_LOGISTICS: '其他物流方式',
 };
 export const ORDER_STATUS_OPTIONS = {
   UNAUDITED: '未审核',
-  AUDIT_FAILED: '审核失败',
+  FINANCE_PROCESS: '财务已审核',
   AUDITED: '已审核',
+  PROCURE_UN_PROCESS: '采购未审核',
+  PROCURE_PROCESS: '采购已审核',
+  SUPPLIER_WAIT_SHIP: '供应商-待发货',
+  SUPPLIER_SHIPPED: '供应商-已发货',
   WAIT_SHIP: '待发货',
   SHIPPED: '已发货',
   CONFIRM_RECEIPT: '确认收货',
+  AUDIT_FAILED: '审核失败',
+};
+
+export const FINANCIAL_STATUS_OPTIONS = {
+  INVOICING: '已开票',
+  UN_INVOICING: '取消开票',
 };
 export const TAGS_COLOR = new Map<string, string>([
@@ -95,7 +126,12 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['WAIT_SHIP', 'processing'],
   ['SHIPPED', 'processing'],
   ['AUDIT_FAILED', 'error'],
-  ['CONFIRM_RECEIPT', 'success'],
+  ['CONFIRM_RECEIPT', 'processing'],
+  ['FINANCE_PROCESS', 'processing'],
+  ['PROCURE_UN_PROCESS', 'processing'],
+  ['PROCURE_PROCESS', 'processing'],
+  ['SUPPLIER_WAIT_SHIP', 'processing'],
+  ['SUPPLIER_SHIPPED', 'processing'],
 ]);
 export const SALES_CODE_OPTIONS = [
@@ -108,6 +144,7 @@ export const SALES_CODE_OPTIONS = [
   { label: 'HQ-6_smile', value: 'HQ-6_smile' },
   { label: 'HQ-7_Yvonne', value: 'HQ-7_Yvonne' },
   { label: 'HQ-8_Daniel', value: 'HQ-8_Daniel' },
+  { label: 'HQ-9_Wendy', value: 'HQ-9_Wendy' },
   { label: 'W_strong', value: 'W_strong' },
   { label: 'W-1_Alice', value: 'W-1_Alice' },
   { label: 'W-2_Demi', value: 'W-2_Demi' },
@@ -133,12 +170,14 @@ export const SALES_CODE_OPTIONS = [
   { label: 'GW-4_Lynn', value: 'GW-4_Lynn' },
   { label: 'GW-6_smile', value: 'GW-6_smile' },
   { label: 'GW-7_Yvonne', value: 'GW-7_Yvonne' },
+  { label: 'GW-9_Wendy', value: 'GW-9_Wendy' },
   { label: 'W-9_Jack', value: 'W-9_Jack' },
   { label: 'W-8_Andy', value: 'W-8_Andy' },
   { label: 'CQ_Peter', value: 'CQ_Peter' },
   { label: 'MA_A_Mao', value: 'MA_A_Mao' },
   { label: 'CQ-2', value: 'CQ-2' },
   { label: 'JJ', value: 'JJ' },
+  { label: 'CQ-3', value: 'CQ-3' },
 ];
 export const HISTORY_OPT_TYPE = new Map<string, string>([
@@ -152,6 +191,11 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['INVOICING', '财务开票'],
   ['EDIT_ORDER', '财务编辑'],
   ['MODIFY_SEN_INFORMATION', '发货信息编辑'],
+  ['UN_INVOICING', '财务取消开票'],
+  ['FINANCE_CHECK_ORDER', '财务审核'],
+  ['PROCURE_CHECK_ORDER', '采购审核'],
+  ['SUPPLIER_PRINT', '供应商打印'],
+  ['EXTERNAL_PROCUREMENT', '仓库操作外部采购子订单'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -265,7 +309,7 @@ export const MAIN_ORDER_COLUMNS = [
   {
     title: '创建日期',
     dataIndex: 'createTime',
-    valueType: 'dateRange',
+    valueType: 'dateTimeRange',
     hideInTable: true,
     search: {
       transform: (value) => {
@@ -91,3 +91,8 @@
   border-bottom: 1px solid #d7d6d6; /* 设置行与行之间分割线的颜色 */
   border-right: 1px solid #d7d6d6; /* 设置行与行之间分割线的颜色 */
 }
+
+//tooltip字体颜色自定义
+// .order-tooltip .ant-tooltip-inner{
+//   color: black !important;
+// }
@@ -6,6 +6,7 @@ import {
 } from '@/services';
 import { orderExport } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
+import { getUserInfo } from '@/utils/user';
 import {
   ClockCircleTwoTone,
   ContainerTwoTone,
@@ -46,8 +47,10 @@ import HistoryModal from &#39;./components/HistoryModal&#39;;
 import ImportModal from './components/ImportModal';
 import OrderDrawer from './components/OrderDrawer';
 import OrderNotesEditModal from './components/OrderNotesEditModal';
+import ProcureCheckModal from './components/ProcureCheckModal';
 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
 import {
+  CHECK_TYPE,
   LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
   ORDER_STATUS_OPTIONS,
@@ -79,6 +82,8 @@ const OrderPage = () =&gt; {
   const [isSendProduct, setIsSendProduct] = useState<boolean>(false);
   const [isMainOrder, setIsMainOrder] = useState<boolean>(false);
   const [importModalVisible, setImportModalVisible] = useState<boolean>(false);
+  const [procureCheckModalVisible, setProcureCheckModalVisible] =
+    useState<boolean>(false);
   const [confirmReceiptVisible, setConfirmReceiptVisible] =
     useState<boolean>(false);
   const [deliverVisible, setDeliverVisible] = useState<boolean>(false);
@@ -90,7 +95,7 @@ const OrderPage = () =&gt; {
   const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
   const [mainOrderAllItemKeys, setMainOrderAllItemKeys] = useState([]);
   const [rolePath, setRolePath] = useState([]); //当前角色权限（新增跟打印按钮）
-  const userInfo = JSON.parse(localStorage.getItem('userInfo'));
+  const userInfo = getUserInfo();
   // const [tableHeight, setTableHeight] = useState(200);
   const [selectedRows, setSelectedRows] = useState({});
   const [selectedRowObj, setSelectedRowObj] = useState({});
@@ -98,6 +103,7 @@ const OrderPage = () =&gt; {
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
   const [pageSize, setPageSize] = useState(10);
   const [currentPage, setCurrentPage] = useState(1);
+  const [orderCheckType, setOrderCheckType] = useState('');
   const mainTableRef = useRef();
   const [messageApi, contextHolder] = message.useMessage();
@@ -158,11 +164,31 @@ const OrderPage = () =&gt; {
   //   window.addEventListener('resize', resize);
   // });
-  const onCheckboxChange = (itemKey: never) => {
-    const newSelectedItems = selectedItems.includes(itemKey)
-      ? selectedItems.filter((key) => key !== itemKey)
-      : [...selectedItems, itemKey];
-
+  const onCheckboxChange = (record: never) => {
+    let newSelectedItems = [];
+    if (selectedItems.includes(record.id)) {
+      newSelectedItems = selectedItems.filter((key) => key !== record.id);
+      setSelectedRowKeys([]);
+      setSelectedRowObj({
+        ...setSelectedRowObj,
+        [record.id]: [],
+      });
+      selectedRowObj[record.id] = [];
+      setSelectedRows([]);
+    } else {
+      newSelectedItems = [...selectedItems, record.id];
+      //子订单全部自动选中
+      let subIds = record.subOrderInformationLists?.map((item) => {
+        return item.id;
+      });
+      setSelectedRowKeys(subIds);
+      setSelectedRowObj({
+        ...setSelectedRowObj,
+        [record.id]: record.subOrderInformationLists,
+      });
+      selectedRowObj[record.id] = record.subOrderInformationLists;
+      setSelectedRows(record.subOrderInformationLists);
+    }
     setSelectedItems(newSelectedItems);
   };
   const handleTableExpand = (mainOrderIds: any) => {
@@ -306,6 +332,7 @@ const OrderPage = () =&gt; {
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
             <Tag
               color={
+                optRecord.invoicingTime === null ||
                 optRecord.invoicingTime === undefined
                   ? TAGS_COLOR.get(optRecord.invoicingStatus)
                   : 'success'
@@ -360,6 +387,7 @@ const OrderPage = () =&gt; {
                 setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
                 setDeliverVisible(true);
                 setIsSendProduct(true);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
               }}
             >
               发货
@@ -368,7 +396,26 @@ const OrderPage = () =&gt; {
             ''
           )}
-          {optRecord.subPath.includes('queryAnnex') ? (
+          {optRecord.subPath.includes('supplierSendOrder') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={() => {
+                optRecord.mainOrderId = record.id;
+                setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
+                setDeliverVisible(true);
+                setIsSendProduct(true);
+                setOrderCheckType(CHECK_TYPE.SUPPLIER);
+              }}
+            >
+              供应商发货
+            </Button>
+          ) : (
+            ''
+          )}
+
+          {optRecord.subPath.includes('queryAnnex') &&
+          optRecord.listAnnex?.length > 0 ? (
             <Button
               className="p-0"
               type="link"
@@ -409,6 +456,24 @@ const OrderPage = () =&gt; {
                 setOrderPrintVisible(true);
                 setSelectedRows([optRecord]);
                 setOrderRow(record);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
+              }}
+            >
+              打印
+            </Button>
+          ) : (
+            ''
+          )}
+
+          {optRecord.subPath.includes('supplierPrint') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={async () => {
+                setOrderPrintVisible(true);
+                setSelectedRows([optRecord]);
+                setOrderRow(record);
+                setOrderCheckType(CHECK_TYPE.SUPPLIER);
               }}
             >
               打印
@@ -416,6 +481,7 @@ const OrderPage = () =&gt; {
           ) : (
             ''
           )}
+
           {optRecord.subPath.includes('editOrder') ? (
             <Button
               className="p-0"
@@ -441,6 +507,7 @@ const OrderPage = () =&gt; {
                 setIsFinalcialEdit(false);
                 setOrderRow(record);
                 setSelectedRows([optRecord]);
+                setIsMainOrder(false);
               }}
             >
               开票
@@ -456,6 +523,7 @@ const OrderPage = () =&gt; {
                 setOrderRow(optRecord);
                 setCheckVisible(true);
                 setSelectedRows([optRecord]);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
               }}
             >
               审核
@@ -464,6 +532,40 @@ const OrderPage = () =&gt; {
             ''
           )}
+          {optRecord.subPath.includes('financeCheckOrder') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={() => {
+                setOrderRow(optRecord);
+                setCheckVisible(true);
+                setSelectedRows([optRecord]);
+                setOrderCheckType(CHECK_TYPE.FINALCIAL);
+              }}
+            >
+              财务审核
+            </Button>
+          ) : (
+            ''
+          )}
+
+          {optRecord.subPath.includes('procureCheckOrder') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={() => {
+                setOrderRow(optRecord);
+                setSelectedRows([optRecord]);
+                setOrderCheckType(CHECK_TYPE.PROCURE);
+                setProcureCheckModalVisible(true);
+              }}
+            >
+              采购审核
+            </Button>
+          ) : (
+            ''
+          )}
+
           {optRecord.subPath.includes('rePrintOrder') ? (
             <Button
               className="p-0"
@@ -591,7 +693,7 @@ const OrderPage = () =&gt; {
             <Flex>
               <Flex>
                 <Checkbox
-                  onChange={() => onCheckboxChange(record.id)}
+                  onChange={() => onCheckboxChange(record)}
                   checked={selectedItems.includes(record.id)}
                 >
                   <Space split={<Divider type="vertical" />}>
@@ -607,21 +709,32 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">代表：</span>
                     <span className="text-slate-700">{record.salesCode}</span>
                   </div>
-                  <span>
+                  <div
+                    title={record.institution}
+                    className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[150px]"
+                  >
                     <span className="text-[#8C8C8C]">单位：</span>
                     <span className="text-slate-700">{record.institution}</span>
-                  </span>
+                  </div>
                   <span>
                     <span className="text-[#8C8C8C]">联系人：</span>
                     <span className="text-slate-700">
                       {record.institutionContactName + ' '}
-                      <ContainerTwoTone
-                        className="hover:curcor-pointer"
-                        onClick={() => {
-                          setDeliverInfoDrawerVisible(true);
-                          setOrderRow(record);
-                        }}
-                      />
+                    </span>
+                  </span>
+                  <span>
+                    <span className="text-[#8C8C8C]">收货人：</span>
+                    <span className="text-slate-700">
+                      {record.customerName + ' '}
+                      <Tooltip className="order-tooltip" title="详情">
+                        <ContainerTwoTone
+                          className="hover:curcor-pointer"
+                          onClick={() => {
+                            setDeliverInfoDrawerVisible(true);
+                            setOrderRow(record);
+                          }}
+                        />
+                      </Tooltip>
                     </span>
                   </span>
                 </Space>
@@ -636,14 +749,16 @@ const OrderPage = () =&gt; {
                   </span>
                 </div>
               </div>
-              <EditTwoTone
-                className="hover:curcor-pointer"
-                onClick={() => {
-                  setNotesEditVisible(true);
-                  setOrderRow(record);
-                  setIsMainOrder(true);
-                }}
-              />
+              <Tooltip title="编辑">
+                <EditTwoTone
+                  className="hover:curcor-pointer"
+                  onClick={() => {
+                    setNotesEditVisible(true);
+                    setOrderRow(record);
+                    setIsMainOrder(true);
+                  }}
+                />
+              </Tooltip>
             </Flex>
           </Flex>
           <Flex wrap="wrap" gap="middle" vertical>
@@ -656,34 +771,38 @@ const OrderPage = () =&gt; {
                   </span>
                 </div>
                 {rolePath?.includes('addOrder') ? (
-                  <CopyTwoTone
-                    className="hover:cursor-pointer"
-                    onClick={() => {
-                      setOrderOptType('copy');
-                      setOrderDrawerVisible(true);
-                      let copy = cloneDeep(record);
-                      copy.id = undefined;
-                      copy.subOrderInformationLists?.forEach((item) => {
-                        item.id = undefined;
-                      });
-                      setOrderRow(copy);
-                    }}
-                  />
+                  <Tooltip title="复制">
+                    <CopyTwoTone
+                      className="hover:cursor-pointer"
+                      onClick={() => {
+                        setOrderOptType('copy');
+                        setOrderDrawerVisible(true);
+                        let copy = cloneDeep(record);
+                        copy.id = undefined;
+                        copy.subOrderInformationLists?.forEach((item) => {
+                          item.id = undefined;
+                        });
+                        setOrderRow(copy);
+                      }}
+                    />
+                  </Tooltip>
                 ) : (
                   ''
                 )}
-                <ClockCircleTwoTone
-                  className="hover:cursor-pointer"
-                  onClick={() => {
-                    setHistoryModalVisible(true);
-                    if (selectedRowObj[record.id]?.length) {
-                      setSelectedRows(selectedRowObj[record.id]);
-                    } else {
-                      setSelectedRows(record.subOrderInformationLists);
-                    }
-                  }}
-                />
+                <Tooltip title="历史">
+                  <ClockCircleTwoTone
+                    className="hover:cursor-pointer"
+                    onClick={() => {
+                      setHistoryModalVisible(true);
+                      if (selectedRowObj[record.id]?.length) {
+                        setSelectedRows(selectedRowObj[record.id]);
+                      } else {
+                        setSelectedRows(record.subOrderInformationLists);
+                      }
+                    }}
+                  />
+                </Tooltip>
               </Flex>
             </Flex>
             <Flex justify="flex-end">
@@ -700,6 +819,7 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedRowObj[record.id]);
                         setDeliverVisible(true);
                         setIsSendProduct(true);
+                        setOrderCheckType(CHECK_TYPE.NORMAL);
                       }}
                     >
                       发货
@@ -707,6 +827,27 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
+
+                  {/* 供应商发货 */}
+                  {record.mainPath.includes('supplierSendOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        if (!selectedRowObj[record.id]?.length) {
+                          return message.error('请选择选择子订单');
+                        }
+                        setSelectedRows(selectedRowObj[record.id]);
+                        setDeliverVisible(true);
+                        setIsSendProduct(true);
+                        setOrderCheckType(CHECK_TYPE.SUPPLIER);
+                      }}
+                    >
+                      供应商发货
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath.includes('printOrder') ? (
                     <Button
                       className="p-0"
@@ -718,6 +859,27 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedRowObj[record.id]);
                         setOrderRow(record);
                         setOrderPrintVisible(true);
+                        setOrderCheckType(CHECK_TYPE.NORMAL);
+                      }}
+                    >
+                      打印
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
+                  {record.mainPath.includes('supplierPrint') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        if (!selectedRowObj[record.id]?.length) {
+                          return message.error('请选择选择子订单');
+                        }
+                        setSelectedRows(selectedRowObj[record.id]);
+                        setOrderRow(record);
+                        setOrderPrintVisible(true);
+                        setOrderCheckType(CHECK_TYPE.SUPPLIER);
                       }}
                     >
                       打印
@@ -725,6 +887,7 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
+
                   {record.mainPath.includes('rePrintOrder') ? (
                     <Button
                       className="p-0"
@@ -782,10 +945,14 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
+                          setIsMainOrder(true);
                           setSelectedRows(record.subOrderInformationLists);
+                        } else {
+                          setIsMainOrder(false);
                         }
                         setOrderRow(record);
                         setFinancialVisible(true);
+                        setIsFinalcialEdit(false);
                       }}
                     >
                       开票
@@ -845,6 +1012,38 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
                           setSelectedRows(record.subOrderInformationLists);
+                        }
+                        console.log(selectedRows);
+                        for (let i = 0; i < selectedRows.length; i++) {
+                          if (
+                            selectedRows[i].orderStatus !== 'UNAUDITED' &&
+                            selectedRows[i].orderStatus !== 'FINANCE_PROCESS'
+                          ) {
+                            message.error('请选择未审核的子订单进行审核');
+                            return;
+                          }
+                        }
+                        setOrderRow(record);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.NORMAL);
+                      }}
+                    >
+                      审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
+                  {/* 财务审核：主订单暂无 */}
+                  {record.mainPath.includes('financeCheckOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        setSelectedRows(selectedSubOrders);
+                        if (selectedSubOrders === undefined) {
+                          setSelectedRows(record.subOrderInformationLists);
                           console.log(
                             'subOrderInformationLists：' +
                               record.subOrderInformationLists,
@@ -853,19 +1052,52 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedRows.length; i++) {
                           if (
                             selectedRows[i].orderStatus !== 'UNAUDITED' &&
-                            selectedRows[i].orderStatus !== 'AUDIT_FAILED'
+                            selectedRows[i].orderStatus !== 'FINANCE_PROCESS'
                           ) {
-                            message.error(
-                              '请选择未审核或者审核失败的子订单进行审核',
-                            );
+                            message.error('请选择未审核的子订单进行审核');
                             return;
                           }
                         }
                         setOrderRow(record);
                         setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.FINALCIAL);
                       }}
                     >
-                      审核
+                      财务审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
+                  {/* 采购审核 */}
+                  {record.mainPath.includes('procureCheckOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        setSelectedRows(selectedSubOrders);
+                        if (selectedSubOrders === undefined) {
+                          setSelectedRows(record.subOrderInformationLists);
+                          console.log(
+                            'subOrderInformationLists：' +
+                              record.subOrderInformationLists,
+                          );
+                        }
+                        for (let i = 0; i < selectedRows.length; i++) {
+                          if (
+                            selectedRows[i].orderStatus !== 'PROCURE_UN_PROCESS'
+                          ) {
+                            message.error('请选择未审核的子订单进行审核');
+                            return;
+                          }
+                        }
+                        setOrderRow(record);
+                        setProcureCheckModalVisible(true);
+                        setOrderCheckType(CHECK_TYPE.PROCURE);
+                      }}
+                    >
+                      采购审核
                     </Button>
                   ) : (
                     ''
@@ -1153,6 +1385,7 @@ const OrderPage = () =&gt; {
           setCheckVisible={setCheckVisible}
           data={orderRow}
           subOrders={selectedRows}
+          orderCheckType={orderCheckType}
           onClose={() => {
             setCheckVisible(false);
             setOrderRow({});
@@ -1182,6 +1415,7 @@ const OrderPage = () =&gt; {
           setVisible={(b: boolean) => {
             setDeliverVisible(b);
           }}
+          sendType={orderCheckType}
           onClose={() => {
             setDeliverVisible(false);
             setOrderRow({});
@@ -1196,10 +1430,19 @@ const OrderPage = () =&gt; {
           isEdit={isFinalcialEdit}
           mainOrder={orderRow}
           subOrders={selectedRows}
+          isMainOrder={isMainOrder}
+          cancel={() => {
+            setFinancialVisible(false);
+            setOrderRow({});
+            setIsMainOrder(false);
+            setIsFinalcialEdit(false);
+          }}
           onClose={() => {
             setFinancialVisible(false);
             setOrderRow({});
             refreshTable();
+            setIsMainOrder(false);
+            setIsFinalcialEdit(false);
           }}
         />
       )}
@@ -1212,6 +1455,7 @@ const OrderPage = () =&gt; {
           setVisible={(b: boolean) => {
             setOrderPrintVisible(b);
           }}
+          printOptType={orderCheckType}
           onClose={() => {
             setOrderPrintVisible(false);
             setOrderRow({});
@@ -1281,6 +1525,30 @@ const OrderPage = () =&gt; {
         />
       )}
+      {deliverInfoDrawerVisible && (
+        <DeliverInfoDrawer
+          data={orderRow}
+          onClose={() => {
+            setDeliverInfoDrawerVisible(false);
+            setOrderRow({});
+          }}
+        />
+      )}
+
+      {procureCheckModalVisible && (
+        <ProcureCheckModal
+          setCheckVisible={setProcureCheckModalVisible}
+          data={orderRow}
+          subOrders={selectedRows}
+          onClose={() => {
+            setProcureCheckModalVisible(false);
+            setOrderRow({});
+            setSelectedRows({});
+            refreshTable();
+          }}
+        />
+      )}
+
       {contextHolder}
     </PageContainer>
   );
 import { RESPONSE_CODE } from '@/constants/enum';
 import '@/pages/OrderPrint/index.less';
-import { postServiceOrderPrintOrder } from '@/services';
+import {
+  postServiceOrderPrintOrder,
+  postServiceOrderSupplierPrint,
+} from '@/services';
 import { ExclamationCircleFilled } from '@ant-design/icons';
 import { Modal, Select, Space, message } from 'antd';
 import printJS from 'print-js';
 import { useState } from 'react';
+import { CHECK_TYPE } from '../Order/constant';
 import { printerCSS } from './PrinterCSS';
 import DalangPrinter from './components/DalangPrinter';
 import HoujiePrinter from './components/HoujiePrinter';
 import ZhuguangPrinter from './components/ZhuguangPrinter';
-export default ({ mainOrder, subOrders, isRePrint, setVisible, onClose }) => {
+export default ({
+  mainOrder,
+  subOrders,
+  isRePrint,
+  setVisible,
+  printOptType,
+  onClose,
+}) => {
   const [printerType, setPrinterType] = useState('Houjie');
   const { confirm } = Modal;
   const handleChange = (value: string) => {
     setPrinterType(value);
   };
+  /**
+   * 是供应商打印还是普通打印
+   * @param typeString
+   * @returns
+   */
+  function optType(typeString: string) {
+    if (printOptType === typeString) {
+      return true;
+    }
+
+    return false;
+  }
   const showPropsConfirm = () => {
     if (isRePrint) {
       return;
@@ -34,7 +57,19 @@ export default ({ mainOrder, subOrders, isRePrint, setVisible, onClose }) =&gt; {
             return item.id;
           }),
         };
-        const res = await postServiceOrderPrintOrder({ data: body });
+        let res;
+        if (optType(CHECK_TYPE.SUPPLIER)) {
+          res = await postServiceOrderSupplierPrint({
+            data: {
+              ids: subOrders.map((item) => {
+                return item.id;
+              }),
+            },
+          });
+        } else {
+          res = await postServiceOrderPrintOrder({ data: body });
+        }
+
         if (res.result === RESPONSE_CODE.SUCCESS) {
           message.success(res.message);
           onClose();
@@ -8,6 +8,7 @@ export function printerCSS2() {
 export function printerCSS() {
   return `
+    @page { margin: 0; }
     body{
         zoom:1.5
     }
@@ -12,7 +12,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
       <tr height="30" style={{ height: '15.00pt' }}>
         <td height="30" style={{ height: '15.00pt' }}></td>
         <td className="xl72">{i + 1}</td>
-        <td className="xl72">{subOrder.id}</td>
+        <td className="xl72">{mainOrder.id}</td>
         <td className="xl72">{subOrder.productName}</td>
         <td className="xl72">{subOrder.parameters}</td>
         <td className="xl72">{subOrder.unit}</td>
+import { DualAxes } from '@ant-design/charts';
+
+const OrderDualAxes = ({ data, statisticMethod }) => {
+  let yFiledString = '';
+  if (statisticMethod === 'MONTH_STATISTICS') {
+    yFiledString = 'curTime';
+  } else {
+    yFiledString = 'curMonth';
+  }
+  const config = {
+    data: [
+      data.targetAndTotalPaymentDtoList === undefined
+        ? []
+        : data.targetAndTotalPaymentDtoList,
+      data.orderNumberDtoList === undefined ? [] : data.orderNumberDtoList,
+    ],
+    xField: yFiledString,
+    yField: ['curDayTotalPayment', 'curDayTotalOrderNumber'],
+    geometryOptions: [
+      {
+        geometry: 'line',
+        seriesField: 'type',
+        lineStyle: {
+          lineWidth: 3,
+          lineDash: [5, 5],
+        },
+        smooth: true,
+      },
+      {
+        geometry: 'line',
+        seriesField: 'name',
+        point: {},
+      },
+    ],
+  };
+  return <DualAxes {...config} />;
+};
+
+export default OrderDualAxes;
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postServiceOrderUpdateReportFormsTarget } from '@/services';
+import Icon, { EditTwoTone } from '@ant-design/icons';
+import { ModalForm, ProCard, ProFormDigit } from '@ant-design/pro-components';
+import { Flex, Form, message } from 'antd';
+import { useState } from 'react';
+
+export default ({ data, statisticsMethod, reFreshData }) => {
+  const [edit, setEdit] = useState(false);
+  const [form] = Form.useForm<{
+    statisticsMethod: string;
+    target: number;
+    daysOfMonth: number;
+  }>();
+  const [targetValue, setTargetValue] = useState(0);
+
+  const UpBig = () => (
+    <svg width="44" height="auto" fill="#d81e06" viewBox="0 0 1024 1024">
+      <path
+        d="M255.857413 855.291523h-58.175337c-16.996324 0-30.798708-13.802384-30.798707-30.798708V166.084884c0-16.996324 13.802384-30.798708 30.798707-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v658.293862c0 16.996324-13.916453 30.912777-30.798708 30.912777z m-54.867327-34.220787h51.331179V169.506962h-51.331179v651.563774zM442.816977 855.291523h-58.175337c-16.996324 0-30.798708-13.802384-30.798708-30.798708V348.367606c0-16.996324 13.802384-30.798708 30.798708-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v476.01114c0 16.996324-13.802384 30.912777-30.798708 30.912777z m-54.753259-34.220787h51.33118V351.789685h-51.33118v469.281051zM629.890609 855.291523h-58.175337c-16.996324 0-30.798708-13.802384-30.798707-30.798708V525.517211c0-16.996324 13.802384-30.798708 30.798707-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v298.975604c0 16.882255-13.802384 30.798708-30.798708 30.798708z m-54.753258-34.220787h51.33118V528.939289h-51.33118v292.131447zM816.964242 855.291523h-58.175337c-16.996324 0-30.798708-13.802384-30.798708-30.798708V702.552746c0-16.996324 13.802384-30.798708 30.798708-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v121.940069c0 16.882255-13.802384 30.798708-30.798708 30.798708z m-54.753258-34.220787h51.331179V705.974825h-51.331179v115.095911zM830.652557 589.167873c-6.38788 0-12.547622-3.650217-15.513424-9.809958l-71.977721-152.168431-162.206527-45.855854c-6.844157-1.939178-11.863206-7.98485-12.433553-15.057146l-10.950651-133.803275-143.271026-77.567116c-8.327058-4.448702-11.406929-14.829007-6.844158-23.156065 4.448702-8.327058 14.829007-11.406929 23.156066-6.844157l151.484015 82.015818c5.133118 2.737663 8.441127 7.870781 8.897404 13.688314l10.722513 131.179682 158.328172 44.715161c4.79091 1.368831 8.669266 4.676841 10.836583 9.125543l75.28573 159.126657c3.992425 8.555197 0.342208 18.707363-8.09892 22.813857-2.509524 1.026624-5.019049 1.59697-7.414503 1.59697z"
+        fill="#d81e06"
+      ></path>
+      <path d="M456.163083 261.903086c-6.844157 0-13.232037-4.106494-15.855631-10.722513l-42.433775-106.426646c-1.825109-4.676841-1.59697-10.038097 0.798485-14.4868 2.395455-4.448702 6.616019-7.642642 11.635068-8.669266l130.153057-26.692213c9.239612-1.939178 18.251086 4.106494 20.190264 13.346106 1.939178 9.239612-4.106494 18.251086-13.346106 20.190264l-110.076863 22.58572 34.905202 87.377074c3.536148 8.783335-0.798485 18.707363-9.58182 22.243511-2.053247 0.798485-4.220564 1.254762-6.387881 1.254763z" />
+    </svg>
+  );
+
+  const DownBig = () => (
+    <svg width="44" height="auto" fill="#1DB302" viewBox="0 0 1024 1024">
+      <path
+        d="M727.990197 852.667929V194.374067c0-16.996324 13.802384-30.798708 30.798708-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v658.293862c0 16.996324-13.802384 30.798708-30.798708 30.798708h-58.175337c-16.996324 0-30.798708-13.802384-30.798708-30.798708z m85.551966-654.871783h-51.331179v651.449705h51.331179V197.796146zM540.916565 852.667929V376.65679c0-16.996324 13.802384-30.798708 30.798707-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v476.011139c0 16.996324-13.802384 30.798708-30.798708 30.798708h-58.175337c-16.996324 0-30.798708-13.802384-30.798707-30.798708z m85.551966-472.589061h-51.33118v469.166983h51.33118V380.078868zM353.842932 852.667929v-298.861535c0-16.996324 13.802384-30.798708 30.798708-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v298.975604c0 16.996324-13.802384 30.798708-30.798708 30.798708h-58.175337c-16.996324-0.114069-30.798708-13.916453-30.798708-30.912777z m85.551966-295.439456h-51.33118v292.131447h51.33118V557.228473zM166.769299 852.667929V730.72786c0-16.996324 13.802384-30.798708 30.798708-30.798708h58.175337c16.996324 0 30.798708 13.802384 30.798708 30.798708v121.940069c0 16.996324-13.802384 30.798708-30.798708 30.798708h-58.175337c-16.882255 0-30.798708-13.802384-30.798708-30.798708z m85.666036-118.51799h-51.33118v115.095912h51.33118V734.149939zM660.347109 189.012811c-0.684416 6.38788-4.904979 12.091345-11.406929 14.37273l-158.898518 55.437674-62.738108 156.503063c-2.623594 6.616019-9.125543 10.950652-16.311909 10.722513l-134.145483-3.308009-92.282054 134.259552c-5.361257 7.756712-15.9697 9.809959-23.840481 4.448702-7.756712-5.361257-9.809959-15.9697-4.448702-23.840481l97.529241-141.902194c3.308009-4.79091 8.783335-7.528573 14.4868-7.414504l131.521889 3.308009 61.255208-152.738777c1.825109-4.562772 5.589395-8.212989 10.266236-9.809958L637.647321 171.103932c8.897404-3.079871 18.707363 1.59697 21.787234 10.494375 0.912554 2.509524 1.140693 5.019049 0.912554 7.414504z"
+        fill="#1DB302"
+      ></path>
+      <path
+        d="M295.211318 526.771973c-0.684416 6.730088-5.475326 12.77576-12.433553 14.714938l-110.305001 30.912777c-4.904979 1.368831-10.152167 0.456277-14.258661-2.395455-4.220564-2.851732-6.844157-7.414504-7.414504-12.433552l-12.661691-132.206305c-0.912554-9.353682 6.045672-17.794809 15.399354-18.707364 9.353682-0.912554 17.794809 6.045672 18.707363 15.399354l10.722513 111.901972 90.571015-25.437451c9.125543-2.509524 18.593294 2.737663 21.102818 11.863206 0.684416 2.053247 0.798485 4.220564 0.570347 6.38788z"
+        fill="#1DB302"
+      />
+    </svg>
+  );
+
+  const UpSmall = () => (
+    <svg width="14" height="auto" fill="#d81e06" viewBox="0 0 1024 1024">
+      <path d="M511.976976 945.959599c-239.47514 0-433.597349-194.300264-433.597349-433.964716 0-239.677754 194.122209-433.955506 433.597349-433.955506s433.642374 194.277752 433.642374 433.955506C945.61935 751.659335 751.453139 945.959599 511.976976 945.959599zM666.05312 408.869155l-131.822304-132.292002c-2.899026-4.303003-7.091512-7.870248-12.509918-9.766434-2.876514-1.137916-5.952572-1.64957-9.119705-1.582031-0.222057 0-0.401136-0.112564-0.623193-0.112564-0.289596 0-0.535189 0.13303-0.847298 0.156566-3.03308-0.044002-6.021134 0.423649-8.830109 1.515516-5.507434 1.918699-9.787924 5.528923-12.664438 9.945513L357.945857 408.869155c-9.275247 9.29776-8.562003 25.061792 1.560542 35.184337 10.168594 10.146081 25.463951 10.413164 34.739199 1.11438 0.73678-0.735757 1.471514-1.248434 2.073218-2.073218l89.747024-89.456405 0.245593 399.136489c-0.155543 0.936325 0 1.783623 0 2.76395 0 12.352329 10.992355 22.342868 25.352411 22.342868 14.314007 0 25.976628-9.990538 25.976628-22.342868l0.289596-401.923976 89.771583 89.478917c0.599657 0.825808 1.335415 1.337461 2.049682 2.073218 9.29776 9.29776 24.595164 9.030677 34.740222-1.11438C674.615123 433.930947 675.351903 418.166915 666.05312 408.869155z" />{' '}
+    </svg>
+  );
+
+  const DownSmall = () => (
+    <svg width="14" height="auto" fill="#1DB302" viewBox="0 0 1024 1024">
+      <path d="M945.61935 512.005117c0 239.677754-194.166211 433.955506-433.642374 433.955506S78.379627 751.682871 78.379627 512.005117c0-239.664452 194.122209-433.964716 433.597349-433.964716S945.61935 272.340665 945.61935 512.005117zM664.492578 579.947532c-10.145058-10.146081-25.442462-10.413164-34.740222-1.115404-0.714268 0.735757-1.450025 1.248434-2.049682 2.073218l-89.771583 89.478917-0.289596-401.923976c0-12.352329-11.661597-22.342868-25.976628-22.342868-14.360056 0-25.352411 9.990538-25.352411 22.342868 0 0.980327-0.155543 1.827625 0 2.76395l-0.245593 399.136489-89.747024-89.456405c-0.602727-0.825808-1.337461-1.338485-2.073218-2.073218-9.275247-9.29776-24.571628-9.030677-34.739199 1.115404-10.123568 10.122545-10.836813 25.886577-1.560542 35.184337l131.689275 132.135436c2.876514 4.415566 7.157004 8.027837 12.664438 9.945513 2.808976 1.091868 5.79703 1.559519 8.830109 1.515516 0.312108 0.022513 0.557702 0.155543 0.847298 0.155543 0.223081 0 0.402159-0.11154 0.623193-0.11154 3.167133 0.067538 6.244214-0.445138 9.119705-1.583055 5.418406-1.895163 9.610892-5.462408 12.509918-9.765411l131.822304-132.292002C675.351903 605.833085 674.615123 590.069053 664.492578 579.947532z" />{' '}
+    </svg>
+  );
+
+  const CardTitle = ({ title }) => {
+    return <span className="text-sm text-stone-600">{title}</span>;
+  };
+
+  const CardContent = ({
+    unit = '',
+    content = 0,
+    sameMonthPercentageChange = -1000,
+    editable = false,
+  }) => {
+    //如果是可编辑的说明是指标，设置指标值，可用在弹窗中的回显
+    if (editable) {
+      setTargetValue(content);
+    }
+
+    let trendIcon;
+    let trendPercentage;
+    if (sameMonthPercentageChange > 0) {
+      trendIcon = <Icon component={UpBig} />;
+      trendPercentage = (
+        <div style={{ minWidth: '130px' }}>
+          <span className="text-xs text-stone-500">
+            同比上
+            {statisticsMethod === 'MONTH_STATISTICS' ? '个月' : '年'}
+          </span>
+          <Icon component={UpSmall} />
+          <span className="text-[#d81e06]">+{sameMonthPercentageChange}%</span>
+        </div>
+      );
+    }
+
+    if (sameMonthPercentageChange < 0) {
+      trendIcon = <Icon component={DownBig} />;
+      trendPercentage = (
+        <div style={{ minWidth: '130px' }}>
+          <span className="text-xs text-stone-500">
+            同比上
+            {statisticsMethod === 'MONTH_STATISTICS' ? '个月' : '年'}
+          </span>
+          <Icon component={DownSmall} />
+          <span className="text-[#1DB302]">{sameMonthPercentageChange}%</span>
+        </div>
+      );
+    }
+
+    if (sameMonthPercentageChange === -1000) {
+      trendIcon = '';
+      trendPercentage = '';
+    }
+
+    return (
+      <Flex vertical>
+        <Flex>
+          <Flex align="center">
+            <span className="text-base pr-1">{unit}</span>
+            <div style={{ width: 'max-content', display: 'flex' }}>
+              <span className="text-2xl">
+                {content}
+                {editable ? (
+                  <span className="text-xs pl-1">
+                    {statisticsMethod === 'YEAR_STATISTICS' ? '每年' : '每月'}
+                  </span>
+                ) : (
+                  ''
+                )}
+              </span>
+              {editable ? (
+                <EditTwoTone
+                  style={{ fontSize: '20px' }}
+                  onClick={() => {
+                    setEdit(true);
+                  }}
+                />
+              ) : (
+                ''
+              )}
+
+              {/* {editable ? (
+                edit ? (
+                  <InputNumber
+                    placeholder="请输入指标（￥）"
+                    width={200}
+                    value={targetValue}
+                    max={100000000}
+                    onChange={(value) => {
+                      setTargetValue(value);
+                    }}
+                  />
+                ) : (
+                  <span className="text-2xl">
+                    {content}
+                    {editable ? <span className="text-xs px-1">每月</span> : ''}
+                  </span>
+                )
+              ) : (
+                ''
+              )}
+
+              {!editable ? (
+                <span className="text-2xl">
+                  {content}
+                  {editable ? <span className="text-xs pl-1">每月</span> : ''}
+                </span>
+              ) : (
+                ''
+              )} */}
+
+              {/* {editable ? (
+                edit ? (
+                  [
+                    <CheckCircleTwoTone
+                      key="confirm"
+                      style={{ fontSize: '20px', paddingLeft: '5px' }}
+                      onClick={async () => {
+                        let body = {
+                          statisticsMethod: statisticsMethod,
+                          target: targetValue,
+                        };
+                        let res = await postServiceOrderUpdateReportFormsTarget(
+                          { data: body },
+                        );
+                        if (res.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(res.message);
+                          setEdit(false);
+                          reFreshData();
+                        }
+                      }}
+                    />,
+                    <CloseCircleTwoTone
+                      key="cancel"
+                      style={{ fontSize: '20px', paddingLeft: '5px' }}
+                      onClick={async () => {
+                        setEdit(false);
+                      }}
+                    />,
+                  ]
+                ) : (
+                  <EditTwoTone
+                    style={{ fontSize: '20px' }}
+                    onClick={() => {
+                      setEdit(true);
+                    }}
+                  />
+                )
+              ) : (
+                ''
+              )} */}
+            </div>
+          </Flex>
+          {trendIcon}
+        </Flex>
+
+        {trendPercentage}
+      </Flex>
+    );
+  };
+
+  return (
+    <>
+      <ProCard title="" ghost gutter={8}>
+        <ProCard
+          className="order-statictis-card"
+          bordered
+          title={<CardTitle title={'总收入'} />}
+        >
+          <CardContent
+            unit="￥"
+            content={data.totalPayment}
+            sameMonthPercentageChange={data.totalPaymentTrend}
+          />
+        </ProCard>
+        <ProCard
+          className="order-statictis-card"
+          title={<CardTitle title={'指标'} />}
+          bordered
+        >
+          <CardContent unit="￥" content={data.target} editable={true} />
+        </ProCard>
+        <ProCard
+          className="order-statictis-card"
+          title={<CardTitle title={'总订单量'} />}
+          bordered
+        >
+          <CardContent
+            unit="单"
+            content={data.totalOrderNumber}
+            sameMonthPercentageChange={data.totalOrderNumberTrend}
+          />
+        </ProCard>
+        <ProCard
+          className="order-statictis-card"
+          title={<CardTitle title={'总子订单量'} />}
+          bordered
+        >
+          <CardContent unit="单" content={data.subTotalOrderNumber} />
+        </ProCard>
+        <ProCard
+          className="order-statictis-card"
+          title={<CardTitle title={'未审核子订单'} />}
+          bordered
+        >
+          <CardContent unit="单" content={data.unCheckOrderNumber} />
+        </ProCard>
+        <ProCard
+          className="order-statictis-card"
+          title={<CardTitle title={'待发货子订单'} />}
+          bordered
+        >
+          <CardContent unit="单" content={data.unSendOrderNumber} />
+        </ProCard>
+      </ProCard>
+
+      <ModalForm<{
+        statisticsMethod: string;
+        target: number;
+        daysOfMonth: number;
+      }>
+        title="编辑指标"
+        width={500}
+        form={form}
+        open={edit}
+        autoFocusFirstInput
+        modalProps={{
+          destroyOnClose: true,
+          onCancel: () => setEdit(false),
+        }}
+        onFinish={async (values) => {
+          values.statisticsMethod = statisticsMethod;
+          let res = await postServiceOrderUpdateReportFormsTarget({
+            data: values,
+          });
+          if (res.result === RESPONSE_CODE.SUCCESS) {
+            message.success(res.message);
+            setEdit(false);
+            reFreshData();
+          }
+        }}
+      >
+        <ProFormDigit
+          width="md"
+          name="target"
+          label="指标（￥）"
+          min={0}
+          initialValue={targetValue}
+          placeholder="请输入指标"
+          rules={[{ required: true, message: '指标必填' }]}
+        />
+
+        {statisticsMethod === 'MONTH_STATISTICS' ? (
+          <ProFormDigit
+            width="md"
+            name="weekday"
+            label={
+              statisticsMethod === 'YEAR_STATISTICS'
+                ? '每月工作日天数'
+                : '本月工作日天数'
+            }
+            min={0}
+            placeholder="工作日天数"
+            rules={[{ required: true, message: '工作日天数必填' }]}
+          />
+        ) : (
+          ''
+        )}
+      </ModalForm>
+    </>
+  );
+};
+.order-statictis-card .ant-pro-card-body {
+  padding-top: 0;
+}
+
+.order-statictis-card {
+  height: 100%;
+}
+
+//将报表卡片的extra左边内容调到适中位置
+#order-dual-axes-card .ant-pro-card-extra {
+  width: 60%;
+  max-height: 24px;
+}
+
+//报表卡片中tabs作为单选项，去掉多余的margin
+#order-dual-axes-card .ant-tabs-nav {
+  margin: 0;
+}
+import { postServiceOrderQueryReportFormsInformation } from '@/services';
+import { enumToSelect } from '@/utils';
+import { getUserInfo } from '@/utils/user';
+import { EllipsisOutlined } from '@ant-design/icons';
+import {
+  PageContainer,
+  ProCard,
+  ProFormSelect,
+  QueryFilter,
+} from '@ant-design/pro-components';
+import { history } from '@umijs/max';
+import {
+  Avatar,
+  Button,
+  Dropdown,
+  Flex,
+  Form,
+  Space,
+  Spin,
+  Tabs,
+  TabsProps,
+  Tag,
+} from 'antd';
+import { useEffect, useState } from 'react';
+import {
+  PRODUCT_BELONG_DEPARTMENT_OPTIONS,
+  SALES_CODE_OPTIONS,
+} from '../Order/constant';
+import OrderDualAxes from './components/OrderDualAxes';
+import OrderStatisticCard from './components/OrderStatisticCard';
+import './index.less';
+const userInfo = getUserInfo();
+
+const OrderReportPage = () => {
+  const [form] = Form.useForm<{
+    salesCode: '';
+    productBelongBusiness: '';
+    dateRange: '';
+  }>();
+  const [statisticData, setStatisticData] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const [statisticsMethod, setStatisticsMethod] = useState('MONTH_STATISTICS');
+  const onChange = (key: string) => {
+    setStatisticsMethod(key);
+  };
+
+  /**
+   * 加载页面数据
+   */
+  const loadData = async () => {
+    setLoading(true);
+    let body = {
+      statisticsMethod: '',
+      salesCode: form.getFieldValue('salesCode'),
+      productBelongBusiness: form.getFieldValue('productBelongBusiness'),
+      // beginTime:"",
+      // endTime:""
+    };
+
+    // if(form.getFieldValue("dateRange")!==undefined){
+    //   body.beginTime=formatDate(form.getFieldValue("dateRange")[0]),
+    //   body.endTime=formatDate(form.getFieldValue("dateRange")[1])
+    // }
+    body.statisticsMethod = statisticsMethod;
+    const { data } = await postServiceOrderQueryReportFormsInformation({
+      data: body,
+    });
+    if (data !== undefined) {
+      setStatisticData(data);
+    }
+
+    setLoading(false);
+  };
+
+  useEffect(() => {
+    loadData();
+  }, [statisticsMethod]);
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  const items: TabsProps['items'] = [
+    {
+      key: 'MONTH_STATISTICS',
+      label: '本月统计',
+      children: '',
+    },
+    {
+      key: 'YEAR_STATISTICS',
+      label: '本年统计',
+      children: '',
+    },
+  ];
+  return (
+    <PageContainer
+      header={{
+        title: '订单汇总',
+        extra: [
+          <Avatar key="0" style={{ verticalAlign: 'middle' }} size="large">
+            {userInfo?.username}
+          </Avatar>,
+          <Tag key="nickName">{userInfo?.nickName}</Tag>,
+          <Dropdown
+            key="dropdown"
+            trigger={['click']}
+            menu={{
+              items: [
+                {
+                  label: '退出登录',
+                  key: '1',
+                  onClick: () => {
+                    localStorage.removeItem('token');
+                    history.push('/login');
+                  },
+                },
+                // {
+                //   label: '修改密码',
+                //   key: '2',
+                // },
+              ],
+            }}
+          >
+            <Button key="4" style={{ padding: '0 8px' }}>
+              <EllipsisOutlined />
+            </Button>
+          </Dropdown>,
+        ],
+      }}
+    >
+      <Space direction="vertical" size="middle" className="flex">
+        <Spin spinning={loading}>
+          <OrderStatisticCard
+            data={statisticData}
+            statisticsMethod={statisticsMethod}
+            reFreshData={loadData}
+          />
+        </Spin>
+
+        <ProCard tooltip="这是提示" bordered>
+          <QueryFilter
+            split
+            className="!p-0 order-statistic-search"
+            labelWidth="auto"
+            form={form}
+            onFinish={async () => {
+              loadData();
+              return true;
+            }}
+          >
+            <ProFormSelect
+              name="salesCode"
+              key="salesCode"
+              showSearch
+              label="销售代表"
+              placeholder="请输入销售代表"
+              options={SALES_CODE_OPTIONS}
+            />
+            <ProFormSelect
+              key="productBelongBusiness"
+              placeholder="请输入所属事业部"
+              name="productBelongBusiness"
+              label="所属事业部"
+              options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
+            />
+            {/* <ProFormDateRangePicker
+              key="dateRange"
+              name="dateRange"
+              label="时间"
+            /> */}
+          </QueryFilter>
+        </ProCard>
+
+        <ProCard
+          id="order-dual-axes-card"
+          title="统计图表"
+          extra={
+            <Flex>
+              <Tabs defaultActiveKey="1" items={items} onChange={onChange} />
+            </Flex>
+          }
+          bordered
+        >
+          <Spin spinning={loading}>
+            <OrderDualAxes
+              data={statisticData}
+              statisticMethod={statisticsMethod}
+            />
+          </Spin>
+        </ProCard>
+      </Space>
+    </PageContainer>
+  );
+};
+
+export default OrderReportPage;
@@ -691,6 +691,19 @@ export interface OrderUpdateVO {
   trackStageInfo?: OrderTrackStageVO;
 }
+export interface ProcureCheckOrderDto {
+  /**
+   * @description
+   *   子订单集合
+   */
+  ids?: Array<number>;
+  /**
+   * @description
+   *   采购人姓名
+   */
+  supplier?: string;
+}
+
 export interface ProductInformationDto {
   /**
    * @description
@@ -730,6 +743,24 @@ export interface QueryMainOrderDto {
   customerName?: string;
 }
+export interface QueryReportFormsDto {
+  /**
+   * @description
+   *   所属部门
+   */
+  productBelongBusiness?: string;
+  /**
+   * @description
+   *   销售代表
+   */
+  salesCode?: string;
+  /**
+   * @description
+   *   统计方式
+   */
+  statisticsMethod?: string;
+}
+
 export interface ResetPwdVO {
   /** @format int64 */
   userId?: number;
@@ -54,6 +54,8 @@ declare namespace API {
     /** email */
     email?: string;
     gender?: UserGenderEnum;
+    /**role */
+    roleSmallVO: { code: string; id: string; name: string };
   }
   interface UserInfoVO {
@@ -35,10 +35,12 @@ import type {
   OrderProfitAnalysisVo,
   OrderUnlockFieldApplyVO,
   OrderUpdateVO,
+  ProcureCheckOrderDto,
   ProductInformationDto,
   QueryAnnexDto,
   QueryHistoryRecordDto,
   QueryMainOrderDto,
+  QueryReportFormsDto,
   ResetPwdVO,
   ServerResult,
   SysLogQueryVO,
@@ -5336,6 +5338,77 @@ export const postServiceOrderFileProcess = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderFinanceCheckOrder */
+export interface PostServiceOrderFinanceCheckOrderOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderFinanceCheckOrder */
+export interface PostServiceOrderFinanceCheckOrderResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderFinanceCheckOrderResponseSuccess =
+  PostServiceOrderFinanceCheckOrderResponse[200];
+/**
+ * @description
+ *   财务审核订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderFinanceCheckOrder = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/financeCheckOrder';
+  function request(
+    option: PostServiceOrderFinanceCheckOrderOption,
+  ): Promise<PostServiceOrderFinanceCheckOrderResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderFinanceCheckOrderResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderImportExcel */
 export interface PostServiceOrderImportExcelOption {
   /**
@@ -5620,6 +5693,77 @@ export const postServiceOrderPrintOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderProcureCheckOrder */
+export interface PostServiceOrderProcureCheckOrderOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProcureCheckOrderDto;
+  };
+}
+
+/** @description response type for postServiceOrderProcureCheckOrder */
+export interface PostServiceOrderProcureCheckOrderResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderProcureCheckOrderResponseSuccess =
+  PostServiceOrderProcureCheckOrderResponse[200];
+/**
+ * @description
+ *   采购审核订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderProcureCheckOrder = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/procureCheckOrder';
+  function request(
+    option: PostServiceOrderProcureCheckOrderOption,
+  ): Promise<PostServiceOrderProcureCheckOrderResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderProcureCheckOrderResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for getServiceOrderProvideInvoicingStatus */
 export interface GetServiceOrderProvideInvoicingStatusResponse {
   /**
@@ -6219,6 +6363,78 @@ export const postServiceOrderQueryProductInformation = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderQueryReportFormsInformation */
+export interface PostServiceOrderQueryReportFormsInformationOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryReportFormsDto;
+  };
+}
+
+/** @description response type for postServiceOrderQueryReportFormsInformation */
+export interface PostServiceOrderQueryReportFormsInformationResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderQueryReportFormsInformationResponseSuccess =
+  PostServiceOrderQueryReportFormsInformationResponse[200];
+/**
+ * @description
+ *   查询报表
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderQueryReportFormsInformation =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/queryReportFormsInformation';
+    function request(
+      option: PostServiceOrderQueryReportFormsInformationOption,
+    ): Promise<PostServiceOrderQueryReportFormsInformationResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostServiceOrderQueryReportFormsInformationResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postServiceOrderQueryServiceOrder */
 export interface PostServiceOrderQueryServiceOrderOption {
   /**
@@ -6290,6 +6506,60 @@ export const postServiceOrderQueryServiceOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description response type for postServiceOrderQuerySupplier */
+export interface PostServiceOrderQuerySupplierResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderQuerySupplierResponseSuccess =
+  PostServiceOrderQuerySupplierResponse[200];
+/**
+ * @description
+ *   提供供应商名单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderQuerySupplier = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/querySupplier';
+  function request(): Promise<PostServiceOrderQuerySupplierResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceOrderQuerySupplierResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderSendProduct */
 export interface PostServiceOrderSendProductOption {
   /**
@@ -6361,6 +6631,148 @@ export const postServiceOrderSendProduct = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderSupplierPrint */
+export interface PostServiceOrderSupplierPrintOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderSupplierPrint */
+export interface PostServiceOrderSupplierPrintResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderSupplierPrintResponseSuccess =
+  PostServiceOrderSupplierPrintResponse[200];
+/**
+ * @description
+ *   供应商打印
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderSupplierPrint = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/supplierPrint';
+  function request(
+    option: PostServiceOrderSupplierPrintOption,
+  ): Promise<PostServiceOrderSupplierPrintResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderSupplierPrintResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postServiceOrderSupplierSendOrder */
+export interface PostServiceOrderSupplierSendOrderOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderSupplierSendOrder */
+export interface PostServiceOrderSupplierSendOrderResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderSupplierSendOrderResponseSuccess =
+  PostServiceOrderSupplierSendOrderResponse[200];
+/**
+ * @description
+ *   供应商发货
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderSupplierSendOrder = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/supplierSendOrder';
+  function request(
+    option: PostServiceOrderSupplierSendOrderOption,
+  ): Promise<PostServiceOrderSupplierSendOrderResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderSupplierSendOrderResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderUpdateAnnex */
 export interface PostServiceOrderUpdateAnnexOption {
   /**
@@ -6503,6 +6915,77 @@ export const postServiceOrderUpdateOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderUpdateReportFormsTarget */
+export interface PostServiceOrderUpdateReportFormsTargetOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderUpdateReportFormsTarget */
+export interface PostServiceOrderUpdateReportFormsTargetResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderUpdateReportFormsTargetResponseSuccess =
+  PostServiceOrderUpdateReportFormsTargetResponse[200];
+/**
+ * @description
+ *   修改指标
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderUpdateReportFormsTarget = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/updateReportFormsTarget';
+  function request(
+    option: PostServiceOrderUpdateReportFormsTargetOption,
+  ): Promise<PostServiceOrderUpdateReportFormsTargetResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderUpdateReportFormsTargetResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderViewImages */
 export interface PostServiceOrderViewImagesOption {
   /**
@@ -55,11 +55,23 @@ function formatDateTime(inputDateTime: string) {
   return formattedDateTime;
 }
+function formatdate(inputDateTime: string) {
+  const parsedDateTime = new Date(inputDateTime);
+
+  const year = parsedDateTime.getFullYear();
+  const month = String(parsedDateTime.getMonth() + 1).padStart(2, '0');
+  const day = String(parsedDateTime.getDate()).padStart(2, '0');
+
+  const formattedDate = `${year}-${month}-${day}`;
+  return formattedDate;
+}
+
 function formatSalesCode(salesCode: any) {
+  console.log('in');
   let newSalesCode = salesCode;
   if (newSalesCode.indexOf('_')) {
     newSalesCode = newSalesCode.split('_');
-    if (salesCode?.length === 2) {
+    if (newSalesCode?.length === 2) {
       newSalesCode = newSalesCode[1] + '（' + newSalesCode[0] + '）';
     }
   }
@@ -143,6 +155,7 @@ export {
   enumValueToLabel,
   formatDateTime,
   formatSalesCode,
+  formatdate,
   getAliYunOSSFileNameFromUrl,
   getUserInfo,
 };
+/**
+ *
+ * @returns 获取本地用户信息
+ */
+export const getUserInfo = () => {
+  let localUserInfo = localStorage.getItem('userInfo');
+
+  if (localUserInfo === null || localUserInfo === undefined) {
+    localUserInfo = '{}';
+  }
+  const userInfo = JSON.parse(localUserInfo);
+
+  return userInfo;
+};