修改最后一批bug

boyang
1 parent a8280c01
Showing 20 changed files with 716 additions and 239 deletions
.env.development
.env.production
.env.test
src/api/project/invoice.ts
src/utils/pdfShow.ts
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
src/views/project/finance/pay/Commit.vue
src/views/project/finance/pay/DeductShow.vue
src/views/project/finance/pay/InvoiceShow.vue
src/views/project/finance/pay/InvoiceUpload.vue
src/views/project/finance/pay/TrackEdit.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/receive/Commit.vue
src/views/project/finance/receive/ReUploadBgUrl.vue
src/views/project/finance/receive/TrackEdit.vue
src/views/project/finance/receive/index.vue
src/views/project/finance/receive/receive.data.tsx
types/config.d.ts
vite.config.ts
@@ -12,3 +12,5 @@ VITE_GLOB_UPLOAD_URL=/upload
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=
+
+#VITE_ALIYUN_OSS_DOMAIN=https://test-alterego.oss-cn-qingdao.aliyuncs.com
 \ No newline at end of file
@@ -19,3 +19,5 @@ VITE_GLOB_UPLOAD_URL=/upload
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=
+
+#VITE_ALIYUN_OSS_DOMAIN=https://alterego.oss-cn-qingdao.aliyuncs.com
@@ -19,3 +19,5 @@ VITE_GLOB_UPLOAD_URL=/upload
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=
+
+#VITE_ALIYUN_OSS_DOMAIN=https://test-alterego.oss-cn-qingdao.aliyuncs.com
 \ No newline at end of file
+import { useOrderStoreWithOut } from '/@/store/modules/order';
 import { defHttp } from '/@/utils/http/axios';
 enum Api {
@@ -12,6 +13,8 @@ enum Api {
   INVOICE_DELETE = '/order/erp/invoice_bill/delete_by_id', //删除数据
   COMMIT = '/order/erp/invoice_bill/commit_apply', //提交审核
   GETINVOICEDEDUCTURL_BY_ID = '/order/erp/invoice_bill/getDeductUrl_by_id', //获取扣款信息
+  REUPLOADBGURL = '/order/erp/invoice_bill/reUploadBgUrl', //更新报关单
+  INVOICEEXPORTRECEIPT = '/order/erp/invoice_bill/exportReceipt', //收款单导出
   PRODUCT_CREATE = '/order/erp/check_bill/create', //创建生产科应付单据
   PAYED_DATE = '/order/erp/check_bill/get_payed_date', //获取生产科应回款日期
@@ -26,6 +29,7 @@ enum Api {
   EXPORT_CHECK_ANALYSIS = '/order/erp/check_bill/export', //导出分析列表
   GETDEDUCTURL_BY_ID = '/order/erp/check_bill/getDeductUrl_by_id', //获取扣款信息
   GETINVOICEURL_BY_ID = '/order/erp/check_bill/getInvoiceUrl_by_id', //获取扣款信息
+  EXPORTRECEIPT = '/order/erp/check_bill/exportReceipt', //付款单导出
 }
 export const getRefundDate = async (params: any, data?: any) => {
@@ -48,7 +52,14 @@ export const getInvoice = async (params: any) =&gt; {
     url: Api.INVOICE,
     params,
   });
-  return res.records;
+  const orderStore = useOrderStoreWithOut();
+  orderStore.setTotal(res.total);
+  return new Promise((resolve) => {
+    resolve({
+      items: res.records,
+      total: res.total,
+    });
+  });
 };
 export const getBaseInvoice = async (params: any) => {
   const res = await defHttp.post<any>({
@@ -137,8 +148,15 @@ export const getCheck = async (params: any) =&gt; {
     url: Api.CHECK_BILL,
     params,
   });
-  console.log(res, '5656check');
-  return res.records;
+  const orderStore = useOrderStoreWithOut();
+  orderStore.setTotal(res.total);
+  // return res.records;
+  return new Promise((resolve) => {
+    resolve({
+      items: res.records,
+      total: res.total,
+    });
+  });
 };
 export const checkDetail = async (params: any) => {
   return await defHttp.post<any>({
@@ -185,3 +203,24 @@ export const getInvoiceUrlById = async (params: any) =&gt; {
     params,
   });
 };
+
+export const reUploadBgUrl = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.REUPLOADBGURL,
+    params,
+  });
+};
+
+export const getExportReceipt = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.EXPORTRECEIPT,
+    params,
+  });
+};
+
+export const getInvoiceExportReceipt = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.INVOICEEXPORTRECEIPT,
+    params,
+  });
+};
+import { getAppEnvConfig } from '/@/utils/env';
+
+export async function downloadAndPreviewPDF(url) {
+  try {
+    // 使用 fetch 下载 PDF 数据
+    const response = await fetch(url);
+    if (!response.ok) throw new Error('PDF 下载失败');
+
+    // 转换为 Blob
+    const pdfBlob = await response.blob();
+
+    // 创建 Blob URL
+    const blobUrl = URL.createObjectURL(pdfBlob);
+
+    // 创建一个新窗口或iframe来预览 PDF
+    const pdfWindow = window.open(blobUrl, '_blank');
+    if (!pdfWindow) {
+      console.error('弹出窗口被阻止，无法预览 PDF');
+    }
+
+    // 可以在不需要时释放 Blob URL
+    pdfWindow.onunload = () => URL.revokeObjectURL(blobUrl);
+  } catch (error) {
+    console.error('出现错误:', error);
+  }
+}
+export const view = (url) => {
+  const { VITE_ALIYUN_OSS_DOMAIN } = getAppEnvConfig();
+  if (url) {
+    url = url.replace('https://test-alterego.oss-cn-qingdao.aliyuncs.com', '/aliyun-oss-pdf');
+  }
+  downloadAndPreviewPDF(url);
+};
@@ -15,7 +15,7 @@
           v-if="!isApproved"
           :actions="[
             {
-              label: '编辑',
+              label: '审核',
               // icon: 'ic:outline-delete-outline',
               onClick: handleDetail.bind(null, record),
             },
