Merge branch 'znh' into 'develop'

feat: update 尚未开票选项 See merge request !24

Merge branch 'znh' into 'develop'
feat: update 尚未开票选项 See merge request !24
zhongnanhuang
2 parents b34a9491 a2cdaefa
Showing 3 changed files with 615 additions and 517 deletions
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -151,7 +151,11 @@ export default ({
           { label: '完全开票', value: 'COMPLETE_INVOICING' },
         ]}
         // disabled={mainInfoDisbled}
-        initialValue={subOrders[0]?.afterInvoicingStatus}
+        initialValue={
+          subOrders[0]?.afterInvoicingStatus === 'APPLY_FOR_INVOICING'
+            ? 'PARTIAL_INVOICING'
+            : subOrders[0]?.afterInvoicingStatus
+        }
         rules={[{ required: true, message: '是否完全开票必填' }]}
       />
       <ProFormTextArea
@@ -128,6 +128,7 @@ export const FINANCIAL_STATUS_OPTIONS = {
 };
 export const AFTER_INVOICING_STATUS = {
+  NOT_YET_INVOICED: '尚未开票',
   APPLY_FOR_INVOICING: '申请开票',
   PARTIAL_INVOICING: '部分开票',
   COMPLETE_INVOICING: '完全开票',
@@ -31,6 +31,7 @@ import {
   Divider,
   Dropdown,
   Flex,
+  Image,
   MenuProps,
   Space,
   Tag,
@@ -250,13 +251,13 @@ const OrderPage = () =&gt; {
         <Flex className="w-[29%] ml-[4%]">
           <span className="font-medium">商品信息</span>
         </Flex>
-        <Flex className="w-[16%]">
+        <Flex className="w-[13%]">
           <span className="font-medium">交易金额</span>
         </Flex>
         <Flex className="w-[10%]">
           <span className="font-medium">支付</span>
         </Flex>
-        <Flex className="w-[14%]">
+        <Flex className="w-[12%]">
           <span className="font-medium">其他</span>
         </Flex>
         <Flex className="w-[10%]">
@@ -359,43 +360,88 @@ const OrderPage = () =&gt; {
       );
     }
-    return (
-      <Flex className="w-full border-b-indigo-500">
-        <Flex vertical className="w-[31%]" gap="small">
-          {/* 商品名称 */}
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={optRecord.productName}
-          >
-            <span className="font-medium text-black ">
-              {optRecord.productName}
-            </span>
-          </div>
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={optRecord.parameters}
+    //申请开票附件处理
+    const getAfterAnnexList = () => {
+      let links = [];
+      let afterAnnexList = optRecord.afterAnnexList;
+      let i = 1;
+      if (afterAnnexList?.length > 0) {
+        for (let url of afterAnnexList) {
+          links.push(
+            <a className="pl-2" href={url}>
+              附件{i++}
+            </a>,
+          );
+        }
+      }
+
+      return links;
+    };
+
+    //财务审核附件处理
+    const getInvoicingCheckAnnexList = () => {
+      let invoicingCheckAnnexList = optRecord.invoicingCheckAnnexList;
+
+      return (
+        <div>
+          <Image.PreviewGroup
+            className="mr-10"
+            preview={{
+              onChange: (current, prev) =>
+                console.log(`current index: ${current}, prev index: ${prev}`),
+            }}
           >
-            <span className="text-[#8C8C8C]">参数：{optRecord.parameters}</span>
-          </div>
-          <Flex title={optRecord.notes}>
-            <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
+            {invoicingCheckAnnexList.map((url) => (
+              <>
+                <Image className="max-h-[50px] max-w-[70px]" src={url} />{' '}
+                <Divider type="vertical" />
+              </>
+            ))}
+          </Image.PreviewGroup>
+        </div>
+      );
+    };
+
+    return (
+      <>
+        <Flex className="w-full border-b-indigo-500">
+          <Flex vertical className="w-[31%]" gap="small">
+            {/* 商品名称 */}
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={optRecord.productName}
+            >
+              <span className="font-medium text-black ">
+                {optRecord.productName}
+              </span>
+            </div>
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={optRecord.parameters}
+            >
               <span className="text-[#8C8C8C]">
-                备注：
-                {optRecord.notes === undefined ? '暂无备注' : optRecord.notes}
+                参数：{optRecord.parameters}
               </span>
             </div>
-            {/* 编辑备注按钮 */}
-            <EditTwoTone
-              onClick={() => {
-                setNotesEditVisible(true);
-                setOrderRow(optRecord);
-                setIsMainOrder(false);
-              }}
-            />
-          </Flex>
+            <Flex title={optRecord.notes}>
+              <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
+                <span className="text-[#8C8C8C]">
+                  备注：
+                  {optRecord.notes === undefined ? '暂无备注' : optRecord.notes}
+                </span>
+              </div>
+              {/* 编辑备注按钮 */}
+              <EditTwoTone
+                onClick={() => {
+                  setNotesEditVisible(true);
+                  setOrderRow(optRecord);
+                  setIsMainOrder(false);
+                }}
+              />
+            </Flex>
-          {optRecord.applyInvoicingNotes !== undefined &&
-          optRecord.applyInvoicingNotes !== null ? (
+            {/* {optRecord.applyInvoicingNotes !== undefined &&
+            optRecord.applyInvoicingNotes !== null ? (
             <Flex title={optRecord.notes}>
               <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
                 <span className="text-[#8C8C8C]">
@@ -406,503 +452,550 @@ const OrderPage = () =&gt; {
             </Flex>
           ) : (
             ''
-          )}
-        </Flex>
-        <Flex className="w-[16%]" vertical gap="small">
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={optRecord.productPrice}
-          >
-            <span className="text-[#8C8C8C]">单价：</span>
-            <span className="text-slate-700">￥{optRecord.productPrice}</span>
-          </div>
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={optRecord.quantity}
-          >
-            <span className="text-[#8C8C8C]">数量：</span>
-            <span className="text-slate-700">x{optRecord.quantity}</span>
-          </div>
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={optRecord.subOrderPayment}
-          >
-            <span className="text-[#8C8C8C]">合计：</span>
-            <span className="text-slate-700">
-              ￥{optRecord.subOrderPayment}
-            </span>
-          </div>
-        </Flex>
-        <Flex className="w-[10%]" vertical gap="small">
-          {/* 支付方式 */}
-          <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-            <span className="text-slate-700">
-              {enumValueToLabel(
-                optRecord.paymentMethod,
-                PAYMENT_METHOD_OPTIONS,
-              )}
-            </span>
-          </div>
-          {/* 支付渠道 */}
-          <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-            <span className="text-slate-700">
-              {enumValueToLabel(
-                optRecord.paymentChannel,
-                PAYMENT_CHANNEL_OPTIONS,
-              )}
-            </span>
-          </div>
-        </Flex>
-        <Flex className="w-[15%]" vertical gap="small">
-          {/* 所属部门 */}
-          <div
-            className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
-            title={enumValueToLabel(
-              optRecord.productBelongBusiness,
-              PRODUCT_BELONG_DEPARTMENT_OPTIONS,
-            )}
-          >
-            <span className="text-slate-700">
-              {enumValueToLabel(
+          )} */}
+          </Flex>
+          <Flex className="w-[13%]" vertical gap="small">
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={optRecord.productPrice}
+            >
+              <span className="text-[#8C8C8C]">单价：</span>
+              <span className="text-slate-700">￥{optRecord.productPrice}</span>
+            </div>
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={optRecord.quantity}
+            >
+              <span className="text-[#8C8C8C]">数量：</span>
+              <span className="text-slate-700">x{optRecord.quantity}</span>
+            </div>
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={optRecord.subOrderPayment}
+            >
+              <span className="text-[#8C8C8C]">合计：</span>
+              <span className="text-slate-700">
+                ￥{optRecord.subOrderPayment}
+              </span>
+            </div>
+          </Flex>
+          <Flex className="w-[10%]" vertical gap="small">
+            {/* 支付方式 */}
+            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <span className="text-slate-700">
+                {enumValueToLabel(
+                  optRecord.paymentMethod,
+                  PAYMENT_METHOD_OPTIONS,
+                )}
+              </span>
+            </div>
+            {/* 支付渠道 */}
+            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <span className="text-slate-700">
+                {enumValueToLabel(
+                  optRecord.paymentChannel,
+                  PAYMENT_CHANNEL_OPTIONS,
+                )}
+              </span>
+            </div>
+          </Flex>
+          <Flex className="w-[13%]" vertical gap="small">
+            {/* 所属部门 */}
+            <div
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              title={enumValueToLabel(
                 optRecord.productBelongBusiness,
                 PRODUCT_BELONG_DEPARTMENT_OPTIONS,
               )}
-            </span>
-          </div>
+            >
+              <span className="text-slate-700">
+                {enumValueToLabel(
+                  optRecord.productBelongBusiness,
+                  PRODUCT_BELONG_DEPARTMENT_OPTIONS,
+                )}
+              </span>
+            </div>
+
+            {/* 开票类型 */}
+            {getInvoicingType(optRecord) === undefined ? (
+              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <span className="text-slate-700">
+                  {getInvoicingType(optRecord)}
+                </span>
+              </div>
+            ) : (
+              ''
+            )}
-          {/* 开票类型 */}
-          {getInvoicingType(optRecord) === undefined ? (
+            {/* 开票状态 */}
             <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
               <span className="text-slate-700">
-                {getInvoicingType(optRecord)}
+                {enumValueToLabel(
+                  optRecord.afterInvoicingStatus,
+                  AFTER_INVOICING_STATUS,
+                )}
               </span>
             </div>
-          ) : (
-            ''
-          )}
-
-          {/* 开票状态 */}
-          <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-            <span className="text-slate-700">
-              {enumValueToLabel(
-                optRecord.afterInvoicingStatus,
-                AFTER_INVOICING_STATUS,
-              )}
-            </span>
-          </div>
-        </Flex>
+          </Flex>
-        <Flex className="w-[10%]" vertical gap="small">
-          {/* 开票状态 */}
-          <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-            <Tag
-              color={
-                optRecord.invoicingTime === null ||
-                optRecord.invoicingTime === undefined
-                  ? TAGS_COLOR.get(optRecord.invoicingStatus)
-                  : 'success'
-              }
-            >
-              {getNeedInvoicing(optRecord)}
-            </Tag>
-          </div>
-          {/* 订单状态 */}
-          <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-            {getOrderStatusTag(optRecord)}
-          </div>
-
-          {/* 物流信息 */}
-          <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' ? (
-              <MyToolTip
-                title={
-                  optRecord.serialNumber === undefined
-                    ? '暂无物流信息'
-                    : enumValueToLabel(
-                        optRecord.logisticsMethod,
-                        LOGISTICS_STATUS_OPTIONS,
-                      ) +
-                      '  ' +
-                      optRecord.serialNumber
-                }
-                content={
-                  <Button type="link" size="small" style={{ padding: 0 }}>
-                    物流信息
-                  </Button>
+          <Flex className="w-[10%]" vertical gap="small">
+            {/* 开票状态 */}
+            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              <Tag
+                color={
+                  optRecord.invoicingTime === null ||
+                  optRecord.invoicingTime === undefined
+                    ? TAGS_COLOR.get(optRecord.invoicingStatus)
+                    : 'success'
                 }
+              >
+                {getNeedInvoicing(optRecord)}
+              </Tag>
+            </div>
+            {/* 订单状态 */}
+            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+              {getOrderStatusTag(optRecord)}
+            </div>
+
+            {/* 物流信息 */}
+            <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' ? (
+                <MyToolTip
+                  title={
+                    optRecord.serialNumber === undefined
+                      ? '暂无物流信息'
+                      : enumValueToLabel(
+                          optRecord.logisticsMethod,
+                          LOGISTICS_STATUS_OPTIONS,
+                        ) +
+                        '  ' +
+                        optRecord.serialNumber
+                  }
+                  content={
+                    <Button type="link" size="small" style={{ padding: 0 }}>
+                      物流信息
+                    </Button>
+                  }
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          </Flex>
+          <Flex className="w-[18%]" wrap="wrap" gap="small">
+            {optRecord.subPath?.includes('sendProduct') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  optRecord.mainOrderId = record.id;
+                  setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
+                  setDeliverVisible(true);
+                  setIsSendProduct(true);
+                  setOrderCheckType(CHECK_TYPE.NORMAL);
+                }}
+              >
+                仓库发货
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {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('procureSend') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  optRecord.mainOrderId = record.id;
+                  setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
+                  setDeliverVisible(true);
+                  setIsSendProduct(true);
+                  setOrderCheckType(CHECK_TYPE.PROCURE);
+                }}
+              >
+                采购发货
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('queryAnnex') &&
+            optRecord.listAnnex?.length > 0 ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  optRecord.mainOrderId = record.id;
+                  setAttachmentModalVisible(true);
+                  setOrderRow(optRecord);
+                }}
+              >
+                附件
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('modifySendInformation') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  optRecord.mainOrderId = record.id;
+                  setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
+                  setDeliverVisible(true);
+                  setIsSendProduct(false);
+                }}
+              >
+                修改发货信息
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('printOrder') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={async () => {
+                  setOrderPrintVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderRow(record);
+                  setOrderCheckType(CHECK_TYPE.NORMAL);
+                }}
+              >
+                仓库打印
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('supplierPrint') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={async () => {
+                  setOrderPrintVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderRow(record);
+                  setOrderCheckType(CHECK_TYPE.SUPPLIER);
+                }}
+              >
+                供应商打印
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('procurePrint') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={async () => {
+                  setOrderPrintVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderRow(record);
+                  setOrderCheckType(CHECK_TYPE.PROCURE);
+                }}
+              >
+                采购打印
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('editOrder') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setFinancialVisible(true);
+                  setOrderRow(record);
+                  setSelectedRows([optRecord]);
+                  setIsFinalcialEdit(true);
+                }}
+              >
+                编辑
+              </Button>
+            ) : (
+              ''
+            )}
+            {optRecord.subPath?.includes('invoicing') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setFinancialVisible(true);
+                  setIsFinalcialEdit(false);
+                  setOrderRow(record);
+                  setSelectedRows([optRecord]);
+                  setIsMainOrder(false);
+                }}
+              >
+                开票
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('applyInvoicing') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setApplyForInvoicingVisible(true);
+                  setSelectedRows([optRecord]);
+                }}
+              >
+                申请开票
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('checkOrder') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setOrderRow(optRecord);
+                  setCheckVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderCheckType(CHECK_TYPE.NORMAL);
+                }}
+              >
+                审核
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {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"
+                type="link"
+                onClick={() => {
+                  setOrderPrintVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderRow(record);
+                  setIsRePrintOrder(true);
+                }}
+              >
+                重新打印
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('confirmReceipt') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setConfirmReceiptVisible(true);
+                  setOrderRow(optRecord);
+                }}
+              >
+                确认收货
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('applyAfterSales') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setAfterSalesDrawerVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderRow(record);
+                }}
+              >
+                申请售后
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('afterSalesCompletion') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="是否完成售后？"
+                text="完成售后"
+                onConfirm={async () => {
+                  let res = await postServiceOrderAfterSalesCompletion({
+                    data: { ids: [optRecord.id] },
+                  });
+                  if (res.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    refreshTable();
+                    return true;
+                  }
+                }}
               />
             ) : (
               ''
             )}
