feat: 自行派送、金额不一致提醒。

曾国涛
1 parent 96450634
Showing 3 changed files with 271 additions and 143 deletions
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
@@ -205,6 +205,107 @@ const DeliverModal = ({
       onCancel={() => {
         setVisible(false);
       }}
+      footer={[
+        <Button
+          key="back"
+          size="large"
+          onClick={() => {
+            setVisible(false);
+          }}
+        >
+          取消
+        </Button>,
+        <Button
+          key="selfDeliver"
+          type="primary"
+          size="large"
+          onClick={async () => {
+            //请求体封装
+            let list = data.map((item) => {
+              return {
+                id: item.id,
+                deliverType: 'SELF_DELIVER',
+              };
+            });
+
+            let body = { id: data[0].mainOrderId, list: list, flag: false };
+            if (isSendProduct) {
+              body.flag = true;
+            }
+            //发货请求
+            let res;
+            if (optType(CHECK_TYPE.SUPPLIER)) {
+              res = await postServiceOrderSupplierSendOrder({ data: body });
+            } else if (optType(CHECK_TYPE.PROCURE)) {
+              res = await postServiceOrderProcureSend({ data: body });
+            } else {
+              res = await postServiceOrderSendProduct({ data: body });
+            }
+
+            if (res.result === RESPONSE_CODE.SUCCESS) {
+              message.success(res.message);
+              onClose();
+            }
+          }}
+        >
+          自行派送
+        </Button>,
+        <Button
+          key="submit"
+          type="primary"
+          size="large"
+          onClick={async () => {
+            //请求体封装
+            let list = data.map((item) => {
+              return {
+                id: item.id,
+                logisticsMethod: item.logisticsMethod,
+                serialNumber: item.serialNumber,
+                packageNumber:
+                  item.packageNumber === null ||
+                  item.packageNumber === undefined
+                    ? 1
+                    : item.packageNumber,
+                logisticsNotes: item.logisticsNotes,
+              };
+            });
+
+            for (let item of list) {
+              let method = item.logisticsMethod;
+              let notes = item.logisticsNotes;
+              if (
+                method === 'OTHER_LOGISTICS' &&
+                (notes === '' || notes === undefined)
+              ) {
+                message.error(
+                  '请检查：物流方式为[其他物流方式]的记录中，物流备注不能为空！请将实际的物流方式填写在备注中！',
+                );
+                return;
+              }
+            }
+            let body = { id: data[0].mainOrderId, list: list, flag: false };
+            if (isSendProduct) {
+              body.flag = true;
+            }
+            //发货请求
+            let res;
+            if (optType(CHECK_TYPE.SUPPLIER)) {
+              res = await postServiceOrderSupplierSendOrder({ data: body });
+            } else if (optType(CHECK_TYPE.PROCURE)) {
+              res = await postServiceOrderProcureSend({ data: body });
+            } else {
+              res = await postServiceOrderSendProduct({ data: body });
+            }
+
+            if (res.result === RESPONSE_CODE.SUCCESS) {
+              message.success(res.message);
+              onClose();
+            }
+          }}
+        >
+          确认
+        </Button>,
+      ]}
     >
       <Flex vertical>
         <strong>将物流方式和物流单号更新到下方所有订单</strong>
@@ -105,6 +105,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   let copyData = cloneDeep(data);
   let originSubOrders = cloneDeep(subOrders);
+
   /**
    * 获取当前的操作类型boolean值
    * @param type 操作类型，如果与当前匹配返回true
@@ -571,11 +572,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   };
   /**
- * 是否有草稿
- */
+   * 是否有草稿
+   */
   function checkHasLocalData() {
     let preOrderData = localStorage.getItem('preOrderData');
-    let hasLocalData = preOrderData !== null && preOrderData !== undefined && preOrderData !== '';
+    let hasLocalData =
+      preOrderData !== null &&
+      preOrderData !== undefined &&
+      preOrderData !== '';
     setHasLocalData(hasLocalData);
     return hasLocalData;
   }
@@ -586,25 +590,25 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   function saveFormDataToLocal() {
     let preOrderData = localStorage.getItem('preOrderData');
     let values = form.getFieldsValue();
-    values.isLocalData = true;//标识为本地草稿数据
+    values.isLocalData = true; //标识为本地草稿数据
     let formData = JSON.stringify(values);
     //检查本地是否已有数据
     if (preOrderData) {
       Modal.confirm({
-        title: "提示",
-        content: "检测到本地有订单数据，是否覆盖？",
+        title: '提示',
+        content: '检测到本地有订单数据，是否覆盖？',
         onOk: () => {
-          localStorage.setItem("preOrderData", formData);
-          message.success("本地保存成功");
+          localStorage.setItem('preOrderData', formData);
+          message.success('本地保存成功');
         },
         onCancel: () => {
-          message.info("取消保存");
-        }
-      })
+          message.info('取消保存');
+        },
+      });
     } else {
-      localStorage.setItem("preOrderData", formData);
-      message.success("本地保存成功");
+      localStorage.setItem('preOrderData', formData);
+      message.success('本地保存成功');
     }
     checkHasLocalData();