@@ -41,12 +41,13 @@
     @register="registerModal"
     title="申请信息"
     okText="通过"
+    width="900px"
     @ok="handleTrue"
     @visible-change="handleShow"
     :showCancelBtn="!isApproved && role === ROLE.ADMIN"
     :showOkBtn="!isApproved && role === ROLE.ADMIN"
   >
-    <Description
+    <!-- <Description
       v-if="!showInvoice"
       class="mt-4"
       layout="vertical"
@@ -54,7 +55,48 @@
       :column="2"
       :data="mockData"
       :schema="schema"
-    />
+    /> -->
+    <table
+      v-if="!showInvoice"
+      style="
+        width: 100%;
+        border-collapse: collapse;
+        text-align: center;
+        border: 1px solid black;
+        font-size: 16px;
+      "
+    >
+      <thead>
+        <!-- <tr>
+          <th colspan="4" style="border: 1px solid black">净利润分析表</th>
+        </tr> -->
+      </thead>
+      <tbody>
+        <tr
+          ><td colspan="7" style="text-align: center; font-weight: bold; font-size: 24px"
+            >付款单</td
+          ></tr
+        >
+        <tr>
+          <td style="border: 1px solid black; width: 14%">生产科对账单号</td>
+          <td style="border: 1px solid black; width: 14%">实际应付金额</td>
+          <td style="border: 1px solid black; width: 14%">扣款金额</td>
+          <td style="border: 1px solid black; width: 14%">实际付款金额</td>
+          <td style="border: 1px solid black; width: 14%">未付金额</td>
+          <td style="border: 1px solid black; width: 14%">必须付款日期</td>
+          <td style="border: 1px solid black; width: 14%">实际付款日期</td>
+        </tr>
+        <tr>
+          <td style="border: 1px solid black; width: 14%">{{ checkNo }}</td>
+          <td style="border: 1px solid black; width: 14%">¥{{ actualPayedAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">¥{{ deductAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">¥{{ totalActualPayedAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">¥{{ unPayedAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">{{ payedDate }}</td>
+          <td style="border: 1px solid black; width: 14%">{{ actualPayedDate }}</td>
+        </tr>
+      </tbody>
+    </table>
     <a v-if="showInvoice" @click="openPic(mockData.invoiceUrl)" rel="noopener noreferrer">{{
       mockData.invoiceName
     }}</a>
@@ -71,6 +113,7 @@
     </a-list> -->
     <template #appendFooter>
       <a-button v-if="!isApproved && role === ROLE.ADMIN" @click="handleFalse"> 不通过</a-button>
+      <a-button @click="handleExport"> 导出</a-button>
     </template>
   </BasicModal>
   <MsgModal v-if="msgVisible" @msg-modal-close="handleMsgModalClose" />
@@ -80,6 +123,9 @@
   import { computed, defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicModal, useModal } from '/@/components/Modal';
+  import { getExportReceipt } from '@/api/project/invoice';
+  import { view } from '@/utils/pdfShow';
+  import axios from 'axios';
   import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
   import { FIELDS_BASE_INFO, FIELDS_PROFIT_INFO, FIELDS_REPORT_INFO } from '../order/tableData';
@@ -122,6 +168,13 @@
       }
       const itemArray = ref<Item[]>([]);
       const actualPayCalculate = ref(0);
+      const checkNo = ref();
+      const actualPayedAmount = ref(); // 生产科实际应付金额汇总
+      const payedDate = ref(); // 生产科付款日期
+      const actualPayedDate = ref(); // 实际付款日期
+      const unPayedAmount = ref(); // 未付金额
+      const totalActualPayedAmount = ref(); // 实际付款金额汇总
+      const deductAmount = ref(); // 生产科扣款金额汇总
       const schema = [
         {
           field: 'actualPayedAmount',
@@ -161,7 +214,6 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            console.log(record, '5656record');
             if (record?.type === 40) {
               return record.createBy;
             } else if (record?.type == 50) {
@@ -270,6 +322,15 @@
         id.value = data.id;
         itemArray.value = [];
         mockData.value = data.fieldInfos.checkBillOrderDO;
+        console.log(mockData, '5656mockdata');
+        actualPayCalculate.value = mockData.value.actualPayCalculate; // 实际付款金额计算
+        checkNo.value = mockData.value.checkNo; // 对账单号
+        actualPayedAmount.value = mockData.value.actualPayedAmount; // 实际应付金额
+        payedDate.value = mockData.value.payedDate; // 付款日期
+        actualPayedDate.value = mockData.value.actualPayedDate; // 实际付款日期
+        unPayedAmount.value = mockData.value.unPayedAmount; // 未付金额
+        totalActualPayedAmount.value = mockData.value.totalActualPayedAmount; // 实际付款金额汇总
+        deductAmount.value = mockData.value.deductAmount; // 扣款金额
         const match = mockData.value.invoiceUrl.match(/aliyuncs\.com\/(.*?)\?/);
         if (match && match[1]) {
           // 对提取的部分进行解码
@@ -294,6 +355,67 @@
         // reload();
         // closeModal();
       }
+      async function handleExport() {
+        axios
+          .post(
+            '/basic-api/order/erp/check_bill/exportReceipt',
+            {
+              checkNo: checkNo.value,
+              actualPayedAmount: actualPayedAmount.value,
+              deductAmount: deductAmount.value,
+              totalActualPayedAmount: totalActualPayedAmount.value,
+              unPayedAmount: unPayedAmount.value,
+              payedDate: payedDate.value,
+              actualPayedDate: actualPayedDate.value,
+            },
+            {
+              responseType: 'blob', // 设置响应类型为 'blob'
+            },
+          )
+          .then((response) => {
+            // 创建一个 Blob 对象来保存二进制数据
+            const blob = new Blob([response.data], { type: 'application/octet-stream' });
+            const getFormattedDate = (): string => {
+              const date = new Date();
+
+              const year = date.getFullYear();
+              const month = String(date.getMonth() + 1).padStart(2, '0');
+              const day = String(date.getDate()).padStart(2, '0');
+
+              const hours = String(date.getHours()).padStart(2, '0');
+              const minutes = String(date.getMinutes()).padStart(2, '0');
+              const seconds = String(date.getSeconds()).padStart(2, '0');
+
+              return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+            };
+            const date = getFormattedDate();
+            // 创建一个链接元素用于下载
+            const link = document.createElement('a');
+            link.href = window.URL.createObjectURL(blob);
+            link.download = `业务/研发净利润分析${date}.xlsx`; // 你可以为文件命名
+            document.body.appendChild(link);
+            link.click(); // 自动点击链接，触发下载
+            console.log(link, 5656);
+            document.body.removeChild(link); // 下载完成后移除链接
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+        closeModal();
+      }
+      // async function handleExport() {
+      //   const res = await getExportReceipt({
+      //     checkNo: checkNo.value,
+      //     actualPayedAmount: actualPayedAmount.value,
+      //     deductAmount: deductAmount.value,
+      //     totalActualPayedAmount: totalActualPayedAmount.value,
+      //     unPayedAmount: unPayedAmount.value,
+      //     payedDate: payedDate.value,
+      //     actualPayedDate: actualPayedDate.value,
+      //   });
+      //   console.log(res, '5656res');
+      //   closeModal();
+      // }
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
@@ -314,16 +436,42 @@
         return false;
       };
-      function openPic(url) {
-        window.open('', '', '').document.write(`<!DOCTYPE html>
-          <html>
-            <body 
-                style="display: flex;
-                justify-content: center;
-                align-items: center;">
-              <img src='${url}' width="500px" height="500px"/>
-            </body>
-          </html>`);
+      // 新增的函数：判断 URL 是否为图片格式
+      function isImageUrl(url: string): boolean {
+        const imageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'svg'];
+        const baseUrl = url.split('?')[0];
+        return imageExtensions.some((ext) => baseUrl.toLowerCase().endsWith(ext));
+      }
+      // function openPic(url) {
+      //   window.open('', '', '').document.write(`<!DOCTYPE html>
+      //         <html>
+      //           <body
+      //               style="display: flex;
+      //               justify-content: center;
+      //               align-items: center;">
+      //             <img src='${url}' width="500px" height="500px"/>
+      //           </body>
+      //         </html>`);
+      // }
+      // 检查 URL 是否为 PDF 格式
+      function isPdfUrl(url: string): boolean {
+        return url.toLowerCase().endsWith('.pdf');
+      }
+      // 打开图片或 PDF
+      function openPic(url: string) {
+        const baseUrl = url.split('?')[0]; // 获取问号前的部分
+        if (isImageUrl(baseUrl)) {
+          window.open('', '', '').document.write(`<!DOCTYPE html>
+      <html>
+        <body style="display: flex; justify-content: center; align-items: center;">
+          <img src='${url}' width="500px" height="500px"/>
+        </body>
+      </html>`);
+        } else if (isPdfUrl(baseUrl)) {
+          view(url); // 新标签页打开 PDF
+        } else {
+          console.log('不支持的文件类型');
+        }
       }
       return {
@@ -350,6 +498,15 @@
         showInvoice,
         openPic,
         handleShow,
+        actualPayCalculate,
+        checkNo,
+        actualPayedAmount,
+        payedDate,
+        actualPayedDate,
+        unPayedAmount,
+        totalActualPayedAmount,
+        deductAmount,
+        handleExport,
       };
     },
   });
@@ -15,7 +15,7 @@
           v-if="!isApproved"
           :actions="[
             {
-              label: '编辑',
+              label: '审核',
               // icon: 'ic:outline-delete-outline',
               onClick: handleDetail.bind(null, record),
             },
@@ -39,20 +39,74 @@
     @register="registerModal"
     title="申请信息"
     okText="通过"
+    width="1000px"
     @ok="handleTrue"
+    @visible-change="handleShow"
     :showCancelBtn="!isApproved && role === ROLE.ADMIN"
     :showOkBtn="!isApproved && role === ROLE.ADMIN"
   >
-    <Description
+    <!-- <Description
       class="mt-4"
       layout="vertical"
       :collapseOptions="{ canExpand: true, helpMessage: 'help me' }"
       :column="2"
       :data="mockData"
       :schema="schema"
-    />
+    /> -->
+    <table
+      v-if="!showInvoice"
+      style="
+        width: 100%;
+        border-collapse: collapse;
+        text-align: center;
+        border: 1px solid black;
+        font-size: 16px;
+      "
+    >
+      <thead>
+        <!-- <tr>
+          <th colspan="4" style="border: 1px solid black">净利润分析表</th>
+        </tr> -->
+      </thead>
+      <tbody>
+        <tr
+          ><td colspan="7" style="text-align: center; font-weight: bold; font-size: 24px"
+            >收款单</td
+          ></tr
+        >
+        <tr>
+          <td style="border: 1px solid black; width: 14%">Invoice编号</td>
+          <td style="border: 1px solid black; width: 14%">实际收款金额汇总</td>
+          <td style="border: 1px solid black; width: 14%">客户总价金额汇总</td>
+          <td style="border: 1px solid black; width: 14%">发生扣款金额汇总</td>
+          <td style="border: 1px solid black; width: 14%">必须回款日期</td>
+          <td style="border: 1px solid black; width: 14%">实际回款日期</td>
+          <td style="border: 1px solid black; width: 14%">其他费用汇总</td>
+        </tr>
+        <tr>
+          <td style="border: 1px solid black; width: 14%">{{ invoiceNo }}</td>
+          <td style="border: 1px solid black; width: 14%">${{ totalPayAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">${{ totalCustomerAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">${{ deductAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">{{ backRefundDate }}</td>
+          <td style="border: 1px solid black; width: 14%">{{ actualRefundDate }}</td>
+          <td style="border: 1px solid black; width: 14%">${{ otherAmount }}</td>
+        </tr>
+        <tr>
+          <td colspan="7" style="border: 1px solid black; padding: 10px">
+            <div style="display: flex; justify-content: space-between">
+              <span style="width: 20%">收款单位：</span>
+              <span style="width: 80%">
+                {{ payee }}
+              </span>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
     <template #appendFooter>
       <a-button v-if="!isApproved && role === ROLE.ADMIN" @click="handleFalse"> 不通过</a-button>
+      <a-button @click="handleExport"> 导出</a-button>
     </template>
   </BasicModal>
   <MsgModal v-if="msgVisible" @msg-modal-close="handleMsgModalClose" />
@@ -62,6 +116,7 @@
   import { computed, defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicModal, useModal } from '/@/components/Modal';
+  import axios from 'axios';
   import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
   import { FIELDS_BASE_INFO, FIELDS_PROFIT_INFO, FIELDS_REPORT_INFO } from '../order/tableData';
@@ -95,6 +150,14 @@
       const fieldInfos = ref({});
       const baseInfos = ref({});
       const id = ref('');
+      const invoiceNo = ref(); // 实际收款金额汇总
+      const totalPayAmount = ref(); // 实际收款金额汇总
+      const totalCustomerAmount = ref(); // 客户总价金额汇总
+      const deductAmount = ref(); // 发生扣款金额汇总
+      const backRefundDate = ref(); // 必须回款日期
+      const actualRefundDate = ref(); // 实际回款日期
+      const otherAmount = ref(); // 其他费用汇总
+      const payee = ref(); // 其他费用汇总
       const mockData = ref();
       const schema: DescItem[] = [
@@ -226,6 +289,14 @@
         openModal(true, { data });
         mockData.value = data.fieldInfos.invoiceBillOrderDO;
         id.value = data.id;
+        totalPayAmount.value = mockData.value.totalPayAmount;
+        totalCustomerAmount.value = mockData.value.totalCustomerAmount;
+        deductAmount.value = mockData.value.deductAmount;
+        backRefundDate.value = mockData.value.backRefundDate;
+        actualRefundDate.value = mockData.value.actualRefundDate;
+        otherAmount.value = mockData.value.otherAmount;
+        invoiceNo.value = mockData.value.invoiceNo;
+        payee.value = mockData.value.payee;
       }
       async function handleTrue() {
@@ -241,6 +312,11 @@
         // closeModal();
       }
+      function handleShow(visible: boolean) {
+        if (!visible) {
+        }
+      }
+
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
       });
@@ -260,6 +336,55 @@
         return false;
       };
+      // 定义处理导出的函数
+      const handleExport = async () => {
+        try {
+          console.log(payee.value, '5656payee.value');
+          const response = await axios.post(
+            '/basic-api/order/erp/invoice_bill/exportReceipt',
+            {
+              invoiceNo: invoiceNo.value,
+              totalPayAmount: totalPayAmount.value,
+              totalCustomerAmount: totalCustomerAmount.value,
+              deductAmount: deductAmount.value,
+              backRefundDate: backRefundDate.value,
+              actualRefundDate: actualRefundDate.value,
+              otherAmount: otherAmount.value,
+              payee: payee.value,
+            },
+            {
+              responseType: 'blob', // 设置响应类型为 'blob'
+            },
+          );
+
+          // 创建一个 Blob 对象来保存二进制数据
+          const blob = new Blob([response.data], { type: 'application/octet-stream' });
+
+          // 获取格式化的当前日期
+          const getFormattedDate = () => {
+            const date = new Date();
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            const hours = String(date.getHours()).padStart(2, '0');
+            const minutes = String(date.getMinutes()).padStart(2, '0');
+            return `${year}-${month}-${day} ${hours}:${minutes}`;
+          };
+
+          const date = getFormattedDate();
+
+          // 创建一个链接元素用来下载文件
+          const link = document.createElement('a');
+          link.href = window.URL.createObjectURL(blob);
+          link.download = `付款单_${date}.xlsx`; // 文件命名
+          document.body.appendChild(link);
+          link.click(); // 自动点击链接，触发下载
+          document.body.removeChild(link); // 下载完成后移除链接
+        } catch (error) {
+          console.error('获取付款单时出错:', error);
+        }
+      };
+
       return {
         handleProfitModal,
         registerTable,
@@ -281,6 +406,16 @@
         handlePreview,
         mockData,
         schema,
+        totalPayAmount,
+        totalCustomerAmount,
+        deductAmount,
+        backRefundDate,
+        actualRefundDate,
+        otherAmount,
+        invoiceNo,
+        payee,
+        handleExport,
+        handleShow,
       };
     },
   });
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="提交审核"
+    width="500px"
+    :bodyStyle="{ height: '240px' }"
+    @ok="handleOk"
+  >
+    请选择日期：
+    <a-date-picker v-model:value="date" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref } from 'vue';
+  import type { Dayjs } from 'dayjs';
+  import { checkCommit } from '@/api/project/invoice';
+
+  const id = ref();
+  const date = ref();
+
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    id.value = data.data.id;
+  });
+  function formatDate(input: string): string {
+    // 创建一个 Date 对象
+    const date = new Date(input);
+
+    // 获取年月日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，所以要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+
+    // 返回格式化后的日期字符串
+    return `${year}-${month}-${day}`;
+  }
+
+  async function handleOk() {
+    const formattedDate = formatDate(date.value);
+
+    checkCommit({ id: id.value, actualPayedDate: formattedDate });
+    closeModal();
+  }
+</script>
@@ -13,7 +13,20 @@
           <a-list-item-meta>
             <template #title>
               <!-- <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a> -->
