From 306bf9f2a8b547ab92c271788b32176b8e1936b6 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Wed, 6 Nov 2024 18:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=94=B3=E8=AF=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=87=91=E9=A2=9D=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?2=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/approve/fee/components/feeTable.vue  |  9 +++++++--
 src/views/operation/paidApply/detail/index.vue | 12 ++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/approve/fee/components/feeTable.vue b/src/views/approve/fee/components/feeTable.vue
index 1201889f..f7acd351 100644
--- a/src/views/approve/fee/components/feeTable.vue
+++ b/src/views/approve/fee/components/feeTable.vue
@@ -7,7 +7,12 @@
   <a-spin :spinning="loading">
     <div class="ds-approve-fee-table-sf">
       <div class="fee-check-opt">
-        <h4>{{ status == 'BILL_RECV_AUDIT' ? '应收费用确认' : '应收应付费用' }}</h4>
+        <h4>{{ status == 'BILL_RECV_AUDIT' ? '应收费用确认' : '应收应付费用' }}
+          <a-button type="link" >
+            <span class="iconfont icon-dengjizongshu"></span>
+            编辑
+          </a-button>
+        </h4>
         <span v-if="!status">
           <a-dropdown>
             <template #overlay>
@@ -80,7 +85,7 @@
             <li v-for="(item, index) in tableData" class="fee-data" :key="'f-n-' + index">
               {{ item.feeName }}
             </li>
-            <li v-show="tableData.length" class="fee-li-statistic">合计</li>
+            <li v-show="tableData && tableData.length" class="fee-li-statistic">合计</li>
           </ul>
           <!-- 应收表格 -->
           <BasicTable class="ds-mini-table-detail receive-table" @register="registerTable1">
diff --git a/src/views/operation/paidApply/detail/index.vue b/src/views/operation/paidApply/detail/index.vue
index a989456b..6c59d580 100644
--- a/src/views/operation/paidApply/detail/index.vue
+++ b/src/views/operation/paidApply/detail/index.vue
@@ -83,6 +83,7 @@
   import { Divider } from 'ant-design-vue'
   import { BasicForm, useForm } from '/@/components/Form'
   import ApplyInfo from './components/applyInfo.vue'
+  import { numberThousandFormat } from '/@/utils/commonUtil'
   // 业务表格
   import BusinessTable from './components/businessTable.vue'
   const { createMessage } = useMessage()
@@ -181,16 +182,19 @@
       dloading.value = true
       Get({ id }).then(res => {
         dloading.value = false
+        if (res?.data?.amountRMB) res.data.amountRMB = numberThousandFormat(res.data.amountRMB, 2, true)
+        if (res?.data?.amountUSD) res.data.amountUSD = numberThousandFormat(res.data.amountUSD, 2, true)
         setFieldsValue(res.data)
         status.value = res.data.status
         bid.value = res.data.id
         statusText.value  = res.data.statusText
         applyNo.value = res.data.applicationNO
         feeData.value = res.data.details
-        if (res?.additionalData?.receivablesRMB) res.additionalData.receivablesRMB = res.additionalData.receivablesRMB.toLocaleString()
-        if (res?.additionalData?.receivablesUSD) res.additionalData.receivablesUSD = res.additionalData.receivablesUSD.toLocaleString()
-        if (res?.additionalData?.unSettledRMB) res.additionalData.unSettledRMB = res.additionalData.unSettledRMB.toLocaleString()
-        if (res?.additionalData?.unSettledUSD) res.additionalData.unSettledUSD = res.additionalData.unSettledUSD.toLocaleString()
+        if (res?.additionalData?.amountRMB) res.additionalData.amountRMB = numberThousandFormat(res.additionalData.amountRMB, 2, true)
+        if (res?.additionalData?.receivablesRMB) res.additionalData.receivablesRMB = numberThousandFormat(res.additionalData.receivablesRMB, 2, true)
+        if (res?.additionalData?.receivablesUSD) res.additionalData.receivablesUSD = numberThousandFormat(res.additionalData.receivablesUSD, 2, true)
+        if (res?.additionalData?.unSettledRMB) res.additionalData.unSettledRMB = numberThousandFormat(res.additionalData.unSettledRMB, 2, true)
+        if (res?.additionalData?.unSettledUSD) res.additionalData.unSettledUSD = numberThousandFormat(res.additionalData.unSettledUSD, 2, true)
         additionalData.value = res.additionalData
       })
       // 如果存在id 禁用弹窗的币别选择