-          </div>
-        </Flex>
-        <Flex className="w-[18%]" wrap="wrap" gap="small">
-          {optRecord.subPath?.includes('sendProduct') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                optRecord.mainOrderId = record.id;
-                setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
-                setDeliverVisible(true);
-                setIsSendProduct(true);
-                setOrderCheckType(CHECK_TYPE.NORMAL);
-              }}
-            >
-              仓库发货
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {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('procureSend') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                optRecord.mainOrderId = record.id;
-                setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
-                setDeliverVisible(true);
-                setIsSendProduct(true);
-                setOrderCheckType(CHECK_TYPE.PROCURE);
-              }}
-            >
-              采购发货
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('queryAnnex') &&
-          optRecord.listAnnex?.length > 0 ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                optRecord.mainOrderId = record.id;
-                setAttachmentModalVisible(true);
-                setOrderRow(optRecord);
-              }}
-            >
-              附件
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('modifySendInformation') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                optRecord.mainOrderId = record.id;
-                setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
-                setDeliverVisible(true);
-                setIsSendProduct(false);
-              }}
-            >
-              修改发货信息
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('printOrder') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={async () => {
-                setOrderPrintVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderRow(record);
-                setOrderCheckType(CHECK_TYPE.NORMAL);
-              }}
-            >
-              仓库打印
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('supplierPrint') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={async () => {
-                setOrderPrintVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderRow(record);
-                setOrderCheckType(CHECK_TYPE.SUPPLIER);
-              }}
-            >
-              供应商打印
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('procurePrint') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={async () => {
-                setOrderPrintVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderRow(record);
-                setOrderCheckType(CHECK_TYPE.PROCURE);
-              }}
-            >
-              采购打印
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('editOrder') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setFinancialVisible(true);
-                setOrderRow(record);
-                setSelectedRows([optRecord]);
-                setIsFinalcialEdit(true);
-              }}
-            >
-              编辑
-            </Button>
-          ) : (
-            ''
-          )}
-          {optRecord.subPath?.includes('invoicing') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setFinancialVisible(true);
-                setIsFinalcialEdit(false);
-                setOrderRow(record);
-                setSelectedRows([optRecord]);
-                setIsMainOrder(false);
-              }}
-            >
-              开票
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('applyInvoicing') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setApplyForInvoicingVisible(true);
-                setSelectedRows([optRecord]);
-              }}
-            >
-              申请开票
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('checkOrder') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setOrderRow(optRecord);
-                setCheckVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderCheckType(CHECK_TYPE.NORMAL);
-              }}
-            >
-              审核
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {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"
-              type="link"
-              onClick={() => {
-                setOrderPrintVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderRow(record);
-                setIsRePrintOrder(true);
-              }}
-            >
-              重新打印
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('confirmReceipt') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setConfirmReceiptVisible(true);
-                setOrderRow(optRecord);
-              }}
-            >
-              确认收货
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('applyAfterSales') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setAfterSalesDrawerVisible(true);
-                setSelectedRows([optRecord]);
-                setOrderRow(record);
-              }}
-            >
-              申请售后
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('afterSalesCompletion') ? (
-            <ButtonConfirm
-              className="p-0"
-              title="是否完成售后？"
-              text="完成售后"
-              onConfirm={async () => {
-                let res = await postServiceOrderAfterSalesCompletion({
-                  data: { ids: [optRecord.id] },
-                });
-                if (res.result === RESPONSE_CODE.SUCCESS) {
-                  message.success(res.message);
-                  refreshTable();
-                  return true;
-                }
-              }}
-            />
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('noNeedSend') ? (
-            <ButtonConfirm
-              className="p-0"
-              title="此订单是否无需发货？"
-              text="无需发货"
-              onConfirm={async () => {
-                let res = await postServiceOrderNoNeedSend({
-                  data: { ids: [optRecord.id] },
-                });
-                if (res.result === RESPONSE_CODE.SUCCESS) {
-                  message.success(res.message);
-                  refreshTable();
-                  return true;
-                }
-              }}
-            />
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('viewImages') ? (
-            <Button
-              className="p-0"
-              type="link"
-              onClick={() => {
-                setSubOrderConfirmReceiptImagesVisible(true);
-                setOrderRow(optRecord);
-              }}
-            >
-              查看收货凭证
-            </Button>
-          ) : (
-            ''
-          )}
-
-          {optRecord.subPath?.includes('orderCancel') ? (
-            <ButtonConfirm
-              className="p-0"
-              title="确认作废？"
-              text="作废"
-              onConfirm={async () => {
-                let body = { ids: [optRecord.id], checkIsMainOrderId: false };
-                const data = await postServiceOrderOrderCancel({
-                  data: body,
-                });
-                if (data.result === RESPONSE_CODE.SUCCESS) {
-                  message.success(data.message);
-                  refreshTable();
-                }
-              }}
-            />
-          ) : (
-            ''
-          )}
+
+            {optRecord.subPath?.includes('noNeedSend') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="此订单是否无需发货？"
+                text="无需发货"
+                onConfirm={async () => {
+                  let res = await postServiceOrderNoNeedSend({
+                    data: { ids: [optRecord.id] },
+                  });
+                  if (res.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    refreshTable();
+                    return true;
+                  }
+                }}
+              />
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('viewImages') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setSubOrderConfirmReceiptImagesVisible(true);
+                  setOrderRow(optRecord);
+                }}
+              >
+                查看收货凭证
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('orderCancel') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="确认作废？"
+                text="作废"
+                onConfirm={async () => {
+                  let body = { ids: [optRecord.id], checkIsMainOrderId: false };
+                  const data = await postServiceOrderOrderCancel({
+                    data: body,
+                  });
+                  if (data.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(data.message);
+                    refreshTable();
+                  }
+                }}
+              />
+            ) : (
+              ''
+            )}
+          </Flex>
         </Flex>