-              <a @click="openPic(item.url)">{{ item.name }}</a>
+              <a
+                v-if="isImageUrl(item.url)"
+                @click="openPic(item.url)"
+                style="display: flex; align-items: center"
+              >
+                <img
+                  :src="item.url"
+                  alt="Image"
+                  style="max-width: 150px; max-height: 150px; margin-right: 10px"
+                />
+                {{ item.name }}
+              </a>
+              <a v-else @click="openPic(item.url)">{{ item.name }}</a>
+              <!-- <a @click="openPic(item.url)">{{ item.name }}</a> -->
             </template>
           </a-list-item-meta>
         </a-list-item>
@@ -28,6 +41,7 @@
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { message } from 'ant-design-vue';
   import { getDeductUrlById } from '@/api/project/invoice';
+  import { view } from '@/utils/pdfShow';
   interface Item {
     name: string;
@@ -53,15 +67,42 @@
     itemArray.value = [];
     closeModal();
   }
-  function openPic(url) {
-    window.open('', '', '').document.write(`<!DOCTYPE html>
-          <html>
-            <body 
-                style="display: flex;
-                justify-content: center;
-                align-items: center;">
-              <img src='${url}' width="500px" height="500px"/>
-            </body>
-          </html>`);
+
+  // 新增的函数：判断 URL 是否为图片格式
+  function isImageUrl(url: string): boolean {
+    const imageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'svg'];
+    const baseUrl = url.split('?')[0];
+    return imageExtensions.some((ext) => baseUrl.toLowerCase().endsWith(ext));
+  }
+  // function openPic(url) {
+  //   window.open('', '', '').document.write(`<!DOCTYPE html>
+  //         <html>
+  //           <body
+  //               style="display: flex;
+  //               justify-content: center;
+  //               align-items: center;">
+  //             <img src='${url}' width="500px" height="500px"/>
+  //           </body>
+  //         </html>`);
+  // }
+  // 检查 URL 是否为 PDF 格式
+  function isPdfUrl(url: string): boolean {
+    return url.toLowerCase().endsWith('.pdf');
+  }
+  // 打开图片或 PDF
+  function openPic(url: string) {
+    const baseUrl = url.split('?')[0]; // 获取问号前的部分
+    if (isImageUrl(baseUrl)) {
+      window.open('', '', '').document.write(`<!DOCTYPE html>
+      <html>
+        <body style="display: flex; justify-content: center; align-items: center;">
+          <img src='${url}' width="500px" height="500px"/>
+        </body>
+      </html>`);
+    } else if (isPdfUrl(baseUrl)) {
+      view(url); // 新标签页打开 PDF
+    } else {
+      console.log('不支持的文件类型');
+    }
   }
 </script>
