feat: update

zhongnanhuang
1 parent 317053aa
Showing 10 changed files with 789 additions and 69 deletions
src/access.ts
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/OrderPrint/OrderPrintModal.tsx
src/pages/OrderReport/components/OrderStatisticCard.tsx
src/services/definition.ts
src/services/request.ts
src/utils/user.ts
@@ -3,8 +3,8 @@ export default (initialState: API.UserInfo) =&gt; {
   // 参考文档 https://umijs.org/docs/max/access
   const { roleSmallVO } = initialState;
-  console.log(roleSmallVO.code === 'admin');
+  console.log(roleSmallVO?.code === 'admin');
   return {
-    canReadAdmin: roleSmallVO.code === 'admin',
+    canReadAdmin: roleSmallVO?.code === 'admin',
   };
 };
 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]);
@@ -136,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();
@@ -9,11 +9,12 @@ export const PAYMENT_CHANNEL_OPTIONS = {
 };
 export const PAYMENT_METHOD_OPTIONS = {
-  PAYMENT_IN_ADVANCE: '预付',
-  CASH_ON_DELIVERY: '货到付款',
   UNPAID: '未付款',
-  PLATFORM_SETTLEMENT: '平台结算',
+  TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
+  PAYMENT_IN_ADVANCE: '预付款',
   WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
+  PLATFORM_SETTLEMENT: '平台结算',
+  CASH_ON_DELIVERY: '货到付款',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -45,6 +46,18 @@ export const INVOCING_STATUS = {
 };
 /**
+ * 普通审核
+ * 财务审核
+ * 采购审核
+ */
+export const CHECK_TYPE = {
+  NORMAL: 'NORMAL',
+  FINALCIAL: 'FINALCIAL',
+  PROCURE: 'PROCURE',
+  SUPPLIER: 'SUPPLIER',
+};
+
+/**
  * 是否需要开票
  * @param subOrder
  */
@@ -80,15 +93,21 @@ 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 = {
@@ -107,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 = [
@@ -168,6 +192,10 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['EDIT_ORDER', '财务编辑'],
   ['MODIFY_SEN_INFORMATION', '发货信息编辑'],
   ['UN_INVOICING', '财务取消开票'],
+  ['FINANCE_CHECK_ORDER', '财务审核'],
+  ['PROCURE_CHECK_ORDER', '采购审核'],
+  ['SUPPLIER_PRINT', '供应商打印'],
+  ['EXTERNAL_PROCUREMENT', '仓库操作外部采购子订单'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -47,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,
@@ -80,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);
@@ -99,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();
@@ -382,6 +387,7 @@ const OrderPage = () =&gt; {
                 setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
                 setDeliverVisible(true);
                 setIsSendProduct(true);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
               }}
             >
               发货
@@ -390,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"
@@ -431,6 +456,7 @@ const OrderPage = () =&gt; {
                 setOrderPrintVisible(true);
                 setSelectedRows([optRecord]);
                 setOrderRow(record);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
               }}
             >
               打印
@@ -438,6 +464,24 @@ const OrderPage = () =&gt; {
           ) : (
             ''
           )}
+
+          {optRecord.subPath.includes('supplierPrint') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={async () => {
+                setOrderPrintVisible(true);
+                setSelectedRows([optRecord]);
+                setOrderRow(record);
+                setOrderCheckType(CHECK_TYPE.SUPPLIER);
+              }}
+            >
+              打印
+            </Button>
+          ) : (
+            ''
+          )}
+
           {optRecord.subPath.includes('editOrder') ? (
             <Button
               className="p-0"
@@ -479,6 +523,7 @@ const OrderPage = () =&gt; {
                 setOrderRow(optRecord);
                 setCheckVisible(true);
                 setSelectedRows([optRecord]);
+                setOrderCheckType(CHECK_TYPE.NORMAL);
               }}
             >
               审核
@@ -487,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"
@@ -740,6 +819,7 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedRowObj[record.id]);
                         setDeliverVisible(true);
                         setIsSendProduct(true);
+                        setOrderCheckType(CHECK_TYPE.NORMAL);
                       }}
                     >
                       发货
@@ -747,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"
@@ -758,6 +859,7 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedRowObj[record.id]);
                         setOrderRow(record);
                         setOrderPrintVisible(true);
+                        setOrderCheckType(CHECK_TYPE.NORMAL);
                       }}
                     >
                       打印
@@ -765,6 +867,27 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
+
+                  {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);
+                      }}
+                    >
+                      打印
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {record.mainPath.includes('rePrintOrder') ? (
                     <Button
                       className="p-0"
@@ -889,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,
@@ -897,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>
                   ) : (
                     ''
@@ -1197,6 +1385,7 @@ const OrderPage = () =&gt; {
           setCheckVisible={setCheckVisible}
           data={orderRow}
           subOrders={selectedRows}
+          orderCheckType={orderCheckType}
           onClose={() => {
             setCheckVisible(false);
             setOrderRow({});
@@ -1226,6 +1415,7 @@ const OrderPage = () =&gt; {
           setVisible={(b: boolean) => {
             setDeliverVisible(b);
           }}
+          sendType={orderCheckType}
           onClose={() => {
             setDeliverVisible(false);
             setOrderRow({});
@@ -1265,6 +1455,7 @@ const OrderPage = () =&gt; {
           setVisible={(b: boolean) => {
             setOrderPrintVisible(b);
           }}
+          printOptType={orderCheckType}
           onClose={() => {
             setOrderPrintVisible(false);
             setOrderRow({});
@@ -1334,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();
@@ -247,14 +247,14 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
         </ProCard>
         <ProCard
           className="order-statictis-card"
-          title={<CardTitle title={'未审核订单'} />}
+          title={<CardTitle title={'未审核子订单'} />}
           bordered
         >
           <CardContent unit="单" content={data.unCheckOrderNumber} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
-          title={<CardTitle title={'未发货订单'} />}
+          title={<CardTitle title={'待发货子订单'} />}
           bordered
         >
           <CardContent unit="单" content={data.unSendOrderNumber} />
@@ -691,6 +691,19 @@ export interface OrderUpdateVO {
   trackStageInfo?: OrderTrackStageVO;
 }
+export interface ProcureCheckOrderDto {
+  /**
+   * @description
+   *   子订单集合
+   */
+  ids?: Array<number>;
+  /**
+   * @description
+   *   采购人姓名
+   */
+  supplier?: string;
+}
+
 export interface ProductInformationDto {
   /**
    * @description
@@ -26,6 +26,7 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -34,6 +35,7 @@ import type {
   OrderProfitAnalysisVo,
   OrderUnlockFieldApplyVO,
   OrderUpdateVO,
+  ProcureCheckOrderDto,
   ProductInformationDto,
   QueryAnnexDto,
   QueryHistoryRecordDto,
@@ -221,9 +223,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -244,9 +244,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -270,9 +270,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -298,9 +296,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -325,9 +323,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -353,9 +349,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -380,9 +376,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -403,9 +397,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -429,9 +423,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -452,9 +444,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -479,9 +471,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -502,9 +492,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -529,9 +519,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -552,9 +540,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -5350,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 {
   /**
@@ -5634,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 {
   /**
@@ -6376,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 {
   /**
@@ -6447,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 {
   /**
@@ -6,7 +6,7 @@ export const getUserInfo = () =&gt; {
   let localUserInfo = localStorage.getItem('userInfo');
   if (localUserInfo === null || localUserInfo === undefined) {
-    localUserInfo = '';
+    localUserInfo = '{}';
   }
   const userInfo = JSON.parse(localUserInfo);