@@ -625,11 +629,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   /**
    * 刪除草稿数据
    */
-  function removeLocalFormData(){
-    localStorage.removeItem("preOrderData");
+  function removeLocalFormData() {
+    localStorage.removeItem('preOrderData');
   }
-
   useEffect(() => {
     checkHasLocalData();
     getSalesCodeOptions();
@@ -659,7 +662,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           minWidth: 400,
         }}
         onFinishFailed={() => {
-          message.error("表单项存在错误，请检查");
+          message.error('表单项存在错误，请检查');
           setSubmitBtnLoading(false);
         }}
         submitter={{
@@ -676,7 +679,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               <Button
                 key="localSave"
                 loading={localSaveLoading}
-                hidden={!optType('add') && !optType("copy")}
+                hidden={!optType('add') && !optType('copy')}
                 onClick={() => {
                   setLocalSaveLoading(true);
                   saveFormDataToLocal();
@@ -692,7 +695,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 onClick={() => {
                   setSubmitBtnLoading(true);
                   props.submit();
-
                 }}
               >
                 提交
@@ -705,7 +707,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         drawerProps={{
           destroyOnClose: true,
           maskClosable: false,
-          extra: [<Button key="useLocalData" hidden={!hasLocalData} type='link' onClick={() => { useLocalFormData() }}>使用草稿</Button>]
+          extra: [
+            <Button
+              key="useLocalData"
+              hidden={!hasLocalData}
+              type="link"
+              onClick={() => {
+                useLocalFormData();
+              }}
+            >
+              使用草稿
+            </Button>,
+          ],
         }}
         submitTimeout={2000}
         onFinish={async (values) => {
@@ -779,8 +792,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             onClose(true);
             //判断保存的数据是否是本地草稿，是的话将草稿删除
-            let isLocalData = form.getFieldValue("isLocalData");
-            if(isLocalData){
+            let isLocalData = form.getFieldValue('isLocalData');
+            if (isLocalData) {
               removeLocalFormData();
               checkHasLocalData();
             }
@@ -955,7 +968,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           }}
           debounceTime={1000}
-          request={async (value, { }) => {
+          request={async (value, {}) => {
             const keywords = value.keyWords;
             const res = await postKingdeeRepCustomer({
               data: { search: keywords },
@@ -1170,6 +1183,20 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               max: 1000, // 最大长度为1000个字符
               message: '备注不能超过1000个字符',
             },
+            {
+              validator: (rule, value) => {
+                let totalPayment = form.getFieldValue('totalPayment');
+                let list = form.getFieldValue('list');
+                let reduce = list.reduce(
+                  (sum, item) => sum + item.subOrderPayment,
+                  0,
+                );
+                if (reduce === totalPayment || value) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(new Error('请填写订单金额不一致的原因'));
+              },
+            },
           ]}
         />
@@ -1364,7 +1391,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '商品参数必填' }]}
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                   />,
                   <ProFormDigit
@@ -1405,7 +1432,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品单位"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                     rules={[{ required: true, message: '商品单位必填' }]}
                   />,
@@ -79,6 +79,7 @@ import FinancialEditDrawer from &#39;./components/FinancialEditDrawer&#39;;
 import FinancialMergeDrawer from './components/FinancialMergeDrawer';
 import FinancialReceiptsModal from './components/FinancialReceiptsModal';
 import HistoryModal from './components/HistoryModal';
+import ImagesViewerModal from './components/ImagesViewerModal';
 import ImportModal from './components/ImportModal';
 import MessageListDrawer from './components/MessageListDrawer';
 import ModifiedDiffModal from './components/ModifiedDiffModal';
@@ -88,6 +89,7 @@ import ProcureCheckModal from &#39;./components/ProcureCheckModal&#39;;
 import ProcureConvertModal from './components/ProcureConvertModal';
 import ProductionTimeModal from './components/ProductionTimeModal';
 import ShippingWarehouseChangeModal from './components/ShippingWarehouseChangeModal';
+import UploadPayBillModal from './components/UploadPayBillModal';
 import {
   AFTER_INVOICING_STATUS,
   CHECK_TYPE,
@@ -109,18 +111,14 @@ import {
 } from './constant';
 import './index.less';
 import { OrderListItemType, OrderType } from './type.d';
-import UploadPayBillModal from './components/UploadPayBillModal';
-import ImagesViewerModal from './components/ImagesViewerModal';
 const OrderPage = () => {
   const [orderDrawerVisible, setOrderDrawerVisible] = useState<boolean>(false);
   const [checkVisible, setCheckVisible] = useState<boolean>(false);
   const [orderPrintVisible, setOrderPrintVisible] = useState<boolean>(false);
   const [allMainChecked, setAllMainChecked] = useState(false);
-  const [
-    imagesViewerModalVisible,
-    setImagesViewerModalVisible,
-  ] = useState<boolean>(false);
+  const [imagesViewerModalVisible, setImagesViewerModalVisible] =
+    useState<boolean>(false);
   const [data, setData] = useState([]); //列表数据
   const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
   const [financialMergeDrawerVisible, setFinancialMergeDrawerVisible] =
@@ -174,7 +172,7 @@ const OrderPage = () =&gt; {
   const [pageSize, setPageSize] = useState(10);
   const [currentPage, setCurrentPage] = useState(1);
   const [orderCheckType, setOrderCheckType] = useState('');
-  const [imagesViewerOptType,setImagesViewerOptType] = useState('');
+  const [imagesViewerOptType, setImagesViewerOptType] = useState('');
   const [filterCondifion, setFilterCondition] = useState(0);
   const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map key：主订单id value：主订单数据
   const [subOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
@@ -764,7 +762,7 @@ const OrderPage = () =&gt; {
                 onConfirm={() => {
                   window.open(
                     '/previewApi/onlinePreview?url=' +
-                    encodeURIComponent(Base64.encode(item.url)),
+                      encodeURIComponent(Base64.encode(item.url)),
                   );
                 }}
                 onCancel={() => {
@@ -836,7 +834,7 @@ const OrderPage = () =&gt; {
                 </span>
                 {(roleCode === 'salesRepresentative' ||
                   roleCode === 'salesManager') &&
-                  !optRecord.isCurrentUserOrder ? (
+                !optRecord.isCurrentUserOrder ? (
                   <span className="text-[#f44e4e]">(非本账号订单)</span>
                 ) : (
                   ''
@@ -918,7 +916,7 @@ const OrderPage = () =&gt; {
             {(roleCode === 'procure' ||
               roleCode === 'warehouseKeeper' ||
               roleCode === 'admin') &&
-              !isSupplier() ? (
+            !isSupplier() ? (
               <>
                 <Flex title={optRecord.supplierName}>
                   <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
@@ -1055,20 +1053,29 @@ const OrderPage = () =&gt; {
                 {/* 回款审核状态 */}
                 {optRecord.paymentReceiptStatus !== null ? (
                   <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-                    <Tag className='hover:cursor-pointer'
+                    <Tag
+                      className="hover:cursor-pointer"
                       onMouseEnter={(e: any) => {
-                        e.target.innerText = "点击查看回款凭证"
+                        e.target.innerText = '点击查看回款凭证';
                       }}
                       onMouseLeave={(e: any) => {
-                        e.target.innerText = enumValueToLabel(optRecord.paymentReceiptStatus, PAYMENT_RECEIPTS_STATUS_OPTIONS);
+                        e.target.innerText = enumValueToLabel(
+                          optRecord.paymentReceiptStatus,
+                          PAYMENT_RECEIPTS_STATUS_OPTIONS,
+                        );
                       }}
-                      onClick={()=>{
-                        createOptObject(optRecord.id,record.id);
-                        setImagesViewerOptType("paymentReceipt");
+                      onClick={() => {
+                        createOptObject(optRecord.id, record.id);
+                        setImagesViewerOptType('paymentReceipt');
                         setImagesViewerModalVisible(true);
                       }}
-                      key="key" color={TAGS_COLOR.get(optRecord.paymentReceiptStatus)}>
-                      {enumValueToLabel(optRecord.paymentReceiptStatus, PAYMENT_RECEIPTS_STATUS_OPTIONS)}
+                      key="key"
+                      color={TAGS_COLOR.get(optRecord.paymentReceiptStatus)}
+                    >
+                      {enumValueToLabel(
+                        optRecord.paymentReceiptStatus,
+                        PAYMENT_RECEIPTS_STATUS_OPTIONS,
+                      )}
                     </Tag>
                   </div>
                 ) : (
@@ -1110,21 +1117,23 @@ const OrderPage = () =&gt; {
                 )}
                 {/* 开票状态 */}
-                {optRecord.afterInvoicingStatus !== null ?
+                {optRecord.afterInvoicingStatus !== null ? (
                   <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                     <Tooltip
                       title={
                         optRecord.invoicingUrgentCause !== null &&
-                          optRecord.afterInvoicingStatus ===
+                        optRecord.afterInvoicingStatus ===
                           'URGENT_INVOICE_AUDITING'
                           ? optRecord.invoicingUrgentCause
                           : enumValueToLabel(
-                            optRecord.afterInvoicingStatus,
-                            AFTER_INVOICING_STATUS,
-                          )
+                              optRecord.afterInvoicingStatus,
+                              AFTER_INVOICING_STATUS,
+                            )
                       }
                     >
-                      <Tag color={TAGS_COLOR.get(optRecord.afterInvoicingStatus)}>
+                      <Tag
+                        color={TAGS_COLOR.get(optRecord.afterInvoicingStatus)}
+                      >
                         {enumValueToLabel(
                           optRecord.afterInvoicingStatus,
                           AFTER_INVOICING_STATUS,
@@ -1132,8 +1141,9 @@ const OrderPage = () =&gt; {
                       </Tag>
                     </Tooltip>
                   </div>
-                  : ""
-                }
+                ) : (
+                  ''
+                )}
                 {/* 是否加急图标显示 */}
                 {optRecord.isUrgent ? (
@@ -1149,7 +1159,7 @@ const OrderPage = () =&gt; {
                 )}
                 {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
-                  optRecord.shippingWarehouse !== null ? (
+                optRecord.shippingWarehouse !== null ? (
                   <div
                     className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
                     title={enumValueToLabel(
@@ -1171,7 +1181,7 @@ const OrderPage = () =&gt; {
                 {/* 生产时间 */}
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   {optRecord.productionStartTime !== null ||
-                    optRecord.productionEndTime !== null ? (
+                  optRecord.productionEndTime !== null ? (
                     <MyToolTip
                       title={
                         formatdate(optRecord.productionStartTime) +
@@ -1201,7 +1211,7 @@ const OrderPage = () =&gt; {
                 <Tag
                   color={
                     optRecord.invoicingTime === null ||
-                      optRecord.invoicingTime === undefined
+                    optRecord.invoicingTime === undefined
                       ? TAGS_COLOR.get(optRecord.invoicingStatus)
                       : 'success'
                   }
@@ -1229,7 +1239,7 @@ const OrderPage = () =&gt; {
             {/**采购是否已下单状态 */}
             {optRecord.procureOrderStatus !== null &&
-              optRecord.procureOrderStatus !== undefined ? (
+            optRecord.procureOrderStatus !== undefined ? (
               <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                 <Tag color="success">
                   {enumValueToLabel(
@@ -1245,21 +1255,23 @@ const OrderPage = () =&gt; {
             {/* 物流信息 */}
             <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
               {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
-                optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
-                optRecord.orderStatus === 'IN_AFTER_SALES' ||
-                optRecord.orderStatus === 'SHIPPED' ? (
+              optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
+              optRecord.orderStatus === 'IN_AFTER_SALES' ||
+              optRecord.orderStatus === 'SHIPPED' ? (
                 <MyToolTip
                   title={
-                    optRecord.serialNumber === undefined
-                      ? '暂无物流信息'
-                      : enumValueToLabel(
-                        optRecord.logisticsMethod,
-                        LOGISTICS_STATUS_OPTIONS,
-                      ) +
-                      '  ' +
-                      optRecord.serialNumber +
-                      '  ' +
-                      optRecord.logisticsNotes
+                    optRecord.serialNumber
+                      ? enumValueToLabel(
+                          optRecord.logisticsMethod,
+                          LOGISTICS_STATUS_OPTIONS,
+                        ) +
+                        '  ' +
+                        optRecord.serialNumber +
+                        '  ' +
+                        optRecord.logisticsNotes
+                      : optRecord.deliverType
+                        ? '自行派送'
+                        : '暂无物流信息'
                   }
                   content={
                     <Button type="link" size="small" style={{ padding: 0 }}>
@@ -1273,7 +1285,7 @@ const OrderPage = () =&gt; {
               {/* 修改审核状态 */}
               {optRecord.modifiedAuditStatus !== null &&
-                optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
+              optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   <Tooltip
                     title={enumValueToLabel(
@@ -1318,7 +1330,6 @@ const OrderPage = () =&gt; {
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
-
             {optRecord.subPath?.includes('uploadPaymentReceiptBill') ? (
               <Button
                 className="p-0"
@@ -1334,7 +1345,6 @@ const OrderPage = () =&gt; {
               ''
             )}
-
             {optRecord.subPath?.includes('leaderAudit') ? (
               <Button
                 className="p-0"
@@ -1572,7 +1582,7 @@ const OrderPage = () =&gt; {
             )}
             {optRecord.subPath?.includes('queryAnnex') &&
-              optRecord.listAnnex?.length > 0 ? (
+            optRecord.listAnnex?.length > 0 ? (
               <Button
                 className="p-0"
                 type="link"
@@ -1914,7 +1924,7 @@ const OrderPage = () =&gt; {
                 type="link"
                 onClick={() => {
                   createOptObject(optRecord.id, record.id);
-                  setImagesViewerOptType("shippingReceipt");
+                  setImagesViewerOptType('shippingReceipt');
                   setImagesViewerModalVisible(true);
                 }}
               >
@@ -1947,9 +1957,9 @@ const OrderPage = () =&gt; {
         </Flex>
         {roleCode === 'admin' ||
-          roleCode === 'salesManager' ||
-          roleCode === 'salesRepresentative' ||
-          roleCode === 'finance' ? (
+        roleCode === 'salesManager' ||
+        roleCode === 'salesRepresentative' ||
+        roleCode === 'finance' ? (
           <Flex title={optRecord.notes}>
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
@@ -1961,7 +1971,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">
                       申请开票备注：
                       {optRecord.applyInvoicingNotes === undefined ||
-                        optRecord.applyInvoicingNotes === null
+                      optRecord.applyInvoicingNotes === null
                         ? '暂无备注'
                         : optRecord.applyInvoicingNotes}
                     </span>
@@ -1989,7 +1999,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C] mr-3">
                       财务审核备注：
                       {optRecord.checkNotes === undefined ||
-                        optRecord.checkNotes === null
+                      optRecord.checkNotes === null
                         ? '暂无备注'
                         : optRecord.checkNotes}
                     </span>
@@ -2282,9 +2292,9 @@ const OrderPage = () =&gt; {
                   <span className="text-slate-700">
                     {record.receivingCompany !== null
                       ? enumValueToLabel(
-                        record.receivingCompany,
-                        getReceivingCompanyOptions(PAYEE_OPTIONS),
-                      )
+                          record.receivingCompany,
+                          getReceivingCompanyOptions(PAYEE_OPTIONS),
+                        )
                       : '暂无'}
                   </span>
                 </div>
@@ -2325,44 +2335,43 @@ const OrderPage = () =&gt; {
                 ''
               )}
-              {
-                record.goodsWeight !== null ?
-                  <div title={record.goodsWeight + "kg"} className='pl-3'>
-                    <div
-                      className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
-                      onClick={() => {
-                        copyToClipboard(record.goodsWeight + "kg");
-                        message.info('包裹重量复制成功：' + record.goodsWeight + "kg");
-                      }}
-                    >
-                      <span className="text-[#8C8C8C]">包裹重量：</span>
-                      <span className="ml-2">
-                        {record.goodsWeight + "kg"}
-                      </span>
-                    </div>
+              {record.goodsWeight !== null ? (
+                <div title={record.goodsWeight + 'kg'} className="pl-3">
+                  <div
+                    className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                    onClick={() => {
+                      copyToClipboard(record.goodsWeight + 'kg');
+                      message.info(
+                        '包裹重量复制成功：' + record.goodsWeight + 'kg',
+                      );
+                    }}
+                  >
+                    <span className="text-[#8C8C8C]">包裹重量：</span>
+                    <span className="ml-2">{record.goodsWeight + 'kg'}</span>
                   </div>
-                  : ""
-              }
+                </div>
+              ) : (
+                ''
+              )}
-              {
-                record.goodsVolume !== null ?
-                  <div title={record.goodsVolume + "m³"} className='pl-3'>
-                    <div
-                      className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
-                      onClick={() => {
-                        copyToClipboard(record.goodsVolume + "m³");
-                        message.info('包裹体积复制成功：' + record.goodsVolume + "m³");
-                      }}
-                    >
-                      <span className="text-[#8C8C8C]">包裹体积：</span>
-                      <span className="ml-2">
-                        {record.goodsVolume + "m³"}
-                      </span>
-                    </div>
+              {record.goodsVolume !== null ? (
+                <div title={record.goodsVolume + 'm³'} className="pl-3">
+                  <div
+                    className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                    onClick={() => {
+                      copyToClipboard(record.goodsVolume + 'm³');
+                      message.info(
+                        '包裹体积复制成功：' + record.goodsVolume + 'm³',
+                      );
+                    }}
+                  >
+                    <span className="text-[#8C8C8C]">包裹体积：</span>
+                    <span className="ml-2">{record.goodsVolume + 'm³'}</span>
                   </div>
-                  : ""
-              }
-
+                </div>
+              ) : (
+                ''
+              )}
             </Flex>
           </Flex>
           <Flex wrap="wrap" gap="middle" vertical>
@@ -2930,9 +2939,9 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].invoicingStatus ===
-                            'UN_INVOICE' ||
+                              'UN_INVOICE' ||
                             selectedSubOrders[i].afterInvoicingStatus ===
-                            'APPLY_FOR_INVOICING'
+                              'APPLY_FOR_INVOICING'
                           ) {
                             message.error(
                               '请选择需要开票且未申请开票的子订单进行申请',
@@ -3121,13 +3130,13 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'AUDITED' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_PROCESS' &&
+                              'PROCURE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_PROCESS_FOR_MINE' &&
+                              'PROCURE_PROCESS_FOR_MINE' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_WAIT_SHIP' &&
+                              'PROCURE_WAIT_SHIP' &&
                             selectedSubOrders[i].orderStatus !==
-                            'SUPPLIER_WAIT_SHIP' &&
+                              'SUPPLIER_WAIT_SHIP' &&
                             selectedSubOrders[i].orderStatus !== 'WAIT_SHIP'
                           ) {
                             message.error(
@@ -3214,9 +3223,9 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
-                            'FINANCE_PROCESS' &&
+                              'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
-                            'LEADER_AUDITED'
+                              'LEADER_AUDITED'
                           ) {
                             message.error(
                               '请选择[未审核]、[财务待审核]、[领导已审核]的子订单进行审核',
@@ -3284,9 +3293,9 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].orderStatus !==
-                            'CONFIRM_RECEIPT' &&
+                              'CONFIRM_RECEIPT' &&
                             selectedSubOrders[i].orderStatus !==
-                            'AFTER_SALES_FAILURE'
+                              'AFTER_SALES_FAILURE'
                           ) {
                             message.error('请选择确认收货状态的子订单进行售后');
                             return;
@@ -3490,10 +3499,7 @@ const OrderPage = () =&gt; {
     (item) => {
       //首能账号只能搜索订单编号
       let canSearchIndex = ['id', 'salesCode', 'subNotes', 'orderStatus'];
-      if (
-        isSupplier() &&
-        !canSearchIndex.includes(item.dataIndex)
-      ) {
+      if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) {
         item.search = false;
       }
       if (item.dataIndex === 'name') {
@@ -3521,10 +3527,7 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选供应商备注
    */
-  if (
-    (roleCode === 'procure' || roleCode === 'admin') &&
-    !isSupplier()
-  ) {
+  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
     mainOrdersColumns.push({
       title: '供应商备注',
       width: 120,
@@ -3537,10 +3540,7 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选其他采购
    */
-  if (
-    (roleCode === 'procure' || roleCode === 'admin') &&
-    !isSupplier()
-  ) {
+  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
     mainOrdersColumns.push({
       title: '采购名称',
       width: 120,
@@ -3687,7 +3687,7 @@ const OrderPage = () =&gt; {
     const exportMenuProps = {
       items: exportItems,
-      onClick: () => { },
+      onClick: () => {},
     };
     //导出按钮配置
@@ -3723,7 +3723,7 @@ const OrderPage = () =&gt; {
     const auditProps = {
       items: auditItems,
-      onClick: () => { },
+      onClick: () => {},
     };
     if (rolePath?.includes('leaderMergeAudit')) {
@@ -3831,8 +3831,8 @@ const OrderPage = () =&gt; {
             if (errorIds.size > 0) {
               message.error(
                 '订单号为：' +
-                [...errorIds.values()].join(',') +
-                '的订单存在不是[申请开票]或者[部分开票]状态的子订单，请检查！',
+                  [...errorIds.values()].join(',') +
+                  '的订单存在不是[申请开票]或者[部分开票]状态的子订单，请检查！',
               );
               return;
             }
@@ -4271,7 +4271,7 @@ const OrderPage = () =&gt; {
       {imagesViewerModalVisible && (
         <ImagesViewerModal
-        optType={imagesViewerOptType}
+          optType={imagesViewerOptType}
           setVisible={(val: boolean) => {
             setImagesViewerModalVisible(val);
             if (!val) {