@@ -13,7 +13,7 @@
           <a-list-item-meta>
             <template #title>
               <!-- <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a> -->
-              <a @click="openPic(item.url)">{{ item.name }}</a>
+              <a @click="view(item.url)">{{ item.name }}</a>
             </template>
           </a-list-item-meta>
         </a-list-item>
@@ -28,6 +28,7 @@
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { message } from 'ant-design-vue';
   import { getDeductUrlById, getInvoiceUrlById } from '@/api/project/invoice';
+  import { view } from '@/utils/pdfShow';
   interface Item {
     name: string;
@@ -53,15 +54,4 @@
     itemArray.value = [];
     closeModal();
   }
-  function openPic(url) {
-    window.open('', '', '').document.write(`<!DOCTYPE html>
-          <html>
-            <body 
-                style="display: flex;
-                justify-content: center;
-                align-items: center;">
-              <img src='${url}' width="500px" height="500px"/>
-            </body>
-          </html>`);
-  }
 </script>
@@ -62,10 +62,11 @@
   const fileList = ref<UploadProps['fileList']>([]);
   async function handleOk() {
-    await updateInvoiceInfo({
-      id: id.value,
-      invoiceUrl: invoiceUrl.value,
-    });
+    console.log(invoiceUrl.value, '5656invoiceUrl.value');
+    // await updateInvoiceInfo({
+    //   id: id.value,
+    //   invoiceUrl: invoiceUrl.value,
+    // });
     // await updateDeduct(requestData);
     fileList.value = [];
     emit('success');
@@ -30,6 +30,12 @@
           v-model:value="selectedProductionDepartment"
           :options="productionDepartmentOptions"
         /> -->
+        <!-- <a-select
+          ref="select"
+          style="width: 100%"
+          v-model:value="productionDepartment"
+          :options="productDepartmentOptions"
+        /> -->
         <div style="margin: 16px 0"></div>
         <div>上传扣款单</div
         ><a-space direction="vertical" style="width: 100%" size="large">
@@ -73,8 +79,10 @@
   //   const { productionDepartment } = useOrderInfo(orderStore);
   //   console.log(productionDepartment.value, '565656565665orderStore1');
   // });
-
-  const input1 = ref();
+  const orderStore = useOrderStoreWithOut();
+  const { productionDepartment: productDepartmentOptions } = useOrderInfo(orderStore);
+  const productionDepartment = ref();
+  const input1 = ref(0);
   const deductUrl = ref();
   const id = ref();
   const checkNo = ref();
@@ -88,12 +96,10 @@
   const status = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
-    console.log(data, '5656trackeditdata');
     status.value = data.data.status;
     id.value = data.data.id;
     checkNo.value = data.data.checkNo;
     input1.value = data.data.deductAmount;
-    console.log(input1.value, '5656input1.value');
     deductDept.value = data.data.deductDept;
     deductUrl.value = data.data.deductUrl;
     deductUrlOld.value = data.data.deductUrl;
@@ -112,34 +118,29 @@
     updateDeductUrl.value = uploadUrl.value + info.name;
   }
   function handleShow() {
-    input1.value = '';
-    deductUrl.value = '';
-    deductDept.value = '';
-    updateDeductUrl.value = '';
-    fileList.value = [];
+    // input1.value = '';
+    // deductUrl.value = '';
+    // deductDept.value = '';
+    // updateDeductUrl.value = '';
+    // fileList.value = [];
   }
   //完成编辑
   async function handleSubmit() {
     console.log(input1.value, deductUrl.value, deductDept.value, '5656ddd');
-    if (!input1.value || deductUrl.value == '' || !deductDept.value) {
+    if (!input1.value || !deductDept.value) {
       error('选项不能为空');
     } else {
-      //没传新扣款单，不传url
-      if (deductUrl.value == deductUrlOld.value || deductUrl.value == '') {
-        error('请上传扣款单');
-      } else {
-        await updateDeductInfo({
-          id: id.value,
-          checkNo: checkNo.value,
-          deductAmount: input1.value,
-          deductDept: deductDept.value,
-          deductUrl: deductUrl.value,
-        });
-        // productionDepartment: selectedProductionDepartment.value,
-        fileList.value = [];
-        emit('success');
-        closeDrawer();
-      }
+      await updateDeductInfo({
+        id: id.value,
+        checkNo: checkNo.value,
+        deductAmount: input1.value,
+        deductDept: deductDept.value,
+        deductUrl: deductUrl.value,
+      });
+      // productionDepartment: selectedProductionDepartment.value,
+      fileList.value = [];
+      emit('success');
+      closeDrawer();
     }
   }
 </script>
@@ -15,6 +15,7 @@
         <CheckDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
         <InvoiceShow @register="registerInvoiceShow" />
+        <Commit @register="registerCommit" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -36,12 +37,12 @@
             :dropDownActions="[
               {
                 label: '提交审核',
-                popConfirm: {
-                  title: '是否确认提交审核',
-                  placement: 'left',
-                  confirm: handleCommit.bind(null, record),
-                },
-                // onClick: handleCommit.bind(null, record),
+                // popConfirm: {
+                //   title: '是否确认提交审核',
+                //   placement: 'left',
+                //   confirm: handleCommit.bind(null, record),
+                // },
+                onClick: handleCommit.bind(null, record),
               },
               {
                 label: '订单信息',
@@ -82,6 +83,7 @@
   import CheckSum from './CheckSum.vue';
   import DeductShow from './DeductShow.vue';
   import InvoiceShow from './InvoiceShow.vue';
+  import Commit from './Commit.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useModal } from '/@/components/Modal';
   import { getCheck, checkDelete, checkCommit, checkDetail } from '@/api/project/invoice';
@@ -93,6 +95,7 @@
   const [registerTrackEdit, { openDrawer: openTrackEdit }] = useDrawer();
   const [registerInvoiceUpload, { openModal: openInvoiceUpload }] = useModal();
   const [registerDeductShow, { openModal: openDeductShow }] = useModal();
+  const [registerCommit, { openModal: openCommit }] = useModal();
   const [registerInvoiceShow, { openModal: openInvoiceShow }] = useModal();
   const [registerInvoiceDetail, { openDrawer: openCheckDetail }] = useDrawer();
   const checkedKeys = ref<Array<string | number>>([]);
@@ -110,7 +113,7 @@
     clickToRowSelect: false,
     rowKey: 'id',
     pagination: {
-      pageSize: 20,
+      pageSize: 10,
     },
     rowSelection: {
       type: 'checkbox',
@@ -136,117 +139,6 @@
       // slots: { customRender: 'action' },
     },
   });
