修改应付应收小数点

boyang
1 parent d4ba96aa
Showing 18 changed files with 303 additions and 86 deletions
src/api/project/invoice.ts
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
src/views/project/finance/pay/CheckDetail.vue
src/views/project/finance/pay/CheckSum.vue
src/views/project/finance/pay/Commit.vue
src/views/project/finance/pay/DeductShow.vue
src/views/project/finance/pay/FinanceEdit.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/pay/pay.data.tsx
src/views/project/finance/receive/Commit.vue
src/views/project/finance/receive/DeductShow.vue
src/views/project/finance/receive/FinanceEdit.vue
src/views/project/finance/receive/InvoiceAnalysis.vue
src/views/project/finance/receive/TrackEdit.vue
src/views/project/finance/receive/index.vue
src/views/project/finance/receive/receive.data.tsx
vite.config.ts
@@ -52,11 +52,24 @@ export const getInvoice = async (params: any) =&gt; {
     url: Api.INVOICE,
     params,
   });
+  const formattedRecords = res.records.map((record: any) => {
+    return {
+      ...record,
+      actualPayedAmount1: record.actualPayedAmount1?.toFixed(2),
+      actualPayedAmount2: record.actualPayedAmount2?.toFixed(2),
+      actualPayedAmount3: record.actualPayedAmount3?.toFixed(2),
+      actualReceivableAmount: record.actualReceivableAmount?.toFixed(2),
+      deductAmount: record.deductAmount?.toFixed(2),
+      otherAmount: record.otherAmount?.toFixed(2),
+      totalCustomerAmount: record.totalCustomerAmount?.toFixed(2),
+      totalPayAmount: record.totalPayAmount?.toFixed(2),
+    };
+  });
   const orderStore = useOrderStoreWithOut();
   orderStore.setTotal(res.total);
   return new Promise((resolve) => {
     resolve({
-      items: res.records,
+      items: formattedRecords,
       total: res.total,
     });
   });
@@ -148,12 +161,25 @@ export const getCheck = async (params: any) =&gt; {
     url: Api.CHECK_BILL,
     params,
   });
+  const formattedRecords = res.records.map((record: any) => {
+    return {
+      ...record,
+      actualPayedAmount1: record.actualPayedAmount1?.toFixed(2),
+      actualPayedAmount2: record.actualPayedAmount2?.toFixed(2),
+      actualPayedAmount3: record.actualPayedAmount3?.toFixed(2),
+      actualPayedAmount: record.actualPayedAmount?.toFixed(2),
+      deductAmount: record.deductAmount?.toFixed(2),
+      unPayedAmount: record.unPayedAmount?.toFixed(2),
+      totalActualPayedAmount: record.totalActualPayedAmount?.toFixed(2),
+      totalProductionAmount: record.totalProductionAmount?.toFixed(2),
+    };
+  });
   const orderStore = useOrderStoreWithOut();
   orderStore.setTotal(res.total);
   // return res.records;
   return new Promise((resolve) => {
     resolve({
-      items: res.records,
+      items: formattedRecords,
       total: res.total,
     });
   });
@@ -323,14 +323,14 @@
         itemArray.value = [];
         mockData.value = data.fieldInfos.checkBillOrderDO;
         console.log(mockData, '5656mockdata');
-        actualPayCalculate.value = mockData.value.actualPayCalculate; // 实际付款金额计算
+        actualPayCalculate.value = mockData.value.actualPayCalculate?.toFixed(2); // 实际付款金额计算
         checkNo.value = mockData.value.checkNo; // 对账单号
-        actualPayedAmount.value = mockData.value.actualPayedAmount; // 实际应付金额
+        actualPayedAmount.value = mockData.value.actualPayedAmount?.toFixed(2); // 实际应付金额
         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; // 扣款金额
