From a29fbafcb0e085a8b80207aa6862d88983d8a777 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 10 Apr 2025 15:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=98=8E=E7=BB=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=83=E4=BD=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |  6 ++
 src/types/descriptions.d.ts                   |  1 +
 .../supplierinvoiceRequestMain/index.vue      | 11 +--
 .../supplierinvoiceRequestMain.data.ts        | 75 +++++++++++++++++--
 4 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 98488d09a..e680925dd 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -162,6 +162,12 @@ updateSort(schema.value)
                   data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : ''
                 }}
               </slot>
+              
+              <slot v-else-if="item.formatter">
+                <span>{{
+                  item.formatter(data[item.field])
+                }}</span>
+              </slot>
               <slot v-else-if="item.valueFilter">
                 <el-tag v-if="item.dictType" :type="item.dictType">{{ item.valueFilter(data[item.field]) }}</el-tag>
                 <span v-else>{{
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index aa45d6b70..e4e5e9d9b 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -10,6 +10,7 @@ export interface DescriptionsSchema {
   labelClassName?: string
   dateFormat?: string // add by 星语：支持时间的格式化
   valueFilter?: function // 展示的过滤函数
+  formatter?: function // 展示的过滤函数
   slotFilter?:boolean // 插槽自定义内容
   dictType?: string // add by 星语：支持 dict 字典数据
   sortDetailDefault?: string | number
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 7b65481c2..a01c78fde 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -400,25 +400,25 @@
     <template #Descriptions_totalTaxDiffAmount="{ row }">
       <span
         >{{ row['totalTaxDiffAmount']
-        }}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span
+        }}<span class="red-text"> (含返利合计:{{ accountantFormartDetail(row['rebateTotal']) }})</span></span
       >
     </template>
     <!-- 未税尾差 -->
     <template #Descriptions_beforeTaxDiffAmount="{ row }">
       <span
         >{{ row['beforeTaxDiffAmount']
-        }}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span
+        }}<span class="red-text"> (含返利未税:{{  accountantFormartDetail(row['discountAmount1']) }})</span></span
       >
     </template>
     <!-- 税额尾差 -->
     <template #Descriptions_taxAmountDiff="{ row }">
       <span
         >{{ row['taxAmountDiff']
-        }}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span
+        }}<span class="red-text"> (含返利税额:{{  accountantFormartDetail(row['rebateTax']) }})</span></span
       >
     </template>
     <template #differencePrice="{ row }">
-      <span :class="{ 'red-text': row.differencePrice != 0 }">{{ row.differencePrice }}</span>
+      <span :class="{ 'red-text': row.differencePrice != 0 }">{{  accountantFormartDetail(row.differencePrice) }}</span>
     </template>
   </Detail>
 
@@ -449,7 +449,8 @@ import {
   PurchasePass,
   PurchasePassRules,
   SupplierinvoiceRequestDetailMain,
-  ClaimDetails
+  ClaimDetails,
+  accountantFormartDetail
 } from './supplierinvoiceRequestMain.data'
 import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
 import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 5734722c2..a96a11200 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1278,6 +1278,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   }
 ]))
+export const accountantFormartDetail = ( cellValue) => {
+  if(!cellValue){
+    return ''
+  }
+  cellValue = cellValue + '' || ''
+  cellValue = Number(cellValue).toFixed(2)
+  let x = cellValue.split('.')
+  let x1 = x[0]
+  let x2  = x.length > 1 ? '.' + x[1] : ''
+  const reg = /(\d+)(\d{3})/
+  while(reg.test(x1)){
+    x1 = x1.replace(reg, '$1,$2')
+  }
+  return x1+x2
+}
 /**
  * @returns {Array} 供应商发票在详情展示的主表字段
  */
@@ -1345,6 +1360,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '待开发票未税金额',
     field: 'purchaseAmountTotalMain',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1375,6 +1393,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '价差合计',
     field: 'differencePriceTotalMain',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1480,7 +1501,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '材料款价税合计',//'供应商维护价税合计',
     field: 'afterTaxAmount',
     formatter: accountantFormart,
-    
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1515,7 +1538,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '材料款未税金额', //供应商维护未税金额
     field: 'amount',
     formatter: accountantFormart,
-    
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1537,22 +1562,29 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
-    
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
+    
   },
   {
     label: '材料款税额',//'供应商维护税额',
     field: 'taxAmount',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
+    
   },
   {
     label: '财务审批人',
@@ -1569,7 +1601,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
-    
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1602,7 +1636,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
-    
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1637,7 +1673,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '返利未税金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
-   
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1716,6 +1754,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
         disabled: true,
       }
     },
+    formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
 
   },
   {
@@ -1738,6 +1780,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
         disabled: true,
       }
     },
+    formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
 
   },
   {
@@ -1760,6 +1806,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
         disabled: true,
       }
     },
+    formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
 
   },
   // {
@@ -1781,6 +1831,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   //     type: 'InputNumber',
   //     precision: 2,
   //   },
+  // formatter: accountantFormart,
+  //   detail: {
+  //     formatter: accountantFormartDetail,
+  //   },
   // },
   {
     label: '金税票号',
@@ -1802,6 +1856,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '模具未税金额',
     field: 'moldUntaxedAmount',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     table: {
       width: 160
     },
@@ -1822,6 +1879,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '模具税额',
     field: 'moldTaxAmount',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     table: {
       width: 160
     },
@@ -1842,6 +1902,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '模具价税合计',
     field: 'moldTaxTotal',
     formatter: accountantFormart,
+    detail: {
+      formatter: accountantFormartDetail,
+    },
     table: {
       width: 160
     },