-  //选择
-  // function onSelect(record, selected) {
-  //   if (selected) {
-  //     checkedKeys.value = [...checkedKeys.value, record.id];
-  //   } else {
-  //     checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
-  //   }
-  // }
-  // function onSelectAll(selected, selectedRows, changeRows) {
-  //   const changeIds = changeRows.map((item) => item.id);
-  //   if (selected) {
-  //     checkedKeys.value = [...checkedKeys.value, ...changeIds];
-  //   } else {
-  //     checkedKeys.value = checkedKeys.value.filter((id) => {
-  //       return !changeIds.includes(id);
-  //     });
-  //   }
-  // }
-
-  // type CustomerCodeEntry = [string, number]; // 定义二维数组类型 [customerCode, count]
-
-  // const selectedCustomCodes = ref<CustomerCodeEntry[]>([]); // 创建一个二维数组的 ref
-
-  // // 选择函数
-  // async function onSelect(record: any, selected: boolean) {
-  //   if (selected) {
-  //     const res = await checkDetail({ checkNo: record.checkNo });
-  //     const customerCode = res[0].customerCode;
-
-  //     const index = selectedCustomCodes.value.findIndex(([code]) => code === customerCode);
-
-  //     if (index !== -1) {
-  //       // 如果存在，增加计数
-  //       selectedCustomCodes.value[index][1] += 1;
-  //     } else {
-  //       // 如果不存在，添加新项 [customerCode, 1]
-  //       selectedCustomCodes.value.push([customerCode, 1]);
-  //     }
-
-  //     checkedKeys.value = [...checkedKeys.value, record.id];
-  //   } else {
-  //     const res = await checkDetail({ checkNo: record.checkNo });
-  //     const customerCode = res[0].customerCode;
-
-  //     const index = selectedCustomCodes.value.findIndex(([code]) => code === customerCode);
-
-  //     if (index !== -1) {
-  //       if (selectedCustomCodes.value[index][1] > 1) {
-  //         // 如果计数大于 1，减少计数
-  //         selectedCustomCodes.value[index][1] -= 1;
-  //       } else {
-  //         // 如果计数为 1，移除该项
-  //         selectedCustomCodes.value.splice(index, 1);
-  //       }
-  //     }
-
-  //     checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
-  //   }
-  //   console.log(selectedCustomCodes.value, 56561);
-  //   console.log(checkedKeys.value, 56562);
-  // }
-
-  // async function onSelectAll(selected: boolean, selectedRows: any[], changeRows: any[]) {
-  //   const changeIds = changeRows.map((item) => item.id);
-  //   const changeCustomerCodes = await Promise.all(
-  //     changeRows.map(async (item) => {
-  //       const res = await checkDetail({ checkNo: item.checkNo });
-  //       return res[0].customerCode;
-  //     }),
-  //   );
-
-  //   if (selected) {
-  //     // 添加到 checkedKeys
-  //     checkedKeys.value = [...checkedKeys.value, ...changeIds];
-
-  //     // 处理每个 customerCode
-  //     changeCustomerCodes.forEach((code) => {
-  //       const index = selectedCustomCodes.value.findIndex(
-  //         ([customerCode]) => customerCode === code,
-  //       );
-  //       if (index !== -1) {
-  //         // 如果存在，增加计数
-  //         selectedCustomCodes.value[index][1] += 1;
-  //       } else {
-  //         // 如果不存在，添加新项 [customerCode, 1]
-  //         selectedCustomCodes.value.push([code, 1]);
-  //       }
-  //     });
-  //   } else {
-  //     // 从 checkedKeys 中移除
-  //     checkedKeys.value = checkedKeys.value.filter((id) => !changeIds.includes(id));
-
-  //     // 处理每个 customerCode
-  //     changeCustomerCodes.forEach((code) => {
-  //       const index = selectedCustomCodes.value.findIndex(
-  //         ([customerCode]) => customerCode === code,
-  //       );
-  //       if (index !== -1) {
-  //         if (selectedCustomCodes.value[index][1] > 1) {
-  //           // 如果计数大于 1，减少计数
-  //           selectedCustomCodes.value[index][1] -= 1;
-  //         } else {
-  //           // 如果计数为 1，移除该项
-  //           selectedCustomCodes.value.splice(index, 1);
-  //         }
-  //       }
-  //     });
-  //   }
-  //   console.log(selectedCustomCodes.value, 56561);
-  //   console.log(checkedKeys.value, 56562);
-  // }
   //选择算法：创建二维数组，使客户编码和生产科相同
   type CustomerCodeEntry = [string, number]; // 定义二维数组类型 [customerCode, count]
   type ProductionDepartmentEntry = [string, number]; // 定义二维数组类型 [productionDepartment, count]
