feat: update

zhongnanhuang
1 parent f7393b09
Showing 11 changed files with 402 additions and 139 deletions
src/components/ButtomConfirm/index.tsx
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/MessageListDrawer.tsx
src/pages/Order/components/ModifiedDiffModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/OrderReport/index.tsx
src/services/definition.ts
src/services/request.ts
 import { Button, Popconfirm } from 'antd';
+import { TooltipPlacement } from 'antd/lib/tooltip';
  
 const ButtonConfirm = ({
   title,
@@ -6,16 +7,18 @@ const ButtonConfirm = ({
   text,
   className,
   onConfirm,
+  placement,
 }: {
   title: string;
   text: string;
   description?: string;
   className?: string;
   onConfirm?: () => void;
+  placement?: TooltipPlacement;
 }) => {
   return (
     <Popconfirm
-      placement="topLeft"
+      placement={placement ? placement : 'topLeft'}
       title={title}
       description={description}
       onConfirm={onConfirm}
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderApplyInvoicing } from '@/services';
-import { FloatAdd, enumToSelect, getAliYunOSSFileNameFromUrl } from '@/utils';
+import { enumToSelect, getAliYunOSSFileNameFromUrl } from '@/utils';
 import {
   ModalForm,
   ProFormDatePicker,
@@ -16,13 +16,13 @@ export default ({
   isEdit,
   subOrders,
   isMainOrder,
+  totalPayment,
   onClose,
 }) => {
   const [isUrgent, setIsUrgent] = useState('');
-  let sumPrice = 0;
+  let sumPrice = totalPayment;
  
   let ids = subOrders?.map((item) => {
-    sumPrice = FloatAdd(item.subOrderPayment, sumPrice);
     return item.id;
   });
  
@@ -180,6 +180,14 @@ export default ({
         hidden={isUrgent !== 'true'}
       />
  
+      <ProFormTextArea
+        key="invoicingUrgentCause"
+        label="加急开票原因"
+        name="invoicingUrgentCause"
+        rules={[{ required: isUrgent === 'true', message: '加急开票原因' }]}
+        hidden={isUrgent !== 'true'}
+      />
+
       <ProFormUploadDragger
         key="2"
         label={
@@ -402,6 +402,9 @@ export default ({
                   if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
                     type = 'modify_leader_audit';
                   }
+                  if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING)) {
+                    type = 'urgent_invoice_audit';
+                  }
                   doCheck({
                     pass: false,
                     subOrderIds: subOrderIds,
@@ -493,6 +496,9 @@ export default ({
           if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
             type = 'modify_leader_audit';
           }
+          if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING)) {
+            type = 'urgent_invoice_audit';
+          }
           doCheck({
             pass: true,
             subOrderIds: subOrderIds,
@@ -15,6 +15,7 @@ import {
 import {
   Button,
   Col,
+  Flex,
   Input,
   InputNumber,
   Modal,
@@ -66,16 +67,19 @@ const DeliverModal = ({
     {
       title: 'ID',
       dataIndex: 'id',
+      width: 120,
       render: (_, record) => <Input value={record.id} disabled />,
     },
     {
       title: '商品编号',
       dataIndex: 'productCode',
+      width: 120,
       render: (_, record) => <Input value={record.productCode} disabled />,
     },
     {
       title: '商品名称',
       dataIndex: 'productName',
+      width: 120,
       render: (_, record) => <Input value={record.productName} disabled />,
     },
     {
@@ -149,7 +153,7 @@ const DeliverModal = ({
   return (
     <Modal
       open
-      width={900}
+      width={1000}
       title={isSendProduct ? '发货' : '修改发货信息'}
       onOk={async () => {
         //请求体封装
@@ -202,7 +206,13 @@ const DeliverModal = ({
         setVisible(false);
       }}
     >
-      <strong>将物流方式和物流单号更新到下方所有订单</strong>
+      <Flex vertical>
+        <strong>将物流方式和物流单号更新到下方所有订单</strong>
+        <span className="text-[red] py-1">
+          选择【其他物流方式】时，需要将对应的物流方式填写在备注中。例如：如果发圆通快递，系统上没有这个选项，就需要选【其他物流方式】，然后把“圆通快递”填在备注上。
+        </span>
+      </Flex>
+
       <ProForm
         layout="inline"
         submitter={false}
+import ButtonConfirm from '@/components/ButtomConfirm';
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postOrderErpMessageQueryMyMessage,
   postOrderErpMessageRead,
+  postOrderErpMessageReadAll,
 } from '@/services';
 import { formatDateTime, getUserInfo } from '@/utils';
 import { UserOutlined } from '@ant-design/icons';
@@ -25,7 +27,7 @@ export default ({ setVisible }) =&gt; {
   const [loading, setLoading] = useState(false);
   const [initLoading, setInitLoading] = useState(true);
   const [onlyUnread, setOnlyUnread] = useState(false);
-  const [unreadNumList, setUnreadNumList] = useState<any[]>([]); //消息未读标识
+  const [readFlagList, setReadFlagList] = useState<any[]>([]); //消息未读标识
  
   /**
    * 获取消息列表
@@ -36,7 +38,7 @@ export default ({ setVisible }) =&gt; {
       data: {
         username: userInfo.username,
         current: current,
-        isReaded: onlyUnread,
+        isReaded: onlyUnread ? onlyUnread : null,
       },
     }).finally(() => {
       setLoading(false);
@@ -44,9 +46,10 @@ export default ({ setVisible }) =&gt; {
     if (res && res.result === RESPONSE_CODE.SUCCESS) {
       setMessageListData([...messageListData, ...res?.data?.data]);
       let reqReadNumList = res?.data?.data?.map((item: any) => {
-        return item.unreadNum;
+        return item.isReaded;
       });
-      setUnreadNumList([...unreadNumList, ...reqReadNumList]);
+
+      setReadFlagList([...readFlagList, ...reqReadNumList]);
       setTotal(res?.data?.total);
     }
   }
@@ -65,7 +68,7 @@ export default ({ setVisible }) =&gt; {
     setOnlyUnread(!onlyUnread);
     setCurrent(1);
     setMessageListData([]);
-    setUnreadNumList([]);
+    setReadFlagList([]);
   }
  
   /**
@@ -84,6 +87,18 @@ export default ({ setVisible }) =&gt; {
     return false;
   }
  
+  /**
+   * 全部标记为已读
+   */
+  async function readAll() {
+    let res = await postOrderErpMessageReadAll();
+    if (res && res.result === RESPONSE_CODE.SUCCESS) {
+      message.success(res.message);
+      let newReadFlagList = readFlagList.map(() => true);
+      setReadFlagList(newReadFlagList);
+    }
+  }
+
   const loadMore =
     !initLoading && !loading && messageListData.length < total ? (
       <div
@@ -102,7 +117,7 @@ export default ({ setVisible }) =&gt; {
           加载更多
         </Button>
       </div>
-    ) : messageListData.length >= total ? (
+    ) : messageListData.length > 0 && messageListData.length >= total ? (
       <span>没有更多消息了</span>
     ) : null;
  
@@ -130,9 +145,13 @@ export default ({ setVisible }) =&gt; {
             </Checkbox>
           </div>
  
-          <Button className="p-0" type="link">
-            全部标为已读
-          </Button>
+          <ButtonConfirm
+            title={'是否全部标记为已读？'}
+            text={'全部标记为已读'}
+            className="p-0"
+            onConfirm={readAll}
+            placement="bottomLeft"
+          />
         </Flex>
  
         <List
@@ -145,7 +164,7 @@ export default ({ setVisible }) =&gt; {
             <List.Item key={item.id}>
               <List.Item.Meta
                 avatar={
-                  <Badge dot={unreadNumList[index] > 0}>
+                  <Badge dot={!readFlagList[index]}>
                     <Avatar shape="square" icon={<UserOutlined />} />
                   </Badge>
                 }
@@ -156,11 +175,11 @@ export default ({ setVisible }) =&gt; {
                 onClick={async () => {
                   toOrderList(item.mainOrderId);
  
-                  let readSuccess = await read([item.id]);
+                  let readSuccess = await read([item.mesUsrRelId]);
                   if (readSuccess) {
-                    let newUnreadNumList = [...unreadNumList];
-                    newUnreadNumList[index] = 0;
-                    setUnreadNumList([...newUnreadNumList]);
+                    let newUnreadNumList = [...readFlagList];
+                    newUnreadNumList[index] = true;
+                    setReadFlagList([...newUnreadNumList]);
                   }
                 }}
               >
 import { postServiceOrderModifiedDiff } from '@/services';
-import { enumValueToLabel, getAliYunOSSFileNameFromUrl } from '@/utils';
+import {
+  enumValueToLabel,
+  getAliYunOSSFileNameFromUrl,
+  getUserInfo,
+} from '@/utils';
 import { getReceivingCompanyOptions } from '@/utils/order';
 import { Button, Divider, Modal, Space, Table, TableProps } from 'antd';
 import Base64 from 'base-64';
@@ -12,6 +16,7 @@ import {
 import '../table.less';
  
 export default ({ setVisible, subOrders, mainOrder, onClose }) => {
+  const userInfo = getUserInfo();
   let subIds = subOrders?.map((item: any) => {
     return item.id;
   });
@@ -21,6 +26,31 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
   const [subOrderDiffs, setSubOrderDiffs] = useState([]);
   const [mainOrderDiffs, setMainOrderDiffs] = useState([]);
  
+  function isSupplierUnvisibleField(field: any) {
+    //主订单字段
+    let unvisibleFields = [
+      'receivingCompany',
+      'invoiceIdentificationNumber',
+      'bankAccountNumber',
+      'bank',
+      'totalPayment',
+      'institution',
+      'institutionContactName',
+    ];
+    //子订单字段
+    unvisibleFields.push(
+      ...[
+        'listAnnex',
+        'shippingWarehouse',
+        'productBelongBusiness',
+        'subOrderPayment',
+        'productPrice',
+      ],
+    );
+
+    return userInfo?.username === '首能' && unvisibleFields.includes(field);
+  }
+
   async function loadData() {
     let res = await postServiceOrderModifiedDiff({
       data: {
@@ -28,8 +58,11 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         mainOrderId: mainId,
       },
     });
-    setSubOrderDiffs(res?.data?.subOrderDiffs);
-    setMainOrderDiffs(res?.data?.mainOrderDiffs);
+    let subOrderDiffs = res?.data?.subOrderDiffs;
+    let mainOrderDiffs = res?.data?.mainOrderDiffs;
+
+    setSubOrderDiffs(subOrderDiffs);
+    setMainOrderDiffs(mainOrderDiffs);
   }
  
   useEffect(() => {
@@ -158,12 +191,15 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
     for (let field of visibleFields) {
       let filedKey = field[0];
       let filedName = field[1];
-      tableData.push({
-        fieldName: filedName,
-        oldValue: oldDatas[filedKey],
-        newValue: curDatas[filedKey],
-        isDiff: diffFiledNames?.includes(filedKey),
-      });
+
+      if (!isSupplierUnvisibleField(filedKey)) {
+        tableData.push({
+          fieldName: filedName,
+          oldValue: oldDatas[filedKey],
+          newValue: curDatas[filedKey],
+          isDiff: diffFiledNames?.includes(filedKey),
+        });
+      }
     }
     return (
       <>
@@ -207,12 +243,15 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
     for (let field of visibleFields) {
       let filedKey = field[0];
       let filedName = field[1];
-      tableData.push({
-        fieldName: filedName,
-        oldValue: oldDatas[filedKey],
-        newValue: curDatas[filedKey],
-        isDiff: diffFiledNames?.includes(filedKey),
-      });
+
+      if (!isSupplierUnvisibleField(filedKey)) {
+        tableData.push({
+          fieldName: filedName,
+          oldValue: oldDatas[filedKey],
+          newValue: curDatas[filedKey],
+          isDiff: diffFiledNames?.includes(filedKey),
+        });
+      }
     }
     return (
       <Table
 import { postServiceOrderQueryCustomerInformation } from '@/services';
-import { enumToProTableEnumValue } from '@/utils';
+import { enumToProTableEnumValue, getUserInfo } from '@/utils';
 import { getReceivingCompanyOptions } from '@/utils/order';
 export const COMFIR_RECEIPT_IMAGES_NUMBER = 3;
  
@@ -99,6 +99,7 @@ export const CHECK_TYPE = {
   WAITING_FOR_POST_AUDIT: 'WAITING_FOR_POST_AUDIT',
   NODE_OPERATING_AUDIT: 'NODE_OPERATING_AUDIT',
   MODIFY_LEADER_AUDIT: 'MODIFY_LEADER_AUDIT',
+  URGENT_INVOICE_AUDITING: 'URGENT_INVOICE_AUDITING',
 };
  
 /**
@@ -157,7 +158,8 @@ export const ORDER_STATUS_OPTIONS = {
   PROCURE_UN_PROCESS: '采购待审核',
   PROCURE_PROCESS: '采购已审核',
   PROCURE_PROCESS_FOR_MINE: '采购待打印',
-  PROCURE_WAIT_SHIP: '采购待发货',
+  PROCURE_WAIT_SHIP:
+    getUserInfo()?.username === '首能' ? '待发货' : '采购待发货',
   SUPPLIER_WAIT_SHIP: '供应商待发货',
   WAIT_SHIP: '待发货',
   SHIPPED: '已发货',
@@ -202,6 +204,7 @@ export const FINANCIAL_STATUS_OPTIONS = {
 export const AFTER_INVOICING_STATUS = {
   NOT_YET_INVOICED: '尚未开票',
   APPLY_FOR_INVOICING: '申请开票',
+  URGENT_INVOICE_AUDITING: '加急待审核',
   PARTIAL_INVOICING: '部分开票',
   COMPLETE_INVOICING: '完全开票',
 };
@@ -239,7 +242,10 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['AFTER_SALES_FAILURE', 'red'],
   ['WAITING_FOR_POST_AUDIT', 'purple'],
   ['POST_AUDITED', 'success'],
-  ['POST_AUDIT_FAIL', 'error'],
+  ['COMPLETE_INVOICING', 'success'],
+  ['PARTIAL_INVOICING', 'processing'],
+  ['URGENT_INVOICE_AUDITING', 'warning'],
+  ['APPLY_FOR_INVOICING', 'processing'],
 ]);
 export const SALES_CODE_OPTIONS = [
   { label: 'D-Linda', value: 'D-Linda' },
@@ -15,6 +15,7 @@ import {
 } from '@/services';
 import { orderExport } from '@/services/order';
 import {
+  FloatAdd,
   copyToClipboard,
   enumToProTableEnumValue,
   enumValueToLabel,
@@ -217,17 +218,24 @@ const OrderPage = () =&gt; {
     text += record?.id;
     text += '，' + record?.salesCode;
     text += '，' + record?.customerName;
+
     text += '，' + record?.customerContactNumber;
+
     text += '，' + record?.customerShippingAddress;
-    text += '，' + record?.institutionContactName;
-    text += '，' + record?.institution;
+
+    if (userInfo.username !== '首能') {
+      text += '，' + record?.institutionContactName;
+      text += '，' + record?.institution;
+    }
     record?.subOrderInformationLists?.forEach((item) => {
       text += '\n';
       text += item?.productName;
       text += ' ' + item?.parameters;
       text += ' ' + item?.quantity;
       text += ' ' + item?.unit;
-      text += ' ￥' + item?.subOrderPayment;
+      if (userInfo.username !== '首能') {
+        text += ' ￥' + item?.subOrderPayment;
+      }
       text += ' ' + item?.id;
     });
     if (copyToClipboard(text)) {
@@ -373,7 +381,6 @@ const OrderPage = () =&gt; {
    * 返回当前操作的子订单集合
    */
   function buildSubOrders() {
-    console.log('here');
     if (currentOptMainId === undefined || currentOptMainId === null) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
@@ -421,12 +428,41 @@ const OrderPage = () =&gt; {
       return;
     }
  
-    console.log(cloneSubOrders);
-
     return cloneSubOrders;
   }
  
   /**
+   * 获取当前操作申请开票的订单总金额
+   */
+  function getApplyInvoicingTotalPayment() {
+    let subOrders = isMainOrder
+      ? [...subOrderSelectedMap.values()].flat()
+      : buildSubOrders();
+
+    let totalPayment = 0;
+    if (subOrders && subOrders.length > 0) {
+      let mainIds = subOrders?.map((item: any) => {
+        return item.mainOrderId;
+      });
+
+      let uniqueMainIds = [...new Set(mainIds)];
+
+      let dataMap = data.reduce((map, obj: any) => {
+        map.set(obj.id, obj);
+        return map;
+      }, new Map());
+
+      uniqueMainIds.forEach((id: any) => {
+        let o = dataMap.get(id);
+        if (o) {
+          totalPayment = FloatAdd(totalPayment, o.totalPayment);
+        }
+      });
+    }
+    return totalPayment;
+  }
+
+  /**
    * 根据主订单id，将该主订单下的所有子订单取消选中
    */
   const removeSelectedSubOrderKeysByMainOrderId = (id: any) => {
@@ -497,9 +533,6 @@ const OrderPage = () =&gt; {
       }
     }
     setSelectedMainOrderKeys(newSelectedMainOrderKeys);
-
-    console.log(mainOrderSelectedMap);
-    console.log(subOrderSelectedMap);
   };
   // const handleTableExpand = (mainOrderIds: any) => {
   //   setExpandedRowKeys(mainOrderIds);
@@ -1055,12 +1088,25 @@ const OrderPage = () =&gt; {
  
                 {/* 开票状态 */}
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-                  <span className="text-slate-700">
-                    {enumValueToLabel(
-                      optRecord.afterInvoicingStatus,
-                      AFTER_INVOICING_STATUS,
-                    )}
-                  </span>
+                  <Tooltip
+                    title={
+                      optRecord.invoicingUrgentCause !== null &&
+                      optRecord.afterInvoicingStatus ===
+                        'URGENT_INVOICE_AUDITING'
+                        ? optRecord.invoicingUrgentCause
+                        : enumValueToLabel(
+                            optRecord.afterInvoicingStatus,
+                            AFTER_INVOICING_STATUS,
+                          )
+                    }
+                  >
+                    <Tag color={TAGS_COLOR.get(optRecord.afterInvoicingStatus)}>
+                      {enumValueToLabel(
+                        optRecord.afterInvoicingStatus,
+                        AFTER_INVOICING_STATUS,
+                      )}
+                    </Tag>
+                  </Tooltip>
                 </div>
  
                 {/* 是否加急图标显示 */}
@@ -1264,6 +1310,25 @@ const OrderPage = () =&gt; {
               ''
             )}
  
+            {/* 加急审核 */}
+            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  console.log('here');
+                  setCurrentMainId(record.id);
+                  setCurretnOptSubId(optRecord.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                }}
+              >
+                加急审核
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('postAudit') ? (
               <Button
                 className="p-0"
@@ -2122,6 +2187,28 @@ const OrderPage = () =&gt; {
                 </Space>
               </Flex>
             </Flex>
+
+            {userInfo.username === '首能' ? (
+              <Flex className="pl-6" align="center">
+                <Flex
+                  className="hover:cursor-pointer"
+                  onClick={() => {
+                    copyToClipboard(record.customerContactNumber);
+                    message.info(
+                      '联系电话复制成功：' + record.customerContactNumber,
+                    );
+                  }}
+                >
+                  <span className="text-[#8C8C8C]">联系电话：</span>
+                  <span className="text-slate-700">
+                    {record.customerContactNumber + ' '}
+                  </span>
+                </Flex>
+              </Flex>
+            ) : (
+              ''
+            )}
+
             <Flex className="pl-6" align="center">
               {roleCode === 'finance' ? (
                 <div
@@ -2183,50 +2270,52 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Flex wrap="wrap" gap="middle" align="center">
                 {userInfo.username !== '首能' ? (
-                  <>
-                    <div>
-                      <span className="text-[#8C8C8C]">总金额：￥</span>
-                      <span className="text-lg font-medium">
-                        {record.totalPayment}
-                      </span>
-                    </div>
-                    {rolePath?.includes('addOrder') ? (
-                      <Tooltip title="复制">
-                        <CopyTwoTone
-                          className="hover:cursor-pointer"
-                          onClick={() => {
-                            createOptObject(null, record.id);
-                            copyOrderToClipboard(record);
-                            setOrderOptType('copy');
-                            setOrderDrawerVisible(true);
-                          }}
-                        />
-                      </Tooltip>
-                    ) : (
-                      <Tooltip title="复制文本">
-                        <CopyTwoTone
-                          className="hover:cursor-pointer"
-                          onClick={() => {
-                            copyOrderToClipboard(record);
-                          }}
-                        />
-                      </Tooltip>
-                    )}
+                  <div>
+                    <span className="text-[#8C8C8C]">总金额：￥</span>
+                    <span className="text-lg font-medium">
+                      {record.totalPayment}
+                    </span>
+                  </div>
+                ) : (
+                  ''
+                )}
  
-                    <Tooltip title="历史">
-                      <ClockCircleTwoTone
-                        className="hover:cursor-pointer"
-                        onClick={() => {
-                          setHistoryModalVisible(true);
-                          if (subOrderSelectedMap.get(record.id)?.length) {
-                            setSelectedRows(subOrderSelectedMap.get(record.id));
-                          } else {
-                            setSelectedRows(record.subOrderInformationLists);
-                          }
-                        }}
-                      />
-                    </Tooltip>
-                  </>
+                {rolePath?.includes('addOrder') ? (
+                  <Tooltip title="复制">
+                    <CopyTwoTone
+                      className="hover:cursor-pointer"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        copyOrderToClipboard(record);
+                        setOrderOptType('copy');
+                        setOrderDrawerVisible(true);
+                      }}
+                    />
+                  </Tooltip>
+                ) : (
+                  <Tooltip title="复制文本">
+                    <CopyTwoTone
+                      className="hover:cursor-pointer"
+                      onClick={() => {
+                        copyOrderToClipboard(record);
+                      }}
+                    />
+                  </Tooltip>
+                )}
+                {userInfo.username !== '首能' ? (
+                  <Tooltip title="历史">
+                    <ClockCircleTwoTone
+                      className="hover:cursor-pointer"
+                      onClick={() => {
+                        setHistoryModalVisible(true);
+                        if (subOrderSelectedMap.get(record.id)?.length) {
+                          setSelectedRows(subOrderSelectedMap.get(record.id));
+                        } else {
+                          setSelectedRows(record.subOrderInformationLists);
+                        }
+                      }}
+                    />
+                  </Tooltip>
                 ) : (
                   ''
                 )}
@@ -2251,6 +2340,22 @@ const OrderPage = () =&gt; {
                     ''
                   )}
  
+                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                      }}
+                    >
+                      加急审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {record.mainPath?.includes('modifiedLeaderAuditRequest') ? (
                     <Button
                       className="p-0"
@@ -3905,6 +4010,7 @@ const OrderPage = () =&gt; {
               ? [...subOrderSelectedMap.values()].flat()
               : buildSubOrders()
           }
+          totalPayment={getApplyInvoicingTotalPayment()}
           isMainOrder={isMainOrder}
           isEdit={isEdit}
           onClose={() => {
@@ -4250,7 +4356,12 @@ const OrderPage = () =&gt; {
       )}
  
       {messageListDrawerVisible && (
-        <MessageListDrawer setVisible={setMessageListDrawerVisible} />
+        <MessageListDrawer
+          setVisible={(val: any) => {
+            setMessageListDrawerVisible(val);
+            getUnreadMessageNum();
+          }}
+        />
       )}
       {contextHolder}
     </PageContainer>
-import { postServiceOrderQueryReportFormsInformation } from '@/services';
+import {
+  postServiceOrderQueryReportFormsInformation,
+  postServiceOrderQuerySalesCode,
+} from '@/services';
 import { enumToSelect } from '@/utils';
 import { getUserInfo } from '@/utils/user';
 import { EllipsisOutlined } from '@ant-design/icons';
@@ -21,16 +24,30 @@ import {
   Tag,
 } from 'antd';
 import { useEffect, useState } from 'react';
-import {
-  PRODUCT_BELONG_DEPARTMENT_OPTIONS,
-  SALES_CODE_OPTIONS,
-} from '../Order/constant';
+import { PRODUCT_BELONG_DEPARTMENT_OPTIONS } from '../Order/constant';
 import OrderDualAxes from './components/OrderDualAxes';
 import OrderStatisticCard from './components/OrderStatisticCard';
 import './index.less';
 const userInfo = getUserInfo();
  
 const OrderReportPage = () => {
+  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+
+  /**
+   * 获取销售代码枚举，在复制和编辑的时候判断是否为旧的代码
+   */
+  const getSalesCodeOptions = async () => {
+    const res = await postServiceOrderQuerySalesCode();
+    let options = res.data?.map((item) => {
+      return {
+        label: item.userName,
+        value: item.userName,
+        number: item.number,
+      };
+    });
+    setSalesCodeOptions(options);
+  };
+
   const [form] = Form.useForm<{
     salesCode: '';
     productBelongBusiness: '';
@@ -91,6 +108,7 @@ const OrderReportPage = () =&gt; {
  
   useEffect(() => {
     loadData();
+    getSalesCodeOptions();
   }, []);
  
   // const items: TabsProps['items'] = [
@@ -165,10 +183,11 @@ const OrderReportPage = () =&gt; {
             <ProFormSelect
               name="salesCode"
               key="salesCode"
+              width="lg"
               showSearch
               label="销售代表"
-              placeholder="请输入销售代表"
-              options={SALES_CODE_OPTIONS}
+              placeholder="请选择销售代表"
+              options={salesCodeOptions}
             />
             <ProFormSelect
               key="productBelongBusiness"
@@ -808,6 +808,7 @@ export interface MeasureUnitListResRow {
 export interface MessageQueryDTO {
   /** @format int32 */
   current?: number;
+  isReaded?: string;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
@@ -42,6 +42,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -253,9 +254,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -276,9 +275,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';
@@ -302,9 +301,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -330,9 +327,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__ */ (() => {
@@ -357,9 +354,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -385,9 +380,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__ */ (() => {
@@ -412,9 +407,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -435,9 +428,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';
@@ -461,9 +454,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -484,9 +475,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__ */ (() => {
@@ -511,9 +502,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -534,9 +523,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__ */ (() => {
@@ -561,9 +550,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -584,9 +571,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__ */ (() => {
@@ -4159,6 +4146,60 @@ export const postOrderErpMessageRead = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postOrderErpMessageReadAll */
+export interface PostOrderErpMessageReadAllResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostOrderErpMessageReadAllResponseSuccess =
+  PostOrderErpMessageReadAllResponse[200];
+/**
+ * @description
+ *   queryMyMessage
+ * @tags message-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postOrderErpMessageReadAll = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/order/erp/message/readAll';
+  function request(): Promise<PostOrderErpMessageReadAllResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostOrderErpMessageReadAllResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postOrderErpOptLogListByPage */
 export interface PostOrderErpOptLogListByPageOption {
   /**