+        unPayedAmount.value = mockData.value.unPayedAmount?.toFixed(2); // 未付金额
+        totalActualPayedAmount.value = mockData.value.totalActualPayedAmount?.toFixed(2); // 实际付款金额汇总
+        deductAmount.value = mockData.value.deductAmount?.toFixed(2); // 扣款金额
         const match = mockData.value.invoiceUrl.match(/aliyuncs\.com\/(.*?)\?/);
         if (match && match[1]) {
           // 对提取的部分进行解码
@@ -293,12 +293,12 @@
         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;
+        totalPayAmount.value = mockData.value.totalPayAmount?.toFixed(2);
+        totalCustomerAmount.value = mockData.value.totalCustomerAmount?.toFixed(2);
+        deductAmount.value = mockData.value.deductAmount?.toFixed(2);
         backRefundDate.value = mockData.value.backRefundDate;
         actualRefundDate.value = mockData.value.actualRefundDate;
-        otherAmount.value = mockData.value.otherAmount;
+        otherAmount.value = mockData.value.otherAmount?.toFixed(2);
         invoiceNo.value = mockData.value.invoiceNo;
         payee.value = mockData.value.payee;
       }
@@ -80,7 +80,7 @@
       dataIndex: 'productionDepartmentPrice',
       customRender: (column) => {
         const { record } = column || {};
-        return record?.profitAnalysisInfo?.productionDepartmentPrice;
+        return record?.profitAnalysisInfo?.productionDepartmentPrice?.toFixed(2);
         // ? `¥ ${record?.profitAnalysisInfo?.productionDepartmentPrice}`
         // : '';
       },
@@ -91,7 +91,7 @@
       dataIndex: 'productionDepartmentTotalPrice',
       customRender: (column) => {
         const { record } = column || {};
-        return record?.profitAnalysisInfo?.productionDepartmentTotalPrice;
+        return record?.profitAnalysisInfo?.productionDepartmentTotalPrice?.toFixed(2);
         // ? `¥ ${record?.profitAnalysisInfo?.productionDepartmentTotalPrice}`
         // : '';
       },
@@ -41,26 +41,46 @@
       title: '生产科总价汇总￥',
       dataIndex: 'productionDepartmentTotalPrice',
       width: 150,
+      customRender: (res) => {
+        // console.log(res, 56562);
+        return res.record.exportVOS[0].productionDepartmentTotalPrice.toFixed(2);
+      },
     },
     {
       title: '生产科扣款金额汇总￥',
       dataIndex: 'deductAmount',
       width: 160,
+      customRender: (res) => {
+        // console.log(res, 56562);
+        return res.record.exportVOS[0].deductAmount.toFixed(2);
+      },
     },
     {
       title: '生产科实际应付金额￥',
       dataIndex: 'calculateActualPayedAmount',
       width: 160,
+      customRender: (res) => {
+        // console.log(res, 56562);
+        return res.record.exportVOS[0].calculateActualPayedAmount.toFixed(2);
+      },
     },
     {
       title: '实际付款金额汇总￥',
       dataIndex: 'actualPayedAmount',
       width: 160,
+      customRender: (res) => {
+        // console.log(res, 56562);
+        return res.record.exportVOS[0].actualPayedAmount.toFixed(2);
+      },
     },
     {
       title: '未付金额￥',
       dataIndex: 'unPayedAmount',
       width: 150,
+      customRender: (res) => {
+        // console.log(res, 56562);
+        return res.record.exportVOS[0].unPayedAmount.toFixed(2);
+      },
     },
   ];
   // const ids = ref<number[]>([]);
@@ -14,11 +14,11 @@
 <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 emit = defineEmits(['success']);
   const [register, { closeModal }] = useModalInner(async (data) => {
     id.value = data.data.id;
@@ -40,6 +40,7 @@
     const formattedDate = formatDate(date.value);
     checkCommit({ id: id.value, actualPayedDate: formattedDate });
+    emit('success');
     closeModal();
   }
 </script>
@@ -74,17 +74,6 @@
     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');
@@ -12,9 +12,18 @@
       showFooter
       :destroyOnClose="true"
     >
-      <div>
+      <!-- <div>
         <BasicForm @register="registerForm" />
-      </div>
+      </div> -->
+      <div style="font-size: 15px">实际应收金额1$</div>
+      <a-input v-model:value="input1" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">实际应收金额2$</div>
+      <a-input v-model:value="input2" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">实际应收金额3$</div>
+      <a-input v-model:value="input3" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
@@ -29,6 +38,7 @@
   import { defineComponent, ref, computed, unref, toRaw, reactive } from 'vue';
   import { getEmailList } from '/@/api/sys/config';
   import { updateAmountInfo } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
   const emit = defineEmits(['success']);
   const schemas: FormSchema[] = [
@@ -87,14 +97,33 @@
       span: 24,
     },
   });