@@ -429,17 +321,17 @@
     });
   }
   function handleCommit(record) {
-    const currentDate: string = (() => {
-      const date = new Date();
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
-      const day = String(date.getDate()).padStart(2, '0');
-      return `${year}-${month}-${day}`;
-    })();
-    checkCommit({ id: record.id, actualPayedDate: currentDate });
-    setTimeout(() => {
-      reload();
-    }, 50);
+    // const currentDate: string = (() => {
+    //   const date = new Date();
+    //   const year = date.getFullYear();
+    //   const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
+    //   const day = String(date.getDate()).padStart(2, '0');
+    //   return `${year}-${month}-${day}`;
+    // })();
+    // checkCommit({ id: record.id, actualPayedDate: currentDate });
+    openCommit(true, {
+      data: record,
+    });
   }
   const { createMessage } = useMessage();
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="提交审核"
+    width="500px"
+    :bodyStyle="{ height: '240px' }"
+    @ok="handleOk"
+  >
+    请选择日期：
+    <a-date-picker v-model:value="date" />
+    <div style="height: 10px"></div>
+    请选择收款单位：
+    <a-select v-model="payee" style="width: 100%; padding: 5px; border-radius: 4px">
+      <option value="翱特建行城阳支行-美元(5107)">翱特建行城阳支行-美元(5107)</option>
+      <option value="吉庆建行城阳支行-美元(4820)">吉庆建行城阳支行-美元(4820)</option>
+    </a-select>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref } from 'vue';
+  import { commit } from '@/api/project/invoice';
+
+  const id = ref();
+  const payee = ref();
+  const date = ref();
+
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    id.value = data.data.id;
+  });
+  function formatDate(input: string): string {
+    // 创建一个 Date 对象
+    const date = new Date(input);
+
+    // 获取年月日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，所以要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+
+    // 返回格式化后的日期字符串
+    return `${year}-${month}-${day}`;
+  }
+
+  async function handleOk() {
+    const formattedDate = formatDate(date.value);
+
+    commit({ id: id.value, actualRefundDate: formattedDate, payee: payee.value });
+    closeModal();
+  }
+</script>
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="更新报关单"
+    width="500px"
+    :bodyStyle="{ height: '240px' }"
+    @ok="handleOk"
+  >
+    <div>报关单(请上传PDF格式)</div
+    ><a-space direction="vertical" style="width: 100%" size="large">
+      <a-upload
+        v-model:file-list="fileList"
+        :beforeUpload="beforeUpload"
+        list-type="picture"
+        :max-count="1"
+        :action="uploadUrl"
+        @change="handleChange"
+      >
+        <a-button> 上传报关单 </a-button>
+      </a-upload>
+    </a-space>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref } from 'vue';
+  import type { UploadProps } from 'ant-design-vue';
+  import { reUploadBgUrl } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const fileList = ref<UploadProps['fileList']>([]);
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
+
+  const id = ref();
+  const uploadUrl = ref('http://47.104.8.35:8081/api/localStorage/upload_file_oss?name=');
+  const bgUrl = ref();
+
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    id.value = data.data.id;
+  });
+  function handleChange(info) {
+    if (info.file.status == 'done') {
+      bgUrl.value = info.file.response.data.fileUrl;
+    }
+  }
+  function beforeUpload(info) {
+    uploadUrl.value += info.name;
+  }
+
+  async function handleOk() {
+    console.log(bgUrl.value, '5656bgUrl.value', uploadUrl.value);
+    reUploadBgUrl({ id: id.value, bgUrl: bgUrl.value });
+    closeModal();
+  }
+</script>
@@ -51,7 +51,7 @@
   const emit = defineEmits(['success']);
   const fileList = ref<UploadProps['fileList']>([]);