-      </Flex>
+
+        {userInfo?.roleSmallVO?.code === 'admin' ||
+        userInfo?.roleSmallVO?.code === 'salesManager' ||
+        userInfo?.roleSmallVO?.code === 'salesRepresentative' ||
+        userInfo?.roleSmallVO?.code === 'finance' ? (
+          <Flex title={optRecord.notes}>
+            <div className="flex items-center">
+              <div className="flex items-center max-w-[500px]">
+                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <Tooltip
+                    title={optRecord.applyInvoicingNotes}
+                    placement="topLeft"
+                  >
+                    <span className="text-[#8C8C8C]">
+                      销售申请开票备注：
+                      {optRecord.applyInvoicingNotes === undefined ||
+                      optRecord.applyInvoicingNotes === null
+                        ? '暂无备注'
+                        : optRecord.applyInvoicingNotes}
+                    </span>
+                  </Tooltip>
+                </div>
+
+                {getAfterAnnexList()}
+              </div>
+              <Divider type="vertical" className="mx-5" />
+              <div className="flex items-center max-w-[500px]">
+                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <Tooltip title={optRecord.checkNotes} placement="topLeft">
+                    <span className="text-[#8C8C8C] mr-3">
+                      财务审核备注：
+                      {optRecord.checkNotes === undefined ||
+                      optRecord.checkNotes === null
+                        ? '暂无备注'
+                        : optRecord.checkNotes}
+                    </span>
+                  </Tooltip>
+                </div>
+
+                {getInvoicingCheckAnnexList()}
+              </div>
+            </div>
+          </Flex>
+        ) : (
+          ''
+        )}
+      </>
     );
   };
   const expandedRowRender = (record) => {