-
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
   const update = ref();
   const status = ref();
+  const input1 = ref();
+  const input2 = ref();
+  const input3 = ref();
+  const id = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     // 方式1
     resetFields();
     status.value = data.data.status;
+    id.value = data.data.id;
+    input1.value = data.data.actualPayedAmount1;
+    input2.value = data.data.actualPayedAmount2;
+    input3.value = data.data.actualPayedAmount3;
     setDrawerProps({ confirmLoading: false });
+    // 将金额格式化为两位小数
+    // setFieldsValue({
+    //   actualPayedAmount1:
+    //     data.data.actualPayedAmount1 !== null ? data.data.actualPayedAmount1.toFixed(2) : undefined,
+    //   actualPayedAmount2:
+    //     data.data.actualPayedAmount2 !== null ? data.data.actualPayedAmount2.toFixed(2) : undefined,
+    //   actualPayedAmount3:
+    //     data.data.actualPayedAmount3 !== null ? data.data.actualPayedAmount3.toFixed(2) : undefined,
+    //   ...toRaw(data.data), // 其他字段
+    // });
     setFieldsValue({
       ...toRaw(data.data),
     });
@@ -103,16 +132,22 @@
   });
   //完成编辑
   async function handleSubmit() {
-    const values = await validate();
-    const updatedValues = {
-      ...values,
-      id: update.value.data.id,
-    };
-    console.log(updatedValues, 56565);
-    await updateAmountInfo({
-      ...updatedValues,
-    });
-    emit('success');
-    closeDrawer();
+    // const values = await validate();
+    // const updatedValues = {
+    //   ...values,
+    //   id: update.value.data.id,
+    // };
+    if (!input1.value || !input2.value || !input3.value) {
+      error('选项不能为空');
+    } else {
+      await updateAmountInfo({
+        id: id.value,
+        actualPayedAmount1: input1.value,
+        actualPayedAmount2: input2.value,
+        actualPayedAmount3: input3.value,
+      });
+      emit('success');
+      closeDrawer();
+    }
   }
 </script>
@@ -15,7 +15,7 @@
         <CheckDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
         <InvoiceShow @register="registerInvoiceShow" />