-  const input1 = ref();
+  const input1 = ref(0);
   const deductUrl = ref();
   const id = ref();
   const invoiceNo = ref();
@@ -85,31 +85,33 @@
     updateDeductUrl.value = uploadUrl.value + info.name;
   }
   function handleShow() {
-    input1.value = '';
+    // if (!visible) {
+    input1.value = 0;
     deductUrl.value = '';
     updateDeductUrl.value = '';
     fileList.value = [];
+    // }
+    // input1.value = '';
+    // deductUrl.value = '';
+    // updateDeductUrl.value = '';
+    // fileList.value = [];
   }
   //完成编辑
   async function handleSubmit() {
     console.log(input1.value, '5656', deductUrl.value);
-    if (!input1.value || deductUrl.value == '') {
+    if (!input1.value) {
       error('选项不能为空');
     } else {
-      if (deductUrl.value == deductUrlOld.value || deductUrl.value == '') {
-        error('请上传扣款单');
-      } else {
-        await updateDeduct({
-          id: id.value,
-          invoiceNo: invoiceNo.value,
-          deductAmount: input1.value,
-          deductUrl: deductUrl.value,
-        });
-        fileList.value = [];
-        emit('success');
-        closeDrawer();
-      }
+      await updateDeduct({
+        id: id.value,
+        invoiceNo: invoiceNo.value,
+        deductAmount: input1.value,
+        deductUrl: deductUrl.value,
+      });
+      fileList.value = [];
+      emit('success');
+      closeDrawer();
     }
   }
 </script>
@@ -13,6 +13,8 @@
         <TrackEdit @register="registerTrackEdit" @success="handleSuccess" />
         <InvoiceDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
+        <Commit @register="registerCommit" />
+        <ReUploadBgUrl @register="registerReUploadBgUrl" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -28,12 +30,12 @@
               },
               {
                 label: '提交审核',
-                popConfirm: {
-                  title: '是否确认提交审核',
-                  placement: 'left',
-                  confirm: handleCommit.bind(null, record),
-                },
-                // onClick: handleCommit.bind(null, record),
+                // popConfirm: {
+                //   title: '是否确认提交审核',
+                //   placement: 'left',
+                //   confirm: handleCommit.bind(null, record),
+                // },
+                onClick: handleCommit.bind(null, record),
               },
             ]"
             :dropDownActions="[