-        <Commit @register="registerCommit" />
+        <Commit @register="registerCommit" @success="handleSuccess" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -56,6 +56,9 @@ export const columns: BasicColumn[] = [
     title: '生产科扣款金额￥',
     dataIndex: 'deductAmount',
     width: 160,
+    // customRender: (column) => {
+    //   return column.record.deductAmount?.toFixed(2);
+    // },
   },
   {
     title: '扣款责任部门',
@@ -78,6 +81,9 @@ export const columns: BasicColumn[] = [
     title: '生产科实际应付金额￥',
     dataIndex: 'actualPayedAmount',
     width: 180,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount?.toFixed(2);
+    // },
   },
   {
     title: '生产科发票上传',
@@ -95,16 +101,26 @@ export const columns: BasicColumn[] = [
     title: '实际付款金额1￥',
     dataIndex: 'actualPayedAmount1',
     width: 160,
+    // customRender: (column) => {
+    //   console.log(column, '5656ccc');
+    //   return column.record.actualPayedAmount1?.toFixed(2);
+    // },
   },
   {
     title: '实际付款金额2￥',
     dataIndex: 'actualPayedAmount2',
     width: 160,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount2?.toFixed(2);
+    // },
   },
   {
     title: '实际付款金额3￥',
     dataIndex: 'actualPayedAmount3',
     width: 160,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount3?.toFixed(2);
+    // },
   },
   {
     title: '生产科发票审核',
@@ -25,6 +25,7 @@
   const id = ref();
   const payee = ref();
   const date = ref();
+  const emit = defineEmits(['success']);
   const [register, { closeModal }] = useModalInner(async (data) => {
     id.value = data.data.id;
@@ -45,6 +46,7 @@
   async function handleOk() {
     const formattedDate = formatDate(date.value);
     commit({ id: id.value, actualRefundDate: formattedDate, payee: payee.value });
+    emit('success');
     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 @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>
             </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 { getInvoiceDeductUrlById } from '@/api/project/invoice';
+  import { view } from '@/utils/pdfShow';
   interface Item {
     name: string;
@@ -54,15 +68,41 @@
     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>`);
+  // 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));
+  }
+  // 检查 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>
@@ -12,9 +12,21 @@
       showFooter
       :destroyOnClose="true"
     >
-      <div>
+      <!-- <div>
         <BasicForm @register="registerForm" />
-      </div>
+      </div> -->
+      <div style="font-size: 15px">实际应收金额1$</div>
+      <a-input v-model:value="input1" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">实际应收金额2$</div>
+      <a-input v-model:value="input2" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">实际应收金额3$</div>
+      <a-input v-model:value="input3" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">其他费用金额$</div>
+      <a-input v-model:value="input4" placeholder="请输入" :disabled="status === 10" auto-size />
+      <div style="margin: 16px 0"></div>
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
@@ -29,6 +41,7 @@
   import { defineComponent, ref, computed, unref, toRaw, reactive } from 'vue';
   import { getEmailList } from '/@/api/sys/config';
   import { updateAmount } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
   const emit = defineEmits(['success']);
   const schemas: FormSchema[] = [
@@ -99,15 +112,28 @@
       span: 24,
     },
   });
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
   const update = ref();
   const status = ref();
+
+  const input1 = ref();
+  const input2 = ref();
+  const input3 = ref();
+  const input4 = ref();
+  const id = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     // 方式1
-    console.log(data, '56565dataaa');
     status.value = data.data.status;
+    id.value = data.data.id;
+    input1.value = data.data.actualPayedAmount1;
+    input2.value = data.data.actualPayedAmount2;
+    input3.value = data.data.actualPayedAmount3;
+    input4.value = data.data.otherAmount;
     resetFields();
     setDrawerProps({ confirmLoading: false });
+    console.log(data, '5656666dd');
     setFieldsValue({
       ...toRaw(data.data),
     });
@@ -115,16 +141,24 @@
   });
   //完成编辑
   async function handleSubmit() {
-    const values = await validate();
-    const updatedValues = {
-      ...values,
-      id: update.value.data.id,
-      bgUrl: update.value.data.bgUrl,
-    };
-    await updateAmount({
-      ...updatedValues,
-    });
-    emit('success');
-    closeDrawer();
+    // const values = await validate();
+    // const updatedValues = {
+    //   ...values,
+    //   id: update.value.data.id,
+    //   bgUrl: update.value.data.bgUrl,
+    // };
+    if (!input1.value || !input2.value || !input3.value || !input4.value) {
+      error('选项不能为空');
+    } else {
+      await updateAmount({
+        id: id.value,
+        actualPayedAmount1: input1.value,
+        actualPayedAmount2: input2.value,
+        actualPayedAmount3: input3.value,
+        otherAmount: input4.value,
+      });
+      emit('success');
+      closeDrawer();
+    }
   }
 </script>
@@ -41,31 +41,50 @@
       title: '客户总金额汇总$',
       dataIndex: 'customerTotalPrice',
       width: 50,
+      customRender: (res) => {
+        console.log(res, '5656analres');
+        return res.record.exportVOS[0].customerTotalPrice.toFixed(2);
+      },
     },
     {
       title: '客户扣款金额汇总$',
       dataIndex: 'deductAmount',
       width: 50,
+      customRender: (res) => {
+        return res.record.exportVOS[0].deductAmount.toFixed(2);
+      },
     },
     {
       title: '实际应收款$',
-      dataIndex: 'otherAmount',
+      dataIndex: 'actualReceivableAmount',
       width: 50,
+      customRender: (res) => {
+        return res.record.exportVOS[0].actualReceivableAmount.toFixed(2);
+      },
     },
     {
       title: '实际收款金额汇总$',
-      dataIndex: 'actualReceivableAmount',
+      dataIndex: 'actualPayedAmount',
       width: 50,
+      customRender: (res) => {
+        return res.record.exportVOS[0].actualPayedAmount.toFixed(2);
+      },
     },
     {
       title: '其他费用金额汇总$',
-      dataIndex: 'otherTotalAmount',
+      dataIndex: 'otherAmount',
       width: 50,
+      customRender: (res) => {
+        return res.record.exportVOS[0].otherAmount.toFixed(2);
+      },
     },
     {
       title: '未收金额合计$',
-      dataIndex: 'actualPayedAmount',
+      dataIndex: 'otherTotalAmount',
       width: 50,
+      customRender: (res) => {
+        return res.record.exportVOS[0].otherTotalAmount.toFixed(2);
+      },
     },
   ];
   // const ids = ref<number[]>([]);
@@ -86,10 +86,10 @@
   }
   function handleShow() {
     // if (!visible) {
-    input1.value = 0;
-    deductUrl.value = '';
-    updateDeductUrl.value = '';
-    fileList.value = [];
+    // input1.value = 0;
+    // deductUrl.value = '';
+    // updateDeductUrl.value = '';
+    // fileList.value = [];
     // }
     // input1.value = '';
     // deductUrl.value = '';
@@ -13,7 +13,7 @@
         <TrackEdit @register="registerTrackEdit" @success="handleSuccess" />
         <InvoiceDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
-        <Commit @register="registerCommit" />
+        <Commit @register="registerCommit" @success="handleSuccess" />
         <ReUploadBgUrl @register="registerReUploadBgUrl" />
       </template>
       <template #bodyCell="{ column, record }">
@@ -62,6 +62,9 @@ export const columns: BasicColumn[] = [
     title: '发生扣款金额$',
     dataIndex: 'deductAmount',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.deductAmount?.toFixed(2);
+    // },
   },
   {
     title: '上传扣款单',
@@ -80,26 +83,41 @@ export const columns: BasicColumn[] = [
     title: '实际应收金额$',
     dataIndex: 'actualReceivableAmount',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.actualReceivableAmount?.toFixed(2);
+    // },
   },
   {
     title: '实际收款金额1$',
     dataIndex: 'actualPayedAmount1',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount1?.toFixed(2);
+    // },
   },
   {
     title: '实际收款金额2$',
     dataIndex: 'actualPayedAmount2',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount2?.toFixed(2);
+    // },
   },
   {
     title: '实际收款金额3$',
     dataIndex: 'actualPayedAmount3',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.actualPayedAmount3?.toFixed(2);
+    // },
   },
   {
     title: '其他费用$',
     dataIndex: 'otherAmount',
     width: 120,
+    // customRender: (column) => {
+    //   return column.record.otherAmount?.toFixed(2);
+    // },
   },
   {
     title: '总经理审核',
@@ -124,39 +142,56 @@ export const columnsAnalysis: BasicColumn[] = [
     title: '实际应付金额总计$',
     dataIndex: 'actualPayedAmount',
     width: 50,
-    // customRender: (column) => {
-    //   console.log(column, 5656666);
-    //   return 1;
-    // },
+    customRender: (column) => {
+      return column.record.actualPayedAmount?.toFixed(2);
+    },
   },
   {
     title: '实际应收金额总计$',
     dataIndex: 'actualReceivableAmount',
     width: 50,
+    customRender: (column) => {
+      return column.record.actualReceivableAmount?.toFixed(2);
+    },
   },
   {
     title: '客户总价$',
     dataIndex: 'customerTotalPrice',
     width: 50,
+    customRender: (column) => {
+      return column.record.customerTotalPrice?.toFixed(2);
+    },
   },
   {
     title: '发生扣款金额总计$',
     dataIndex: 'deductAmount',
     width: 50,
+    customRender: (column) => {
+      return column.record.deductAmount?.toFixed(2);
+    },
   },
   {
     title: '实际应收金额总计$',
     dataIndex: 'actualReceivableAmount',
     width: 50,
+    customRender: (column) => {
+      return column.record.actualReceivableAmount?.toFixed(2);
+    },
   },
   {
     title: '实际应收$',
     dataIndex: 'otherAmount',
     width: 50,
+    customRender: (column) => {
+      return column.record.otherAmount?.toFixed(2);
+    },
   },
   {
     title: '其他费用金额汇总$',
     dataIndex: 'otherTotalAmount',
     width: 50,
+    customRender: (column) => {
+      return column.record.otherTotalAmount?.toFixed(2);
+    },
   },
 ];
@@ -21,14 +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/, '');
-        //   },
-        // },
+        '/aliyun-oss-pdf': {
+          target: 'https://test-alterego.oss-cn-qingdao.aliyuncs.com',
+          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',