@@ -42,6 +44,10 @@
                 onClick: handleInvoiceDetail.bind(null, record),
               },
               {
+                label: '更新报关单',
+                onClick: handleReUploadBgUrl.bind(null, record),
+              },
+              {
                 label: '删除',
                 popConfirm: {
                   title: '是否确认删除',
@@ -70,6 +76,8 @@
   import InvoiceAnalysis from './InvoiceAnalysis.vue';
   import InvoiceDetail from './InvoiceDetail.vue';
   import DeductShow from './DeductShow.vue';
+  import Commit from './Commit.vue';
+  import ReUploadBgUrl from './ReUploadBgUrl.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { getInvoice, deleteInvoice, commit, getBaseInvoice } from '@/api/project/invoice';
   import { useModal } from '/@/components/Modal';
@@ -84,6 +92,8 @@
   const [registerFinanceEdit, { openDrawer: openFinanceEdit }] = useDrawer();
   const [registerTrackEdit, { openDrawer: openTrackEdit }] = useDrawer();
   const [registerInvoiceDetail, { openDrawer: openInvoiceDetail }] = useDrawer();
+  const [registerCommit, { openModal: openCommit }] = useModal();
+  const [registerReUploadBgUrl, { openModal: openReUploadBgUrl }] = useModal();
   const [registerDeductShow, { openModal: openDeductShow }] = useModal();
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStoreWithOut();
@@ -109,9 +119,6 @@
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
     },
-    pagination: {
-      pageSize: 20,
-    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -240,23 +247,31 @@
     });
   }
   function handleCommit(record) {
-    const currentDate: string = (() => {
-      const date = new Date();
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
-      const day = String(date.getDate()).padStart(2, '0');
-      return `${year}-${month}-${day}`;
-    })();
-    commit({ id: record.id, actualRefundDate: currentDate });
-    setTimeout(() => {
-      reload();
-    }, 50);
+    // const currentDate: string = (() => {
+    //   const date = new Date();
+    //   const year = date.getFullYear();
+    //   const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
+    //   const day = String(date.getDate()).padStart(2, '0');
+    //   return `${year}-${month}-${day}`;
+    // })();
+    // commit({ id: record.id, actualRefundDate: currentDate });
+    // setTimeout(() => {
+    //   reload();
+    // }, 50);
+    openCommit(true, {
+      data: record,
+    });
   }
   function handleInvoiceDetail(record) {
     openInvoiceDetail(true, {
       data: record,
     });
   }
+  function handleReUploadBgUrl(record) {
+    openReUploadBgUrl(true, {
+      data: record,
+    });
+  }
   const { createMessage } = useMessage();
   const { error } = createMessage;
   function handleInvoiceAnalysis(record) {
@@ -4,6 +4,7 @@ import { icon } from &#39;ant-design-vue&#39;;
 import { FilePptOutlined } from '@ant-design/icons-vue';
 import { size } from 'lodash-es';
 import { ref } from 'vue';
+import { view } from '@/utils/pdfShow';
 export const searchFormSchema: FormSchema[] = [
   {
@@ -49,7 +50,7 @@ export const columns: BasicColumn[] = [
     width: 80,
     customRender: (column) => {
       const bgUrl = column.record.bgUrl;
-      return <FilePptOutlined style="font-size:25px" onClick={() => window.open(bgUrl)} />;
+      return <FilePptOutlined style="font-size:25px" onClick={() => view(bgUrl)} />;
     },
   },
   {
@@ -157,4 +157,5 @@ export interface GlobEnvConfig {
   VITE_GLOB_API_URL_PREFIX?: string;
   // Upload url
   VITE_GLOB_UPLOAD_URL?: string;
+  VITE_ALIYUN_OSS_DOMAIN?: string;
 }
 import { defineApplicationConfig } from '@vben/vite-config';
+import { getAppEnvConfig } from '/@/utils/env';
+// const { VITE_ALIYUN_OSS_DOMAIN } = getAppEnvConfig();
 export default defineApplicationConfig({
   overrides: {
     // build: {
@@ -19,6 +21,14 @@ export default defineApplicationConfig({
     },
     server: {
       proxy: {
+        // '/aliyun-oss-pdf': {
+        //   target: VITE_ALIYUN_OSS_DOMAIN,
+        //   changeOrigin: true,
+        //   secure: true, // 确保使用 HTTPS
+        //   rewrite(path) {
+        //     return path.replace(/^\/aliyun-oss-pdf/, '');
+        //   },
+        // },
         '/basic-api/order': {
           target: 'http://47.104.8.35:18001',
           // target: 'http://localhost:8001',