From a56d750f2d00df5c14876ee69b2b6b5cbb0fe0cb Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Thu, 29 Jan 2026 13:44:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(finance):=20=E6=B7=BB=E5=8A=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=98=BE=E7=A4=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个财务模块的表格列中添加金额格式化显示功能
- 统一使用 formatCurrency 方法格式化含税总价、未开票金额等数值
- 在付款单新增表单中添加其它特别说明字段
- 调整表格最大高度以优化界面显示
- 在详情抽屉中统一应用金额格式化处理
- 修改数据默认值以避免空值错误
- 优化审批流程中的金额显示格式化
---
 oms_web/oms_vue/src/api/finance/payment.js    | 10 +++
 oms_web/oms_vue/src/main.js                   |  2 +
 .../finance/invoiceReceipt/approved/index.vue |  2 +-
 .../components/InvoiceReceiptDetail.vue       | 10 +--
 .../approve/finance/invoiceReceipt/index.vue  |  2 +-
 .../finance/invoiceRed/approved/index.vue     |  2 +-
 .../components/InvoiceRedDetail.vue           | 10 +--
 .../approve/finance/invoiceRed/index.vue      |  6 +-
 .../finance/payment/approved/index.vue        |  2 +-
 .../payment/components/PaymentDetail.vue      | 13 +--
 .../views/approve/finance/payment/index.vue   |  2 +-
 .../finance/paymentRefund/approved/index.vue  |  2 +-
 .../components/PaymentRefundDetail.vue        | 16 ++--
 .../approve/finance/paymentRefund/index.vue   |  2 +-
 .../finance/receipt/approved/index.vue        |  2 +-
 .../receipt/components/ReceiptDetail.vue      | 10 +--
 .../views/approve/finance/receipt/index.vue   |  2 +-
 .../finance/receiptRefound/approved/index.vue |  2 +-
 .../components/ReceiptDetail.vue              |  6 +-
 .../approve/finance/receiptRefound/index.vue  |  2 +-
 .../receivableInvoice/approved/index.vue      |  2 +-
 .../components/ReceivableInvoiceDetail.vue    | 10 +--
 .../finance/receivableInvoice/index.vue       |  2 +-
 .../approved/index.vue                        |  2 +-
 .../components/ReceivableInvoiceDetail.vue    |  6 +-
 .../finance/receivableInvoiceRefund/index.vue |  2 +-
 .../src/views/finance/charge/index.vue        | 22 ++---
 .../finance/invoice/components/AddForm.vue    | 10 +--
 .../invoice/components/DetailDrawer.vue       | 14 +--
 .../invoice/components/InvoiceDialog.vue      |  6 +-
 .../invoice/components/InvoiceInfoView.vue    |  6 +-
 .../src/views/finance/invoice/index.vue       | 10 +--
 .../finance/payable/components/EditForm.vue   | 24 ++---
 .../payable/components/MergePaymentDialog.vue | 12 +--
 .../payable/components/MergeReceiptDialog.vue | 14 +--
 .../src/views/finance/payable/index.vue       |  8 +-
 .../src/views/finance/payable/report.vue      | 46 +++++-----
 .../finance/payment/components/AddForm.vue    | 18 ++--
 .../payment/components/DetailDrawer.vue       | 38 ++++----
 .../src/views/finance/payment/index.vue       | 37 +++++++-
 .../finance/receipt/components/AddForm.vue    | 12 +--
 .../receipt/components/DetailDrawer.vue       | 16 ++--
 .../receipt/components/ReceiptDialog.vue      | 12 +--
 .../src/views/finance/receipt/index.vue       |  6 +-
 .../receivable/components/EditForm.vue        | 24 ++---
 .../components/MergeInvoiceDialog.vue         | 12 +--
 .../components/MergeReceiptDialog.vue         | 12 +--
 .../src/views/finance/receivable/index.vue    |  8 +-
 .../finance/receive/components/AddForm.vue    | 12 +--
 .../receive/components/DetailDrawer.vue       | 12 +--
 .../receive/components/ReceiveDialog.vue      |  2 +-
 .../src/views/finance/receive/index.vue       |  4 +-
 .../src/views/finance/receive/report.vue      | 46 +++++-----
 .../src/views/finance/report/index.vue        | 88 +++++++++----------
 .../writeoff/invoice/WriteOffDetailDrawer.vue |  4 +-
 .../writeoff/invoice/writeoffRecord.vue       |  6 +-
 .../writeoff/payment/WriteOffDetailDrawer.vue |  4 +-
 .../views/finance/writeoff/payment/index.vue  | 24 ++---
 .../controller/OmsPaymentBillController.java  |  3 +
 .../com/ruoyi/sip/domain/OmsPaymentBill.java  | 15 ++--
 60 files changed, 391 insertions(+), 325 deletions(-)

diff --git a/oms_web/oms_vue/src/api/finance/payment.js b/oms_web/oms_vue/src/api/finance/payment.js
index 89d859b7..088bc0fd 100644
--- a/oms_web/oms_vue/src/api/finance/payment.js
+++ b/oms_web/oms_vue/src/api/finance/payment.js
@@ -12,6 +12,16 @@ export function listPayment(query) {
     data: tansParams(query)
   })
 }
+export function exportPayment(query) {
+  return request({
+    url: '/finance/payment/export',
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    data: tansParams(query)
+  })
+}
 
 // 查询付款单详细
 export function getPayment(id) {
diff --git a/oms_web/oms_vue/src/main.js b/oms_web/oms_vue/src/main.js
index 189b9dfc..8e1d7304 100644
--- a/oms_web/oms_vue/src/main.js
+++ b/oms_web/oms_vue/src/main.js
@@ -21,6 +21,7 @@ import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data"
 import { getConfigKey } from "@/api/system/config"
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"
+import { formatCurrency } from "@/utils"
 // 分页组件
 import Pagination from "@/components/Pagination"
 // 自定义表格工具组件
@@ -42,6 +43,7 @@ import DictData from '@/components/DictData'
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
+Vue.prototype.formatCurrency = formatCurrency
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue
index 951c891b..6343c168 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue
@@ -31,7 +31,7 @@
       <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column label="收票编号" align="center" prop="ticketBillCode" />
       <el-table-column label="供应商" align="center" prop="vendorName" />
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime) }}</span>
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/components/InvoiceReceiptDetail.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/components/InvoiceReceiptDetail.vue
index e915d8bf..7a983684 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/components/InvoiceReceiptDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/components/InvoiceReceiptDetail.vue
@@ -7,9 +7,9 @@
       <el-descriptions-item label="票据类型">
         <dict-tag :options="dict.type.finance_invoice_type" :value="data.ticketType"/>
       </el-descriptions-item>
-      <el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
-      <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
+      <el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
+      <el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
       <el-descriptions-item label="预计收票时间">{{ data.ticketTime }}</el-descriptions-item>
       <el-descriptions-item label="制造商开票时间">{{ data.vendorTicketTime }}</el-descriptions-item>
 <!--      <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
@@ -26,8 +26,8 @@
             <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
           </template>
         </el-table-column>
-        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
-        <el-table-column prop="paymentAmount" label="本次收票金额" align="center"></el-table-column>
+        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
+        <el-table-column prop="paymentAmount" label="本次收票金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
       </el-table>
     </div>
 
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue
index 07e45c90..305bff59 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue
@@ -44,7 +44,7 @@
       <el-table-column label="收票编号" align="center" prop="ticketBillCode" />
       <el-table-column label="制造商" align="center" prop="vendorName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 <!--      <el-table-column label="登记人" align="center" prop="createUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue
index 96e7fedf..204c63ff 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue
@@ -32,7 +32,7 @@
       <el-table-column label="收票编号" align="center" prop="ticketBillCode" />
       <el-table-column label="供应商" align="center" prop="vendorName" />
 
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax"  :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime) }}</span>
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/components/InvoiceRedDetail.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/components/InvoiceRedDetail.vue
index 965b5583..7005d8fc 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/components/InvoiceRedDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/components/InvoiceRedDetail.vue
@@ -7,9 +7,9 @@
       <el-descriptions-item label="票据类型">
         <dict-tag :options="dict.type.finance_invoice_type" :value="data.ticketType"/>
       </el-descriptions-item>
-      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }} </span></el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
-      <el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }} </span></el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }} </span></el-descriptions-item>
+      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }}</span></el-descriptions-item>
+      <el-descriptions-item label="税额(元)"><span style="color: red">{{ formatCurrency(data.taxAmount) }} </span></el-descriptions-item>
       <el-descriptions-item label="收票时间">{{ data.ticketTime }}</el-descriptions-item>
       <el-descriptions-item label="制造商开票时间">{{ data.vendorTicketTime }}</el-descriptions-item>
 <!--      <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
@@ -26,8 +26,8 @@
             <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
           </template>
         </el-table-column>
-        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
-        <el-table-column prop="paymentAmount" label="本次红冲金额" align="center"></el-table-column>
+        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
+        <el-table-column prop="paymentAmount" label="本次红冲金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
       </el-table>
     </div>
 
diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue
index ddccd3c8..ba24f36c 100644
--- a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue
@@ -44,10 +44,8 @@
       <el-table-column label="收票编号" align="center" prop="ticketBillCode" />
       <el-table-column label="供应商" align="center" prop="vendorName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" >
-        <template slot-scope="scope">
-          <span style="color: red">{{ scope.row.totalPriceWithTax }}</span>
-        </template>
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax"  :formatter="(row, column, cellValue)=>formatCurrency(cellValue)">
+
       </el-table-column>
 <!--      <el-table-column label="登记人" align="center" prop="createUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue
index 74d4a5f0..fb55acbc 100644
--- a/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue
@@ -32,7 +32,7 @@
       <el-table-column label="付款编号" align="center" prop="paymentBillCode" />
       <el-table-column label="制造商" align="center" prop="vendorName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax"  :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
index 232a82e7..3d0e5ed2 100644
--- a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
@@ -10,9 +10,9 @@
       <el-descriptions-item label="付款周期">
         {{data.payConfigDay}}天
       </el-descriptions-item>
-      <el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
-      <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
+<!--      <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>-->
+<!--      <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>-->
       <el-descriptions-item label="支付方式">
         <dict-tag :options="dict.type.payment_method" :value="data.paymentMethod"/>
       </el-descriptions-item>
@@ -20,10 +20,11 @@
       <el-descriptions-item label="账户名称">{{ data.payName }}</el-descriptions-item>
       <el-descriptions-item label="银行开户行">{{ data.payBankOpenAddress }}</el-descriptions-item>
       <el-descriptions-item label="银行行号">{{ data.bankNumber }}</el-descriptions-item>
-<!--      <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
+      <el-descriptions-item  span="2"></el-descriptions-item>
+      <el-descriptions-item label="其它特别说明" :span="3">{{ data.remark }}</el-descriptions-item>
     </el-descriptions>
 
-    <div class="section" style="margin-top: 20px;" v-show="data.payableDetails && data.payableDetails.length>0">
+    <div class="section" style="margin-top: 20px;" >
       <div class="el-descriptions__title">应付单信息</div>
       <el-table :data="data.payableDetails" border style="width: 100%; margin-top: 10px;">
         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
@@ -67,6 +68,7 @@
 <script>
 
 import request from '@/utils/request';
+import {formatCurrency} from "@/utils";
 
 export default {
   name: "PaymentDetail",
@@ -91,6 +93,7 @@ export default {
 
   },
   methods: {
+    formatCurrency,
 
     isPdf(filePath) {
       return filePath && filePath.toLowerCase().endsWith('.pdf');
diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/index.vue b/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
index dcc6cc41..171f09bb 100644
--- a/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
@@ -44,7 +44,7 @@
       <el-table-column label="付款编号" align="center" prop="paymentBillCode" />
       <el-table-column label="制造商" align="center" prop="vendorName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
index 3a56045e..50c9cbdf 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
@@ -34,7 +34,7 @@
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
       <el-table-column label="金额" align="center" prop="totalPriceWithTax" >
         <template slot-scope="scope">
-          <span style="color: red">{{ scope.row.totalPriceWithTax  }}</span>
+          <span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax)  }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
index 82871575..4c63fb72 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
@@ -10,20 +10,21 @@
       <el-descriptions-item label="付款周期">
         {{data.payConfigDay}}天
       </el-descriptions-item>
-      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>
-      <el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax)  }}</span></el-descriptions-item>
+<!--      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>-->
+<!--      <el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>-->
       <el-descriptions-item label="支付方式">
         <dict-tag :options="dict.type.payment_method" :value="data.paymentMethod"/>
       </el-descriptions-item>
       <el-descriptions-item label="银行账号">{{ data.payBankNumber }}</el-descriptions-item>
       <el-descriptions-item label="账户名称">{{ data.payName }}</el-descriptions-item>
       <el-descriptions-item label="银行开户行">{{ data.payBankOpenAddress }}</el-descriptions-item>
-      <el-descriptions-item label="银行行号">{{ data.bankNumber }}</el-descriptions-item>
-<!--      <el-descriptions-item label="备注" :span="3">{{ data.remark }}</el-descriptions-item>-->
+      <el-descriptions-item label="银行行号" span="1">{{ data.bankNumber }}</el-descriptions-item>
+      <el-descriptions-item  span="2"></el-descriptions-item>
+      <el-descriptions-item label="其它特别说明" span="3">{{ data.remark }}</el-descriptions-item>
     </el-descriptions>
 
-    <div class="section" style="margin-top: 20px;" v-show="data.payableDetails && data.payableDetails.length>0">
+    <div class="section" style="margin-top: 20px;" >
       <div class="el-descriptions__title">应付单信息</div>
       <el-table :data="data.payableDetails" border style="width: 100%; margin-top: 10px;">
         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
@@ -43,8 +44,11 @@
 </template>
 
 <script>
+import {formatCurrency} from "@/utils";
+
 export default {
   name: "PaymentRefundDetail",
+  methods: {formatCurrency},
   props: {
     data: {
       type: Object,
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
index e3159853..90c6a32f 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
@@ -46,7 +46,7 @@
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
       <el-table-column label="金额" align="center" prop="totalPriceWithTax" >
         <template slot-scope="scope">
-          <span style="color: red">{{ scope.row.totalPriceWithTax  }}</span>
+          <span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax)  }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
diff --git a/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue
index 91f945c6..11394abf 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue
@@ -32,7 +32,7 @@
       <el-table-column label="收款编号" align="center" prop="receiptBillCode" />
       <el-table-column label="客户" align="center" prop="partnerName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/receipt/components/ReceiptDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receipt/components/ReceiptDetail.vue
index a91684d7..0ee807a7 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receipt/components/ReceiptDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receipt/components/ReceiptDetail.vue
@@ -7,9 +7,9 @@
 <!--      <el-descriptions-item label="收款单类型">-->
 <!--        <dict-tag :options="dict.type.receipt_bill_type" :value="data.receiptBillType"/>-->
 <!--      </el-descriptions-item>-->
-      <el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
-      <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
+      <el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
+      <el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
       <el-descriptions-item label="支付方式">
         <dict-tag :options="dict.type.payment_method" :value="data.receiptMethod"/>
       </el-descriptions-item>
@@ -31,8 +31,8 @@
             <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
           </template>
         </el-table-column>
-        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
-        <el-table-column prop="receiptAmount" label="本次收款金额" align="center"></el-table-column>
+        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
+        <el-table-column prop="receiptAmount" label="本次收款金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
       </el-table>
     </div>
 
diff --git a/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue b/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue
index 8af597fa..220da509 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue
@@ -44,7 +44,7 @@
       <el-table-column label="收款编号" align="center" prop="receiptBillCode" />
       <el-table-column label="进货商" align="center" prop="partnerName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue
index 0eff8c6b..596d6c9a 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue
@@ -32,7 +32,7 @@
       <el-table-column label="收款编号" align="center" prop="receiptBillCode" />
       <el-table-column label="客户" align="center" prop="partnerName" />
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/components/ReceiptDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/components/ReceiptDetail.vue
index 1e1c0ffd..f02c01d5 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/components/ReceiptDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/components/ReceiptDetail.vue
@@ -7,9 +7,9 @@
 <!--      <el-descriptions-item label="收款单类型">-->
 <!--        <dict-tag :options="dict.type.receipt_bill_type" :value="data.receiptBillType"/>-->
 <!--      </el-descriptions-item>-->
-      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ data.totalPriceWithTax }}</span></el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ data.totalPriceWithoutTax }}</span></el-descriptions-item>
-      <el-descriptions-item label="税额(元)"><span style="color: red">{{ data.taxAmount }}</span></el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithTax) }}</span></el-descriptions-item>
+      <el-descriptions-item label="未税总价(元)"><span style="color: red">{{ formatCurrency(data.totalPriceWithoutTax) }}</span></el-descriptions-item>
+      <el-descriptions-item label="税额(元)"><span style="color: red">{{ formatCurrency(data.taxAmount) }}</span></el-descriptions-item>
       <el-descriptions-item label="支付方式">
         <dict-tag :options="dict.type.payment_method" :value="data.receiptMethod"/>
       </el-descriptions-item>
diff --git a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue
index 3facb691..e1be8e79 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue
@@ -46,7 +46,7 @@
 <!--      <el-table-column label="项目名称" align="center" prop="projectName" />-->
       <el-table-column label="金额" align="center" prop="totalPriceWithTax" >
         <template slot-scope="scope">
-          <span style="color: red">{{ scope.row.totalPriceWithTax  }}</span>
+          <span style="color: red">{{ formatCurrency(scope.row.totalPriceWithTax)  }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="汇智负责人" align="center" prop="hzUserName" />-->
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue
index 0fec97d3..8f470a71 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue
@@ -31,7 +31,7 @@
       <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column label="开票编号" align="center" prop="invoiceBillCode" />
       <el-table-column label="客户" align="center" prop="partnerName" />
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime) }}</span>
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
index 1840fffe..70f80491 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
@@ -4,9 +4,9 @@
     <el-descriptions title="开票单信息" :column="3" border>
       <el-descriptions-item label="销售-开票单编号">{{ data.invoiceBillCode }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="进货商">{{ data.partnerName }}</el-descriptions-item>
-      <el-descriptions-item label="含税总价(元)">{{ data.totalPriceWithTax }}</el-descriptions-item>
-      <el-descriptions-item label="未税总价(元)">{{ data.totalPriceWithoutTax }}</el-descriptions-item>
-      <el-descriptions-item label="税额(元)">{{ data.taxAmount }}</el-descriptions-item>
+      <el-descriptions-item label="含税总价(元)">{{ formatCurrency(data.totalPriceWithTax) }}</el-descriptions-item>
+      <el-descriptions-item label="未税总价(元)">{{ formatCurrency(data.totalPriceWithoutTax) }}</el-descriptions-item>
+      <el-descriptions-item label="税额(元)">{{ formatCurrency(data.taxAmount) }}</el-descriptions-item>
 <!--      <el-descriptions-item label="银行账号">{{ data.buyerBankAccount }}</el-descriptions-item>-->
 <!--      <el-descriptions-item label="账户名称">{{ data.buyerName }}</el-descriptions-item>-->
 <!--      <el-descriptions-item label="银行开户行">{{ data.buyerBank }}</el-descriptions-item>-->
@@ -29,8 +29,8 @@
             <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
           </template>
         </el-table-column>
-        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center"></el-table-column>
-        <el-table-column prop="receiptAmount" label="本次开票金额" align="center"></el-table-column>
+        <el-table-column prop="totalPriceWithTax" label="含税总价" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
+        <el-table-column prop="receiptAmount" label="本次开票金额" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
       </el-table>
     </div>
 
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue
index 2cabf906..c4080a50 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue
@@ -43,7 +43,7 @@
       <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column label="开票编号" align="center" prop="invoiceBillCode" />
       <el-table-column label="进货商" align="center" prop="partnerName" />
-      <el-table-column label="金额" align="center" prop="totalPriceWithTax" />
+      <el-table-column label="金额" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
index 06ccdaa5..1d639121 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
@@ -33,7 +33,7 @@
       <el-table-column label="客户" align="center" prop="partnerName" />
       <el-table-column label="金额" align="center" prop="totalPriceWithTax">
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ scope.row.totalPriceWithTax }}</span>
+          <span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
index 4b8abc58..80ce4ef4 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
@@ -5,13 +5,13 @@
       <el-descriptions-item label="销售-开票单编号">{{ data.invoiceBillCode }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="进货商">{{ data.partnerName }}</el-descriptions-item>
       <el-descriptions-item label="含税总价(元)">
-        <span :style="data.totalPriceWithTax < 0 ? 'color: red' : ''">{{ data.totalPriceWithTax }}</span>
+        <span :style="data.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(data.totalPriceWithTax) }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="未税总价(元)">
-        <span :style="data.totalPriceWithoutTax < 0 ? 'color: red' : ''">{{ data.totalPriceWithoutTax }}</span>
+        <span :style="data.totalPriceWithoutTax < 0 ? 'color: red' : ''">{{ formatCurrency(data.totalPriceWithoutTax) }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="税额(元)">
-        <span :style="data.taxAmount < 0 ? 'color: red' : ''">{{ data.taxAmount }}</span>
+        <span :style="data.taxAmount < 0 ? 'color: red' : ''">{{ formatCurrency(data.taxAmount) }}</span>
       </el-descriptions-item>
 <!--      <el-descriptions-item label="银行账号">{{ data.buyerBankAccount }}</el-descriptions-item>-->
 <!--      <el-descriptions-item label="账户名称">{{ data.buyerName }}</el-descriptions-item>-->
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
index 4848c662..3cb297bc 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
@@ -45,7 +45,7 @@
       <el-table-column label="进货商" align="center" prop="partnerName" />
       <el-table-column label="金额" align="center" prop="totalPriceWithTax">
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ scope.row.totalPriceWithTax }}</span>
+          <span :style="scope.row.totalPriceWithTax < 0 ? 'color: red' : ''">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="提交日期" align="center" prop="applyTime" width="180">
diff --git a/oms_web/oms_vue/src/views/finance/charge/index.vue b/oms_web/oms_vue/src/views/finance/charge/index.vue
index 314b8cdc..f4b7090f 100644
--- a/oms_web/oms_vue/src/views/finance/charge/index.vue
+++ b/oms_web/oms_vue/src/views/finance/charge/index.vue
@@ -79,26 +79,26 @@
         </template>
       </el-table-column>
       <el-table-column label="收入" align="center" v-if="columns.incomeWithTaxTotal.visible || columns.incomeWithoutTaxTotal.visible || columns.incomeTax.visible">
-        <el-table-column label="含税总价(元)" align="center" prop="incomeWithTaxTotal"   width="180" v-if="columns.incomeWithTaxTotal.visible" key="incomeWithTaxTotal"/>
-        <el-table-column label="未含税总价(元)" align="center" prop="incomeWithoutTaxTotal"  width="180" v-if="columns.incomeWithoutTaxTotal.visible" key="incomeWithoutTaxTotal"/>
+        <el-table-column label="含税总价(元)" align="center" prop="incomeWithTaxTotal"   width="180" v-if="columns.incomeWithTaxTotal.visible" key="incomeWithTaxTotal" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未含税总价(元)" align="center" prop="incomeWithoutTaxTotal"  width="180" v-if="columns.incomeWithoutTaxTotal.visible" key="incomeWithoutTaxTotal" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="税额(元)" align="center" prop="incomeTax"  width="180" v-if="columns.incomeTax.visible" key="incomeTax">
           <template slot-scope="scope">
-            <span>{{ $calc.sub(scope.row.incomeWithTaxTotal, scope.row.incomeWithoutTaxTotal) }}</span>
+            <span>{{ formatCurrency($calc.sub(scope.row.incomeWithTaxTotal, scope.row.incomeWithoutTaxTotal)) }}</span>
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column label="成本" align="center" v-if="columns.costSoftwareWithoutTax.visible || columns.costHardwareWithoutTax.visible || columns.costSoftwareMaintWithoutTax.visible || columns.costHardwareMaintWithoutTax.visible || columns.costProvinceServiceWithoutTax.visible || columns.costOtherWithoutTax.visible || columns.allCostWithoutTax.visible">
-        <el-table-column label="软件折后未税小计" align="center" prop="costSoftwareWithoutTax"  width="180" v-if="columns.costSoftwareWithoutTax.visible" key="costSoftwareWithoutTax"/>
-        <el-table-column label="硬件折后未税小计" align="center" prop="costHardwareWithoutTax"  width="180" v-if="columns.costHardwareWithoutTax.visible" key="costHardwareWithoutTax"/>
-        <el-table-column label="软件维保折后未税小计" align="center" prop="costSoftwareMaintWithoutTax"  width="180" v-if="columns.costSoftwareMaintWithoutTax.visible" key="costSoftwareMaintWithoutTax"/>
-        <el-table-column label="硬件维保折后未税小计" align="center" prop="costHardwareMaintWithoutTax"  width="180" v-if="columns.costHardwareMaintWithoutTax.visible" key="costHardwareMaintWithoutTax"/>
-        <el-table-column label="省代服务折后未税小计" align="center" prop="costProvinceServiceWithoutTax"  width="180" v-if="columns.costProvinceServiceWithoutTax.visible" key="costProvinceServiceWithoutTax"/>
-        <el-table-column label="其它折后未税小计" align="center" prop="costOtherWithoutTax"  width="180" v-if="columns.costOtherWithoutTax.visible" key="costOtherWithoutTax"/>
-        <el-table-column label="成本未税合计" align="center" prop="allCostWithoutTax"  width="180" v-if="columns.allCostWithoutTax.visible" key="allCostWithoutTax">
+        <el-table-column label="软件折后未税小计" align="center" prop="costSoftwareWithoutTax"  width="180" v-if="columns.costSoftwareWithoutTax.visible" key="costSoftwareWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="硬件折后未税小计" align="center" prop="costHardwareWithoutTax"  width="180" v-if="columns.costHardwareWithoutTax.visible" key="costHardwareWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="软件维保折后未税小计" align="center" prop="costSoftwareMaintWithoutTax"  width="180" v-if="columns.costSoftwareMaintWithoutTax.visible" key="costSoftwareMaintWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="硬件维保折后未税小计" align="center" prop="costHardwareMaintWithoutTax"  width="180" v-if="columns.costHardwareMaintWithoutTax.visible" key="costHardwareMaintWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="省代服务折后未税小计" align="center" prop="costProvinceServiceWithoutTax"  width="180" v-if="columns.costProvinceServiceWithoutTax.visible" key="costProvinceServiceWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="其它折后未税小计" align="center" prop="costOtherWithoutTax"  width="180" v-if="columns.costOtherWithoutTax.visible" key="costOtherWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="成本未税合计" align="center" prop="allCostWithoutTax"  width="180" v-if="columns.allCostWithoutTax.visible" key="allCostWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)">
 
         </el-table-column>
       </el-table-column>
-      <el-table-column label="毛利" align="center" prop="grossProfit"  width="180" v-if="columns.grossProfit.visible" key="grossProfit"/>
+      <el-table-column label="毛利" align="center" prop="grossProfit"  width="180" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="毛利率" align="center" prop="grossProfitRate"  width="180" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
       <el-table-column label="备注" align="center" prop="remark"  width="180" v-if="columns.remark.visible" key="remark"/>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/invoice/components/AddForm.vue
index 6d1d175f..a0765e08 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/components/AddForm.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/components/AddForm.vue
@@ -54,11 +54,11 @@
         <el-table-column label="项目名称" align="center" prop="projectName" width="150"/>
         <el-table-column label="合同编号" align="center" prop="orderCode" width="150"/>
         <el-table-column label="出入库单号" align="center" prop="inventoryCode" width="150"/>
-        <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120"/>
+        <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="本次开票金额" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2) }}
+            {{ formatCurrency(calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2)) }}
           </template>
         </el-table-column>
         <el-table-column label="本次开票比例" align="center" width="120">
@@ -66,7 +66,7 @@
             {{ calculateOrderCurrentInvoiceRate(scope.row.id) }}%
           </template>
         </el-table-column>
-        <el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120"/>
+        <el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -89,7 +89,7 @@
       />
 
       <div class="total-info">
-        <span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ totalPlannedAmount.toFixed(2) }}</el-tag></span>
+        <span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ formatCurrency(totalPlannedAmount.toFixed(2)) }}</el-tag></span>
         <span>计划收票比例: <el-tag type="info">{{ totalReceivableAmountWithTax ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) : 0 }}%</el-tag></span>
       </div>
     </div>
diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue
index daee855f..b0d1f683 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue
@@ -23,25 +23,25 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">含税总价(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ detail.totalPriceWithTax }}</span></div>
+              <div class="detail-item">含税总价(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">未税总价(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ detail.totalPriceWithoutTax }} </span></div>
+              <div class="detail-item">未税总价(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithoutTax) }} </span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">税额(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ $calc.sub(detail.totalPriceWithTax,detail.totalPriceWithoutTax) }} </span></div>
+              <div class="detail-item">税额(元):  <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}">{{ formatCurrency($calc.sub(detail.totalPriceWithTax,detail.totalPriceWithoutTax)) }} </span></div>
 
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">发票含税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"> {{ detail.invoicePriceWithTax }}</span></div>
+              <div class="detail-item">发票含税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"> {{ formatCurrency(detail.invoicePriceWithTax) }}</span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">发票未税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ detail.invoicePriceWithoutTax }}</span></div>
+              <div class="detail-item">发票未税总价（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{ formatCurrency(detail.invoicePriceWithoutTax) }}</span></div>
             </el-col>
              <el-col :span="8">
-               <div class="detail-item">发票税额（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{  $calc.sub(detail.invoicePriceWithTax,detail.invoicePriceWithoutTax)  }}</span></div>
+               <div class="detail-item">发票税额（元）: <span :class="{'red-text':detail.invoiceBillType==='RED_RUSH'}"{{  formatCurrency($calc.sub(detail.invoicePriceWithTax,detail.invoicePriceWithoutTax))  }}</span></div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -120,7 +120,7 @@
           <el-table-column property="totalPriceWithTax" label="含税总价（元）"></el-table-column>
           <el-table-column property="receiptAmount" label="本次开票金额">
             <template slot-scope="scope">
-              <span>{{ Math.abs(scope.row.receiptAmount) }}</span>
+              <span>{{ formatCurrency(Math.abs(scope.row.receiptAmount)) }}</span>
             </template>
           </el-table-column>
           <el-table-column property="receiptRate" label="本次开票比例(%)">
diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceDialog.vue b/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceDialog.vue
index d2513c37..65355bf1 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceDialog.vue
@@ -58,7 +58,7 @@
 
                 <div class="detail-item">
                   <span class="item-label">含税金额</span>
-                  <span class="item-value">{{ invoiceData.invoicePriceWithTax }}</span>
+                  <span class="item-value">{{ formatCurrency(invoiceData.invoicePriceWithTax) }}</span>
                 </div>
                 <!-- <div class="detail-item">
                   <span class="item-label">发票含税金额</span>
@@ -66,7 +66,7 @@
                 </div> -->
                 <div class="detail-item">
                   <span class="item-label">未税金额</span>
-                  <span class="item-value">{{ invoiceData.invoicePriceWithoutTax }}</span>
+                  <span class="item-value">{{ formatCurrency(invoiceData.invoicePriceWithoutTax) }}</span>
                 </div>
                 <!-- <div class="detail-item">
                   <span class="item-label">发票未税金额</span>
@@ -74,7 +74,7 @@
                 </div> -->
                 <div class="detail-item">
                   <span class="item-label">税额</span>
-                  <span class="item-value">{{ invoiceData.taxAmount }}</span>
+                  <span class="item-value">{{ formatCurrency(invoiceData.taxAmount) }}</span>
                 </div>
                 <!-- <div class="detail-item">
                   <span class="item-label">发票税额</span>
diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceInfoView.vue b/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceInfoView.vue
index e8cefbef..d34db046 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceInfoView.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/components/InvoiceInfoView.vue
@@ -59,9 +59,9 @@
           <el-table-column label="单位" prop="unit" align="center" width="60"></el-table-column>
           <el-table-column label="数量" prop="quantity" align="center" width="80"></el-table-column>
           <el-table-column label="单价" prop="price" align="center" width="100"></el-table-column>
-          <el-table-column label="金额" prop="allPrice" align="center" width="100"></el-table-column>
+          <el-table-column label="金额" prop="allPrice" align="center" width="100" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column label="税率%" prop="taxRate" align="center" width="80"></el-table-column>
-          <el-table-column label="税额" prop="taxAmount" align="center" width="100"></el-table-column>
+          <el-table-column label="税额" prop="taxAmount" align="center" width="100" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
         </el-table>
       </div>
 
@@ -73,7 +73,7 @@
         </div>
         <div class="total-label-small">(小写)</div>
         <div class="total-value-number">
-          ¥{{ totalAmountNumber }}
+          ¥{{ formatCurrency(totalAmountNumber) }}
         </div>
       </div>
 
diff --git a/oms_web/oms_vue/src/views/finance/invoice/index.vue b/oms_web/oms_vue/src/views/finance/invoice/index.vue
index a5f1a62c..e1d6ff62 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/index.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/index.vue
@@ -136,28 +136,28 @@
       <el-table-column label="进货商名称" align="center" prop="partnerName" width="300" />
       <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" >
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }}</span>
+          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax"  width="180">
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithoutTax }}</span>
+          <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="发票未税总价(元)" align="center" prop="invoicePriceWithoutTax" width="180">
         <template slot-scope="scope">
-          <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.invoicePriceWithoutTax }}</span>
+          <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.invoicePriceWithoutTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="税额(元)" align="center" prop="taxAmount" width="180">
         <template slot-scope="scope">
-          <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ $calc.sub(scope.row.totalPriceWithTax, scope.row.totalPriceWithoutTax) }}</span>
+          <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.totalPriceWithoutTax)) }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="发票税额(元)" align="center" prop="invoicePriceTax" width="180">
         <template slot-scope="scope">
-        <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ $calc.sub(scope.row.totalPriceWithTax, scope.row.invoicePriceWithoutTax) }}</span>
+        <span :style="scope.row.invoicePriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicePriceWithoutTax)) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开票状态" align="center" prop="invoiceStatus" width="150" >
diff --git a/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue b/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
index 0720bd9c..00bb609b 100644
--- a/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
@@ -25,7 +25,7 @@
               <div class="detail-item"><strong>该制造商是否有预付单:</strong> {{ formData.preResidueAmount == 0 ? '否' : '是' }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>预付金额(元):</strong> {{ formData.preResidueAmount }}</div>
+              <div class="detail-item"><strong>预付金额(元):</strong> {{ formatCurrency(formData.preResidueAmount) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -41,35 +41,35 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>含税总价(元):</strong> {{ formData.totalPriceWithTax }}</div>
+              <div class="detail-item"><strong>含税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithTax) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>未税总价(元):</strong> {{ formData.totalPriceWithoutTax }}</div>
+              <div class="detail-item"><strong>未税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithoutTax) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>税额(元):</strong> {{ formData.taxAmount }}</div>
+              <div class="detail-item"><strong>税额(元):</strong> {{ formatCurrency(formData.taxAmount) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>未付款金额(元):</strong> {{ formData.unpaidPaymentAmount }}</div>
+              <div class="detail-item"><strong>未付款金额(元):</strong> {{ formatCurrency(formData.unpaidPaymentAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>已付款金额(元):</strong> {{ formData.paidPaymentAmount }}</div>
+              <div class="detail-item"><strong>已付款金额(元):</strong> {{ formatCurrency(formData.paidPaymentAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>付款中金额(元):</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.paidPaymentAmount),formData.unpaidPaymentAmount) }}</div>
+              <div class="detail-item"><strong>付款中金额(元):</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.paidPaymentAmount),formData.unpaidPaymentAmount)) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>未收票金额(元):</strong> {{ formData.unreceivedTicketAmount }}</div>
+              <div class="detail-item"><strong>未收票金额(元):</strong> {{ formatCurrency(formData.unreceivedTicketAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>已收票金额(元):</strong> {{ formData.receivedTicketAmount }}</div>
+              <div class="detail-item"><strong>已收票金额(元):</strong> {{ formatCurrency(formData.receivedTicketAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>收票中金额(元):</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedTicketAmount),formData.unreceivedTicketAmount)}}</div>
+              <div class="detail-item"><strong>收票中金额(元):</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedTicketAmount),formData.unreceivedTicketAmount))}}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -107,7 +107,7 @@
               </el-table-column>
               <el-table-column prop="paymentAmount" label="本次付款金额">
                 <template slot-scope="scope">
-                  <span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ scope.row.paymentAmount }}</span>
+                  <span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ formatCurrency(scope.row.paymentAmount) }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="paymentRate" label="本次付款比例"></el-table-column>
@@ -142,7 +142,7 @@
               </el-table-column>
               <el-table-column prop="paymentAmount" label="本次收票金额">
                 <template slot-scope="scope">
-                <span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ scope.row.paymentAmount }}</span>
+                <span :style="scope.row.paymentAmount<0?{color:'red'}:{}"> {{ formatCurrency(scope.row.paymentAmount) }}</span>
                 </template>
 
               </el-table-column>
diff --git a/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue b/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
index f5a206a9..14f04c8e 100644
--- a/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
@@ -39,7 +39,7 @@
         <el-table-column label="预计付款时间" align="center" prop="planPaymentDate" width="180"/>
         <el-table-column label="预期付款计划" align="center" width="100" prop="planAmount">
         <template slot-scope="scope">
-          {{ calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2) }}
+          {{ formatCurrency(calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2)) }}
         </template>
         </el-table-column>
         <el-table-column label="预期付款比例" align="center" width="120">
@@ -56,8 +56,8 @@
 <!--            <dict-tag :options="dict.type.payment_status" :value="scope.row.paymentStatus"/>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 <!--        <el-table-column label="本次付款金额" align="center" width="120">-->
 <!--          <template slot-scope="scope">-->
 <!--            {{ calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2) }}-->
@@ -68,10 +68,10 @@
 <!--            {{ calculateOrderCurrentPaymentRate(scope.row.id) }}%-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="已付款金额(元)" align="center" prop="paidPaymentAmount" width="120"/>
+        <el-table-column label="已付款金额(元)" align="center" prop="paidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="付款中金额(元)" align="center" prop="paidAmount" width="120">
           <template slot-scope="scope">
-            {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount) }}
+            {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount)) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@@ -90,7 +90,7 @@
       <div class="total-info">
 
         <span style="margin-left: 20px;">计划付款总金额: <el-tag type="success">{{
-            totalPlannedAmount.toFixed(2)
+            formatCurrency(totalPlannedAmount.toFixed(2))
           }}</el-tag></span>
         <span>计划付款比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) }}%</el-tag></span>
       </div>
diff --git a/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
index bb5fbec4..28053a1d 100644
--- a/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
@@ -51,7 +51,7 @@
 <!--        </el-table-column>-->
         <el-table-column label="预期收票计划" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2) }}
+            {{ formatCurrency(calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2)) }}
           </template>
         </el-table-column>
         <el-table-column label="预期收票比例" align="center" width="120">
@@ -68,13 +68,13 @@
 <!--            <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 
-        <el-table-column label="已收票金额(元)" align="center" prop="receivedTicketAmount" width="120"/>
-        <el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120">
+        <el-table-column label="已收票金额(元)" align="center" prop="receivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120" >
           <template slot-scope="scope">
-            {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount)}}
+            {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount))}}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@@ -93,7 +93,7 @@
       <div class="total-info">
 
         <span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{
-            totalPlannedAmount.toFixed(2)
+            formatCurrency( totalPlannedAmount.toFixed(2))
           }}</el-tag></span>
         <span>计划收票比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) }}%</el-tag></span>
       </div>
diff --git a/oms_web/oms_vue/src/views/finance/payable/index.vue b/oms_web/oms_vue/src/views/finance/payable/index.vue
index feba8e89..b29ca7d2 100644
--- a/oms_web/oms_vue/src/views/finance/payable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/index.vue
@@ -133,7 +133,7 @@
           <span :style="getPaymentDateStyle(scope.row.planPaymentDate)">{{ scope.row.planPaymentDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预计付款金额" align="center" prop="planAmount" width="120" />
+      <el-table-column label="预计付款金额" align="center" prop="planAmount" width="120"  :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="该制造商是否有预付单" align="center" prop="hasAdvancePayment" width="150">
         <template slot-scope="scope">
           {{ scope.row.preResidueAmount == 0 ? '否' : '是' }}
@@ -148,7 +148,7 @@
           <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
         </template>
       </el-table-column>
-      <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" />
+      <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"  :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <!--      <el-table-column label="未税总价" align="center" prop="totalPriceWithoutTax" width="120" />-->
       <!--      <el-table-column label="税额" align="center" prop="taxAmount" width="120" />-->
 <!--      <el-table-column label="付款状态" align="center" prop="paymentStatus" width="120">-->
@@ -175,8 +175,8 @@
       <!--          >生成收票单</el-button>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" />
-      <el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" />
+      <el-table-column label="未付款金额(元)" align="center" prop="unpaidPaymentAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
+      <el-table-column label="未收票金额(元)" align="center" prop="unreceivedTicketAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
 <!--      <el-table-column label="付款中金额" align="center" prop="payingAmount" width="120" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
         <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/finance/payable/report.vue b/oms_web/oms_vue/src/views/finance/payable/report.vue
index 44be54ff..335c70f0 100644
--- a/oms_web/oms_vue/src/views/finance/payable/report.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/report.vue
@@ -96,8 +96,8 @@
             <dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
-        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
+        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
       </el-table-column>
 
@@ -114,9 +114,9 @@
 
       <!-- 应付 -->
       <el-table-column label="应付单" align="center">
-        <el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax"/>
-        <el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax"/>
-        <el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax"/>
+        <el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 付款 -->
@@ -126,15 +126,15 @@
             <dict-tag :options="dict.type.report_payment_status" :value="scope.row.paymentStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax"/>
-        <el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax"/>
-        <el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax"/>
-        <el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax"/>
-        <el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax"/>
-        <el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax"/>
-        <el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax"/>
-        <el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax"/>
-        <el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax"/>
+        <el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 收票 -->
@@ -144,15 +144,15 @@
             <dict-tag :options="dict.type.report_ticket_status" :value="scope.row.ticketStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax"/>
-        <el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax"/>
-        <el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax"/>
-        <el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax"/>
-        <el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax"/>
-        <el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax"/>
-        <el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax"/>
-        <el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax"/>
-        <el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax"/>
+        <el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"1/>
       </el-table-column>
 
     </el-table>
diff --git a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
index 1de6a302..8bf002bc 100644
--- a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="新增付款单" :visible.sync="internalVisible" width="1200px" @close="handleClose"
              :close-on-click-modal="false" append-to-body>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" style="max-height: 70vh" label-width="120px">
       <el-row>
         <el-col :span="24">
           <el-form-item label="制造商名称" prop="vendorCode">
@@ -45,7 +45,15 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="其它特别说明" prop="remark">
+            <el-input v-model="form.remark"  type="textarea"
+                      :rows="2"
+                      style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <!-- Tables -->
       <div v-if="form.vendorCode">
         <div v-if="form.paymentBillType === 'FROM_PAYABLE'" class="table-container">
@@ -56,7 +64,7 @@
             border
             style="width: 100%"
             @selection-change="handleSelectionChange"
-            max-height="400"
+            max-height="300"
             row-key="id"
             show-summary
             :summary-method="getPayableSummary"
@@ -125,7 +133,7 @@
             @selection-change="handleSelectionChange"
             @select="handleSelect"
             @select-all="handleSelectAll"
-            max-height="400"
+            max-height="300"
             row-key="id"
           >
             <el-table-column type="selection" width="55" reserve-selection></el-table-column>
@@ -151,7 +159,6 @@
       <div v-else style="text-align: center; color: #909399; padding: 20px;">
         请先选择制造商
       </div>
-
     </el-form>
     <div slot="footer" class="dialog-footer">
       <!--      <div v-if="form.paymentBillType === 'FROM_PAYABLE'" style="float: left; line-height: 36px;">-->
@@ -475,6 +482,7 @@ export default {
               vendorCode: this.form.vendorCode,
               projectCode:order.projectCode,
               projectName:order.projectName,
+              remark: this.form.remark,
               paymentTime: this.form.estimatedPaymentTime,
               totalPriceWithTax:this.form.totalPriceWithTax
             };
diff --git a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
index cc77cf6d..fa5304d0 100644
--- a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
@@ -24,13 +24,13 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">含税总价(元):<span :class="{'red-text':detail.paymentBillType==='REFUND'}"> {{ detail.totalPriceWithTax }}</span></div>
+              <div class="detail-item">含税总价(元):<span :class="{'red-text':detail.paymentBillType==='REFUND'}"> {{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">未税总价(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ detail.totalPriceWithoutTax }}</span></div>
+              <div class="detail-item">未税总价(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ formatCurrency(detail.totalPriceWithoutTax) }}</span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">税额(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ detail.taxAmount }} </span></div>
+              <div class="detail-item">税额(元): <span :class="{'red-text':detail.paymentBillType==='REFUND'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -39,19 +39,20 @@
               <dict-tag :options="dict.type.payment_bill_type" :value="detail.paymentBillType"/>
               </div>
             </el-col>
-            <el-col :span="8">
-              <div class="detail-item">预付单剩余额度: {{ detail.preResidueAmount || '-' }}</div>
-            </el-col>
+<!--            <el-col :span="8">-->
+<!--              <div class="detail-item">预付单剩余额度: {{ detail.preResidueAmount || '-' }}</div>-->
+<!--            </el-col>-->
             <el-col :span="8">
               <div class="detail-item">实际付款时间: {{ detail.actualPaymentTime || '-'}}</div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
+
             <el-col :span="8">
               <div class="detail-item">支付方式:
                 <dict-tag :options="dict.type.payment_method" :value="detail.paymentMethod"/>
               </div>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="8">
               <div class="detail-item">付款状态:
                 <dict-tag :options="dict.type.payment_status" :value="detail.paymentStatus"/>
@@ -60,24 +61,26 @@
             <el-col :span="8">
               <div class="detail-item">审批节点: {{ detail.approveNode|| '-' }}</div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
+
             <el-col :span="8">
               <div class="detail-item">审批状态:
                 <dict-tag :options="dict.type.approve_status" :value="detail.approveStatus"/>
               </div>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="8">
               <div class="detail-item">审批通过时间: {{ detail.approveTime || '-'}}</div>
             </el-col>
             <el-col :span="8">
               <div class="detail-item">账户名称: {{ detail.payName }}</div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
+
             <el-col :span="8">
               <div class="detail-item">银行账号: {{ detail.payBankNumber }}</div>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="8">
               <div class="detail-item">银行开户行: {{ detail.payBankOpenAddress }}</div>
             </el-col>
@@ -85,6 +88,11 @@
               <div class="detail-item">银行行号: {{ detail.bankNumber }}</div>
             </el-col>
           </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <div class="detail-item">其它特别说明: {{ detail.remark }}</div>
+            </el-col>
+          </el-row>
         </div>
       </div>
 
@@ -95,10 +103,10 @@
           <el-table-column property="projectCode" label="项目编号"></el-table-column>
           <el-table-column property="projectName" label="项目名称"></el-table-column>
           <el-table-column property="payableBillCode" label="采购-应付单编号"></el-table-column>
-          <el-table-column property="totalPriceWithTax" label="含税总价"></el-table-column>
+          <el-table-column property="totalPriceWithTax" label="含税总价" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column property="paymentAmount" label="本次付款金额">
             <template slot-scope="scope">
-              <span>{{ Math.abs(scope.row.paymentAmount) }}</span>
+              <span>{{ formatCurrency(Math.abs(scope.row.paymentAmount)) }}</span>
             </template>
           </el-table-column>
           <el-table-column property="paymentRate" label="本次付款比例">
@@ -122,7 +130,7 @@ export default {
     },
     detail: {
       type: Object,
-      default: () => null,
+      default: () => {},
     },
   },
   dicts:['payment_bill_type','approve_status','payment_status','payment_method'],
diff --git a/oms_web/oms_vue/src/views/finance/payment/index.vue b/oms_web/oms_vue/src/views/finance/payment/index.vue
index 4ad9e18b..1db84d02 100644
--- a/oms_web/oms_vue/src/views/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/index.vue
@@ -135,6 +135,16 @@
           @click="handleAdd"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          v-hasPermi="['finance:payment:export']"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -148,7 +158,7 @@
       <el-table-column label="制造商名称" width="200" align="center" prop="vendorName"/>
       <el-table-column label="含税总价(元)" align="center" width="200" prop="totalPriceWithTax">
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax }}</span>
+          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" width="100" prop="paymentBillType">
@@ -156,7 +166,7 @@
           <dict-tag :options="dict.type.payment_bill_type" :value="scope.row.paymentBillType"/>
         </template>
       </el-table-column>
-      <el-table-column label="预付单剩余额度" align="center" width="200" prop="preResidueAmount"/>
+<!--      <el-table-column label="预付单剩余额度" align="center" width="200" prop="preResidueAmount"/>-->
       <el-table-column label="实际付款时间" align="center" prop="actualPaymentTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.actualPaymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -289,7 +299,18 @@
 </template>
 
 <script>
-import { listPayment, getPayment, returnPayment, addPaymentFromPayable, applyPaymentApi,applyRefundApprove, applyRefund,addPayment,handleRevoke } from "@/api/finance/payment";
+import {
+  listPayment,
+  getPayment,
+  returnPayment,
+  addPaymentFromPayable,
+  applyPaymentApi,
+  applyRefundApprove,
+  applyRefund,
+  addPayment,
+  handleRevoke,
+  exportPayment
+} from "@/api/finance/payment";
 import { addDateRange } from "@/utils/ruoyi";
 import DetailDrawer from "./components/DetailDrawer.vue";
 import AddForm from "./components/AddForm.vue";
@@ -336,7 +357,7 @@ export default {
       dateRangeActual: [],
       // 详情抽屉
       detailOpen: false,
-      detailData: null,
+      detailData: {},
       // 新增弹窗
       addOpen: false,
       // 回执单弹窗
@@ -394,6 +415,13 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleExport() {
+      this.$modal.confirm('是否确认导出付款单数据？').then(() => {
+        return exportPayment(this.queryParams);
+      }).then(response => {
+        this.$download.download(  response.msg)
+      })
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRangeApproval = [];
@@ -408,6 +436,7 @@ export default {
     },
     /** 新增提交 */
     handleAddSubmit(form) {
+      console.log('1111')
       if (form.paymentBillType==='FROM_PAYABLE'){
         addPaymentFromPayable(form).then(response => {
           this.$modal.msgSuccess("新增成功");
diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/receipt/components/AddForm.vue
index f5dcd2d5..b31260df 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/components/AddForm.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/components/AddForm.vue
@@ -68,7 +68,7 @@
 <!--        </el-table-column>-->
         <el-table-column label="预期收票计划" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2) }}
+            {{ formatCurrency(calculateOrderCurrentTicketAmount(scope.row.id).toFixed(2)) }}
           </template>
         </el-table-column>
         <el-table-column label="预期收票比例" align="center" width="120">
@@ -85,13 +85,13 @@
 <!--            <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未收票金额(元)" align="center" prop="unInvoicedAmount" width="120"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票金额(元)" align="center" prop="unInvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 
-        <el-table-column label="已收票金额(元)" align="center" prop="invoicedAmount" width="120"/>
+        <el-table-column label="已收票金额(元)" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="收票中金额(元)" align="center" prop="invoicedAmount" width="120">
           <template slot-scope="scope">
-            {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount)}}
+            {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax,scope.row.receivedTicketAmount),scope.row.unreceivedTicketAmount))}}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@@ -116,7 +116,7 @@
       />
 
       <div class="total-info">
-        <span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ totalPlannedAmount.toFixed(2) }}</el-tag></span>
+        <span style="margin-left: 20px;">计划收票总金额: <el-tag type="success">{{ formatCurrency(totalPlannedAmount.toFixed(2)) }}</el-tag></span>
         <span>计划收票比例: <el-tag type="info">{{ totalPayableAmountWithTax ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalPayableAmountWithTax,4),100) : 0 }}%</el-tag></span>
       </div>
     </div>
diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
index e770e71d..8abcf436 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
@@ -26,28 +26,28 @@
               <div class="detail-item">制造商名称: {{ detail.vendorName }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.totalPriceWithTax }}</span></div>
+              <div class="detail-item">含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.totalPriceWithTax) }}</span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.totalPriceWithoutTax }}</span></div>
+              <div class="detail-item">未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{formatCurrency(detail.totalPriceWithoutTax) }}</span></div>
 
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.taxAmount }} </span></div>
+              <div class="detail-item">税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">发票含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketPriceWithTax || '-'}} </span></div>
+              <div class="detail-item">发票含税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.ticketPriceWithTax) || '-'}} </span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">发票未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketPriceWithoutTax || '-'}} </span></div>
+              <div class="detail-item">发票未税总价: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ (detail.ticketPriceWithoutTax) || '-'}} </span></div>
             </el-col>
           </el-row>
 
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">发票税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ detail.ticketAmount }} </span></div>
+              <div class="detail-item">发票税额: <span :class="{'red-text':detail.ticketBillType==='RED_RUSH'}">{{ formatCurrency(detail.ticketAmount) }} </span></div>
             </el-col>
             <el-col :span="8">
               <div class="detail-item">收票状态:
@@ -81,8 +81,8 @@
           <el-table-column property="projectCode" label="项目编号"></el-table-column>
           <el-table-column property="projectName" label="项目名称"></el-table-column>
           <el-table-column property="payableBillCode" label="采购应付单编号"></el-table-column>
-          <el-table-column property="totalPriceWithTax" label="含税总价"></el-table-column>
-          <el-table-column property="paymentAmount" label="本次收票金额"></el-table-column>
+          <el-table-column property="totalPriceWithTax" label="含税总价" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
+          <el-table-column property="paymentAmount" label="本次收票金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column property="paymentRate" label="本次收票比例(%)"></el-table-column>
         </el-table>
       </div>
diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
index 1d545b33..281d8553 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
@@ -53,27 +53,27 @@
 
                 <div class="detail-item">
                   <span class="item-label">含税金额</span>
-                  <span class="item-value">{{ receiptData.totalPriceWithTax }}</span>
+                  <span class="item-value">{{ formatCurrency(receiptData.totalPriceWithTax) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">发票含税金额</span>
-                  <span class="item-value">{{ attachment.priceWithTax||receiptData.ticketPriceWithTax }}</span>
+                  <span class="item-value">{{ formatCurrency(attachment.priceWithTax||receiptData.ticketPriceWithTax) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">未税金额</span>
-                  <span class="item-value">{{ receiptData.totalPriceWithoutTax }}</span>
+                  <span class="item-value">{{ formatCurrency(receiptData.totalPriceWithoutTax) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">发票未税金额</span>
-                  <span class="item-value">{{ attachment.priceWithoutTax||receiptData.ticketPriceWithoutTax }}</span>
+                  <span class="item-value">{{ formatCurrency(attachment.priceWithoutTax||receiptData.ticketPriceWithoutTax) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">税额</span>
-                  <span class="item-value">{{   receiptData.taxAmount }}</span>
+                  <span class="item-value">{{   formatCurrency(receiptData.taxAmount) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">发票税额</span>
-                  <span class="item-value">{{ attachment.taxAmount || receiptData.ticketAmount }}</span>
+                  <span class="item-value">{{formatCurrency( attachment.taxAmount || receiptData.ticketAmount) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">备注</span>
diff --git a/oms_web/oms_vue/src/views/finance/receipt/index.vue b/oms_web/oms_vue/src/views/finance/receipt/index.vue
index 7c9b9275..6039a2ac 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/index.vue
@@ -142,17 +142,17 @@
       <el-table-column label="制造商名称" align="center" prop="vendorName" />
       <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" >
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax  }}</span>
+          <span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax)  }}</span>
         </template>
       </el-table-column>
       <el-table-column label="未税总价(元)" align="center" prop="totalPriceWithoutTax" >
         <template slot-scope="scope">
-          <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithoutTax  }}</span>
+          <span :style="scope.row.totalPriceWithoutTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithoutTax)  }}</span>
         </template>
       </el-table-column>
       <el-table-column label="税额(元)" align="center" prop="taxAmount" >
         <template slot-scope="scope">
-          <span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ scope.row.taxAmount  }}</span>
+          <span :style="scope.row.taxAmount<0?{color:'red'}:{}">{{ formatCurrency(scope.row.taxAmount)  }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="收票单类型" align="center" prop="ticketBillType" >-->
diff --git a/oms_web/oms_vue/src/views/finance/receivable/components/EditForm.vue b/oms_web/oms_vue/src/views/finance/receivable/components/EditForm.vue
index 450cdd75..00ef8086 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/components/EditForm.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/components/EditForm.vue
@@ -25,7 +25,7 @@
               <div class="detail-item"><strong>该进货商是否有预收单:</strong> {{  formData.remainingAmount == 0 ? '否' : '是' }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>预收金额:</strong> {{ formData.remainingAmount }}</div>
+              <div class="detail-item"><strong>预收金额:</strong> {{ formatCurrency(formData.remainingAmount) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -41,35 +41,35 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>含税总价(元):</strong> {{ formData.totalPriceWithTax }}</div>
+              <div class="detail-item"><strong>含税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithTax) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>未税总价(元):</strong> {{ formData.totalPriceWithoutTax }}</div>
+              <div class="detail-item"><strong>未税总价(元):</strong> {{ formatCurrency(formData.totalPriceWithoutTax) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>税额(元):</strong> {{ formData.taxAmount }}</div>
+              <div class="detail-item"><strong>税额(元):</strong> {{ formatCurrency(formData.taxAmount) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>未收款金额:</strong> {{ formData.unreceivedAmount }}</div>
+              <div class="detail-item"><strong>未收款金额:</strong> {{ formatCurrency(formData.unreceivedAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>已收款金额:</strong> {{ formData.receivedAmount }}</div>
+              <div class="detail-item"><strong>已收款金额:</strong> {{ formatCurrency(formData.receivedAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>收款中金额:</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedAmount),formData.unreceivedAmount) }}</div>
+              <div class="detail-item"><strong>收款中金额:</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.receivedAmount),formData.unreceivedAmount)) }}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item"><strong>未开票金额:</strong> {{ formData.uninvoicedAmount }}</div>
+              <div class="detail-item"><strong>未开票金额:</strong> {{ formatCurrency(formData.uninvoicedAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>已开票金额:</strong> {{ formData.invoicedAmount }}</div>
+              <div class="detail-item"><strong>已开票金额:</strong> {{ formatCurrency(formData.invoicedAmount) }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item"><strong>开票中金额:</strong> {{ this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.invoicedAmount),formData.uninvoicedAmount)}}</div>
+              <div class="detail-item"><strong>开票中金额:</strong> {{ formatCurrency(this.$calc.sub(this.$calc.sub(formData.totalPriceWithTax,formData.invoicedAmount),formData.uninvoicedAmount))}}</div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -105,7 +105,7 @@
                   {{ scope.row.actualReceiptTime || '-' }}
                 </template>
               </el-table-column>
-              <el-table-column prop="receiptAmount" label="本次收款金额"></el-table-column>
+              <el-table-column prop="receiptAmount" label="本次收款金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
               <el-table-column prop="receiptRate" label="本次收款比例"></el-table-column>
               <el-table-column prop="receiptStatus" label="收款状态">
                 <template slot-scope="scope">
@@ -137,7 +137,7 @@
                   {{ scope.row.actualInvoiceTime || '-' }}
                 </template>
               </el-table-column>
-              <el-table-column prop="invoiceAmount" label="本次开票金额"></el-table-column>
+              <el-table-column prop="invoiceAmount" label="本次开票金额" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
               <el-table-column prop="invoiceRate" label="本次开票比例"></el-table-column>
               <el-table-column prop="invoiceStatus" label="开票状态">
                 <template slot-scope="scope">
diff --git a/oms_web/oms_vue/src/views/finance/receivable/components/MergeInvoiceDialog.vue b/oms_web/oms_vue/src/views/finance/receivable/components/MergeInvoiceDialog.vue
index bac72370..7884bc26 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/components/MergeInvoiceDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/components/MergeInvoiceDialog.vue
@@ -41,7 +41,7 @@
 <!--        </el-table-column>-->
         <el-table-column label="预期开票金额" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2) }}
+            {{ formatCurrency(calculateOrderCurrentInvoiceAmount(scope.row.id).toFixed(2)) }}
           </template>
         </el-table-column>
         <el-table-column label="预期开票比例" align="center" width="120">
@@ -57,13 +57,13 @@
             <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>
           </template>
         </el-table-column> -->
-        <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120"/>
+        <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 
-        <el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120"/>
+        <el-table-column label="已开票金额" align="center" prop="invoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="开票中金额" align="center" prop="invoicedAmount" width="120">
           <template slot-scope="scope">
-            {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicedAmount), scope.row.uninvoicedAmount) }}
+            {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.invoicedAmount), scope.row.uninvoicedAmount)) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
@@ -82,7 +82,7 @@
       <div class="total-info">
 
         <span style="margin-left: 20px;">计划开票总金额: <el-tag type="success">{{
-            totalPlannedAmount.toFixed(2)
+            formatCurrency(totalPlannedAmount.toFixed(2))
           }}</el-tag></span>
         <span>计划开票比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) }}%</el-tag></span>
       </div>
diff --git a/oms_web/oms_vue/src/views/finance/receivable/components/MergeReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/receivable/components/MergeReceiptDialog.vue
index c1a5b597..677df4d5 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/components/MergeReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/components/MergeReceiptDialog.vue
@@ -41,7 +41,7 @@
 <!--        </el-table-column>-->
         <el-table-column label="预期收款金额" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateOrderCurrentReceiptAmount(scope.row.id).toFixed(2) }}
+            {{ formatCurrency(calculateOrderCurrentReceiptAmount(scope.row.id).toFixed(2)) }}
           </template>
         </el-table-column>
         <el-table-column label="预期收款比例" align="center" width="120">
@@ -57,12 +57,12 @@
             <dict-tag :options="dict.type.collection_status" :value="scope.row.collectionStatus"/>
           </template>
         </el-table-column> -->
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
-        <el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120"/>
-        <el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="收款中金额(元)" align="center" prop="receivedAmount" width="120">
           <template slot-scope="scope">
-            {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount) }}
+            {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount)) }}
           </template>
         </el-table-column>
 
@@ -82,7 +82,7 @@
       <div class="total-info">
 
         <span style="margin-left: 20px;">计划收款总金额: <el-tag type="success">{{
-            totalPlannedAmount.toFixed(2)
+            formatCurrency(totalPlannedAmount.toFixed(2))
           }}</el-tag></span>
         <span>计划收款比例: <el-tag type="info">{{ this.$calc.mul(this.$calc.div(totalPlannedAmount,totalReceivableAmountWithTax,4),100) }}%</el-tag></span>
       </div>
diff --git a/oms_web/oms_vue/src/views/finance/receivable/index.vue b/oms_web/oms_vue/src/views/finance/receivable/index.vue
index 5dc82912..5aba8aa2 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/index.vue
@@ -101,7 +101,7 @@
       <el-table-column label="项目名称" align="center" prop="projectName" width="240" />
       <el-table-column label="销售-应收单编号" align="center" prop="receivableBillCode" width="150" />
       <el-table-column label="预计收款时间" align="center" prop="planReceiptDate" width="180"/>
-      <el-table-column label="预计收款金额" align="center" prop="planAmount" width="120" />
+      <el-table-column label="预计收款金额" align="center" prop="planAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="该进货商是否有预收单" align="center" prop="hasAdvanceReceipt" width="150" >
         <template slot-scope="scope">
           {{ scope.row.remainingAmount == 0 ? '否' : '是' }}
@@ -113,9 +113,9 @@
           <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
         </template>
       </el-table-column>
-      <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" />
-      <el-table-column label="未收款金额" align="center" prop="unreceivedAmount" width="120" />
-      <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" />
+      <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+      <el-table-column label="未收款金额" align="center" prop="unreceivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+      <el-table-column label="未开票金额" align="center" prop="uninvoicedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
diff --git a/oms_web/oms_vue/src/views/finance/receive/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/receive/components/AddForm.vue
index e658fde0..3298140d 100644
--- a/oms_web/oms_vue/src/views/finance/receive/components/AddForm.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/components/AddForm.vue
@@ -64,7 +64,7 @@
             <!--            </el-table-column>-->
             <el-table-column label="预期收款金额">
               <template slot-scope="scope">
-                {{ calculateOrderCurrentReceiptAmount(scope.row).toFixed(2) }}
+                {{ formatCurrency(calculateOrderCurrentReceiptAmount(scope.row).toFixed(2)) }}
               </template>
             </el-table-column>
             <el-table-column label="预期收款比例" align="center" width="120">
@@ -80,12 +80,12 @@
                 <dict-tag :options="dict.type.collection_status" :value="scope.row.collectionStatus"/>
               </template>
             </el-table-column> -->
-            <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
-            <el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120"/>
-            <el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120"/>
+            <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+            <el-table-column label="未收款金额(元)" align="center" prop="unreceivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+            <el-table-column label="已收款金额(元)" align="center" prop="receivedAmount" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
             <el-table-column label="收款中金额(元)" align="center" prop="receivedAmount" width="120">
               <template slot-scope="scope">
-                {{ $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount) }}
+                {{ formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.receivedAmount), scope.row.unreceivedAmount)) }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"
@@ -104,7 +104,7 @@
           <div class="total-info">
 
         <span style="margin-left: 20px;">计划收款总金额: <el-tag type="success">{{
-            totalPlannedAmount.toFixed(2)
+            formatCurrency(totalPlannedAmount.toFixed(2))
           }}</el-tag></span>
             <span>计划收款比例: <el-tag type="info">{{ totalSelectedReceivableAmount ? this.$calc.mul(this.$calc.div(totalPlannedAmount,totalSelectedReceivableAmount,4),100) : 0 }}%</el-tag></span>
           </div>
diff --git a/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
index 2ab9e335..256d9e0b 100644
--- a/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
@@ -24,13 +24,13 @@
           <el-row :gutter="20">
 
             <el-col :span="8">
-              <div class="detail-item">含税总价(元):<span :class="{'red-text':detail.receiptBillType==='REFUND'}"> {{ detail.totalPriceWithTax }} </span></div>
+              <div class="detail-item">含税总价(元):<span :class="{'red-text':detail.receiptBillType==='REFUND'}"> {{ formatCurrency(detail.totalPriceWithTax) }} </span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">未税总价(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ detail.totalPriceWithoutTax }} </span></div>
+              <div class="detail-item">未税总价(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ formatCurrency(detail.totalPriceWithoutTax) }} </span></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">税额(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ detail.taxAmount }} </span></div>
+              <div class="detail-item">税额(元): <span :class="{'red-text':detail.receiptBillType==='REFUND'}">{{ formatCurrency(detail.taxAmount) }} </span></div>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -39,7 +39,7 @@
                 <dict-tag :options="dict.type.receipt_bill_type" :value="detail.receiptBillType"/></div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">预收单剩余额度:{{detail.remainAmount}}
+              <div class="detail-item">预收单剩余额度:{{formatCurrency(detail.remainAmount)}}
               </div>
             </el-col>
             <el-col :span="8">
@@ -106,11 +106,11 @@
           <el-table-column property="projectCode" label="项目编号"></el-table-column>
           <el-table-column property="projectName" label="项目名称"></el-table-column>
           <el-table-column property="receivableBillCode" label="应收单编号"></el-table-column>
-          <el-table-column property="totalPriceWithTax" label="含税总价(元)"></el-table-column>
+          <el-table-column property="totalPriceWithTax" label="含税总价(元)" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column property="receiptAmount" label="本次收款金额">
             <template slot-scope="scope">
               <span >
-                {{ Math.abs(scope.row.receiptAmount) }}
+                {{ formatCurrency(Math.abs(scope.row.receiptAmount)) }}
               </span>
             </template>
           </el-table-column>
diff --git a/oms_web/oms_vue/src/views/finance/receive/components/ReceiveDialog.vue b/oms_web/oms_vue/src/views/finance/receive/components/ReceiveDialog.vue
index 65c04088..c8757e98 100644
--- a/oms_web/oms_vue/src/views/finance/receive/components/ReceiveDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/components/ReceiveDialog.vue
@@ -53,7 +53,7 @@
 
                 <div class="detail-item">
                   <span class="item-label">收款总额</span>
-                  <span class="item-value">{{ receiptData.totalPriceWithTax }}</span>
+                  <span class="item-value">{{ formatCurrency(receiptData.totalPriceWithTax) }}</span>
                 </div>
                 <div class="detail-item">
                   <span class="item-label">备注</span>
diff --git a/oms_web/oms_vue/src/views/finance/receive/index.vue b/oms_web/oms_vue/src/views/finance/receive/index.vue
index ee2d8ecd..dba36dde 100644
--- a/oms_web/oms_vue/src/views/finance/receive/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/index.vue
@@ -132,7 +132,7 @@
       <el-table-column label="进货商名称" align="center" prop="partnerName" width="230" />
       <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="180" >
         <template slot-scope="scope">
-          <span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ scope.row.totalPriceWithTax  }} </span></span>
+          <span><span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax)  }} </span></span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="receiptBillType" width="180">
@@ -140,7 +140,7 @@
           <dict-tag :options="dict.type.receipt_bill_type" :value="scope.row.receiptBillType"/>
         </template>
       </el-table-column>
-      <el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="180"/>
+      <el-table-column label="预收单剩余额度" align="center" prop="remainingAmount" width="180" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="收款状态" align="center" prop="receiveStatus" width="180">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.receipt_bill_status" :value="scope.row.receiptStatus"/>
diff --git a/oms_web/oms_vue/src/views/finance/receive/report.vue b/oms_web/oms_vue/src/views/finance/receive/report.vue
index 679e3736..7048d75e 100644
--- a/oms_web/oms_vue/src/views/finance/receive/report.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/report.vue
@@ -91,9 +91,9 @@
 
       <!-- 应收 -->
       <el-table-column label="应收单" align="center" v-if="columns.receivableWithTax.visible || columns.receivableWithoutTax.visible||columns.receivableTax.visible">
-        <el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax"/>
-        <el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax"/>
-        <el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax"/>
+        <el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
 
@@ -105,8 +105,8 @@
             <dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
-        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
+        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
       </el-table-column>
 
@@ -128,15 +128,15 @@
             <dict-tag :options="dict.type.report_receipt_status" :value="scope.row.receiptStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax"/>
-        <el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax"/>
-        <el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax"/>
-        <el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax"/>
-        <el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax"/>
-        <el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax"/>
-        <el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax"/>
-        <el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax"/>
-        <el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax"/>
+        <el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 开票 -->
@@ -146,15 +146,15 @@
             <dict-tag :options="dict.type.report_invoice_status" :value="scope.row.invoiceStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax"/>
-        <el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax"/>
-        <el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax"/>
-        <el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax"/>
-        <el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax"/>
-        <el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax"/>
-        <el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax"/>
-        <el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax"/>
-        <el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax"/>
+        <el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
     </el-table>
diff --git a/oms_web/oms_vue/src/views/finance/report/index.vue b/oms_web/oms_vue/src/views/finance/report/index.vue
index f02bee56..61c91410 100644
--- a/oms_web/oms_vue/src/views/finance/report/index.vue
+++ b/oms_web/oms_vue/src/views/finance/report/index.vue
@@ -121,9 +121,9 @@
 
       <!-- 应收 -->
       <el-table-column label="应收单" align="center" v-if="columns.receivableWithTax.visible || columns.receivableWithoutTax.visible||columns.receivableTax.visible">
-        <el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax"/>
-        <el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax"/>
-        <el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax"/>
+        <el-table-column label="应收含税总价" align="center" prop="receivableWithTax" width="120" v-if="columns.receivableWithTax.visible" key="receivableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应收未税总价" align="center" prop="receivableWithoutTax" width="120" v-if="columns.receivableWithoutTax.visible" key="receivableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应收税额" align="center" prop="receivableTax" width="120" v-if="columns.receivableTax.visible" key="receivableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
 
@@ -135,8 +135,8 @@
             <dict-tag :options="dict.type.charge_status" :value="scope.row.chargeStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax"/>
-        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit"/>
+        <el-table-column label="已计收未税金额" align="center" prop="chargedWithoutTax" width="120" v-if="columns.chargedWithoutTax.visible" key="chargedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="毛利" align="center" prop="grossProfit" width="120" v-if="columns.grossProfit.visible" key="grossProfit" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="毛利率" align="center" prop="grossProfitRate" width="100" v-if="columns.grossProfitRate.visible" key="grossProfitRate"/>
       </el-table-column>
 
@@ -158,15 +158,15 @@
             <dict-tag :options="dict.type.report_receipt_status" :value="scope.row.receiptStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax"/>
-        <el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax"/>
-        <el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax"/>
-        <el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax"/>
-        <el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax"/>
-        <el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax"/>
-        <el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax"/>
-        <el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax"/>
-        <el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax"/>
+        <el-table-column label="已收款含税金额" align="center" prop="receivedWithTax" width="120" v-if="columns.receivedWithTax.visible" key="receivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收款未税金额" align="center" prop="receivedWithoutTax" width="120" v-if="columns.receivedWithoutTax.visible" key="receivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收款税额" align="center" prop="receivedTax" width="120" v-if="columns.receivedTax.visible" key="receivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中含税金额" align="center" prop="receivingWithTax" width="120" v-if="columns.receivingWithTax.visible" key="receivingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中未税金额" align="center" prop="receivingWithoutTax" width="120" v-if="columns.receivingWithoutTax.visible" key="receivingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收款中税额" align="center" prop="receivingTax" width="120" v-if="columns.receivingTax.visible" key="receivingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款含税金额" align="center" prop="unreceivedWithTax" width="120" v-if="columns.unreceivedWithTax.visible" key="unreceivedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款未税金额" align="center" prop="unreceivedWithoutTax" width="120" v-if="columns.unreceivedWithoutTax.visible" key="unreceivedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收款税额" align="center" prop="unreceivedTax" width="120" v-if="columns.unreceivedTax.visible" key="unreceivedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 开票 -->
@@ -176,22 +176,22 @@
             <dict-tag :options="dict.type.report_invoice_status" :value="scope.row.invoiceStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax"/>
-        <el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax"/>
-        <el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax"/>
-        <el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax"/>
-        <el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax"/>
-        <el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax"/>
-        <el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax"/>
-        <el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax"/>
-        <el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax"/>
+        <el-table-column label="已开票含税金额" align="center" prop="invoicedWithTax" width="120" v-if="columns.invoicedWithTax.visible" key="invoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已开票未税金额" align="center" prop="invoicedWithoutTax" width="120" v-if="columns.invoicedWithoutTax.visible" key="invoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已开票税额" align="center" prop="invoicedTax" width="120" v-if="columns.invoicedTax.visible" key="invoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中含税金额" align="center" prop="invoicingWithTax" width="120" v-if="columns.invoicingWithTax.visible" key="invoicingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中未税金额" align="center" prop="invoicingWithoutTax" width="120" v-if="columns.invoicingWithoutTax.visible" key="invoicingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="开票中税额" align="center" prop="invoicingTax" width="120" v-if="columns.invoicingTax.visible" key="invoicingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票含税金额" align="center" prop="uninvoicedWithTax" width="120" v-if="columns.uninvoicedWithTax.visible" key="uninvoicedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票未税金额" align="center" prop="uninvoicedWithoutTax" width="120" v-if="columns.uninvoicedWithoutTax.visible" key="uninvoicedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未开票税额" align="center" prop="uninvoicedTax" width="120" v-if="columns.uninvoicedTax.visible" key="uninvoicedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 应付 -->
       <el-table-column label="应付单" align="center">
-        <el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax"/>
-        <el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax"/>
-        <el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax"/>
+        <el-table-column label="应付含税金额" align="center" prop="payableWithTax" width="120" v-if="columns.payableWithTax.visible" key="payableWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应付未税金额" align="center" prop="payableWithoutTax" width="120" v-if="columns.payableWithoutTax.visible" key="payableWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="应付税额" align="center" prop="payableTax" width="120" v-if="columns.payableTax.visible" key="payableTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 付款 -->
@@ -201,15 +201,15 @@
             <dict-tag :options="dict.type.report_payment_status" :value="scope.row.paymentStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax"/>
-        <el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax"/>
-        <el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax"/>
-        <el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax"/>
-        <el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax"/>
-        <el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax"/>
-        <el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax"/>
-        <el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax"/>
-        <el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax"/>
+        <el-table-column label="已付款含税金额" align="center" prop="paidWithTax" width="120" v-if="columns.paidWithTax.visible" key="paidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已付款未税金额" align="center" prop="paidWithoutTax" width="120" v-if="columns.paidWithoutTax.visible" key="paidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已付款税额" align="center" prop="paidTax" width="120" v-if="columns.paidTax.visible" key="paidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中含税金额" align="center" prop="payingWithTax" width="120" v-if="columns.payingWithTax.visible" key="payingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中未税金额" align="center" prop="payingWithoutTax" width="120" v-if="columns.payingWithoutTax.visible" key="payingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="付款中税额" align="center" prop="payingTax" width="120" v-if="columns.payingTax.visible" key="payingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款含税金额" align="center" prop="unpaidWithTax" width="120" v-if="columns.unpaidWithTax.visible" key="unpaidWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款未税金额" align="center" prop="unpaidWithoutTax" width="120" v-if="columns.unpaidWithoutTax.visible" key="unpaidWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未付款税额" align="center" prop="unpaidTax" width="120" v-if="columns.unpaidTax.visible" key="unpaidTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
       <!-- 收票 -->
@@ -219,15 +219,15 @@
             <dict-tag :options="dict.type.report_ticket_status" :value="scope.row.ticketStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax"/>
-        <el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax"/>
-        <el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax"/>
-        <el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax"/>
-        <el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax"/>
-        <el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax"/>
-        <el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax"/>
-        <el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax"/>
-        <el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax"/>
+        <el-table-column label="已收票含税金额" align="center" prop="ticketedWithTax" width="120" v-if="columns.ticketedWithTax.visible" key="ticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收票未税金额" align="center" prop="ticketedWithoutTax" width="120" v-if="columns.ticketedWithoutTax.visible" key="ticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已收票税额" align="center" prop="ticketedTax" width="120" v-if="columns.ticketedTax.visible" key="ticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中含税金额" align="center" prop="ticketingWithTax" width="120" v-if="columns.ticketingWithTax.visible" key="ticketingWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中未税金额" align="center" prop="ticketingWithoutTax" width="120" v-if="columns.ticketingWithoutTax.visible" key="ticketingWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="收票中税额" align="center" prop="ticketingTax" width="120" v-if="columns.ticketingTax.visible" key="ticketingTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票含税金额" align="center" prop="unticketedWithTax" width="120" v-if="columns.unticketedWithTax.visible" key="unticketedWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票未税金额" align="center" prop="unticketedWithoutTax" width="120" v-if="columns.unticketedWithoutTax.visible" key="unticketedWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="未收票税额" align="center" prop="unticketedTax" width="120" v-if="columns.unticketedTax.visible" key="unticketedTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       </el-table-column>
 
     </el-table>
diff --git a/oms_web/oms_vue/src/views/finance/writeoff/invoice/WriteOffDetailDrawer.vue b/oms_web/oms_vue/src/views/finance/writeoff/invoice/WriteOffDetailDrawer.vue
index 04564d59..3d3a8ce6 100644
--- a/oms_web/oms_vue/src/views/finance/writeoff/invoice/WriteOffDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/invoice/WriteOffDetailDrawer.vue
@@ -11,7 +11,7 @@
         <el-divider content-position="left">开票单信息</el-divider>
         <el-table :data="[detail]" border stripe>
           <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-          <el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
+          <el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column prop="partnerName" label="进货商名称" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="invoiceBillCode" label="销售-开票单编号" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="createTime" label="开票单生成时间" align="center" width="160">
@@ -31,7 +31,7 @@
         <el-divider content-position="left">应收单明细</el-divider>
         <el-table :data="detail.detailList" border stripe>
           <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-          <el-table-column prop="receiptAmount" label="本次核销金额(元)" align="center"></el-table-column>
+          <el-table-column prop="receiptAmount" label="本次核销金额(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column prop="partnerName" label="进货商名称" align="center"></el-table-column>
           <el-table-column prop="receivableBillCode" label="销售-应收单编号" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="createTime" label="应收单生成时间" align="center"></el-table-column>
diff --git a/oms_web/oms_vue/src/views/finance/writeoff/invoice/writeoffRecord.vue b/oms_web/oms_vue/src/views/finance/writeoff/invoice/writeoffRecord.vue
index a7a59b43..9573cc34 100644
--- a/oms_web/oms_vue/src/views/finance/writeoff/invoice/writeoffRecord.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/invoice/writeoffRecord.vue
@@ -94,9 +94,9 @@
           <dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
         </template>
       </el-table-column>
-      <el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" />
-      <el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" />
-      <el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" />
+      <el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+      <el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
+      <el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue b/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
index f92cd3c8..1dba6934 100644
--- a/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
@@ -11,7 +11,7 @@
               <el-divider content-position="left">付款单信息</el-divider>
               <el-table :data="[detail]" border stripe>
                 <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-                <el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
+                <el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
                 <el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="paymentBillCode" label="采购付款单编号" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="paymentCreateTime" label="付款单生成时间" align="center" width="160">
@@ -30,7 +30,7 @@
             <div class="section">        <el-divider content-position="left">应付单明细</el-divider>
         <el-table :data="detail.detailList" border stripe>
           <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-          <el-table-column prop="paymentAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
+          <el-table-column prop="paymentAmount" label="本次核销含税总价(元)" align="center" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"></el-table-column>
           <el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="payableBillCode" label="采购应付单编号" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="createTime" label="应付单生成时间" align="center"></el-table-column>
diff --git a/oms_web/oms_vue/src/views/finance/writeoff/payment/index.vue b/oms_web/oms_vue/src/views/finance/writeoff/payment/index.vue
index 0068c4b4..feee421d 100644
--- a/oms_web/oms_vue/src/views/finance/writeoff/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/payment/index.vue
@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div class="app-container">
     <!-- 顶部按钮工具栏 -->
     <div style="margin-bottom: 20px;">
@@ -86,7 +86,7 @@
       <h3>采购应付单</h3>
       <div class="table-summary" style="margin-bottom: 10px;">
         <span style="font-weight: bold; margin-right: 20px;">应付单本次核销总额: <span
-          style="color: #409EFF">{{ totalPayableWriteOffAmount.toFixed(2) }}</span></span>
+          style="color: #409EFF">{{ formatCurrency(totalPayableWriteOffAmount.toFixed(2)) }}</span></span>
       </div>
       <el-table
         v-loading="loadingPayable"
@@ -126,22 +126,22 @@
         <el-table-column label="核销中含税总价(元)" align="center" prop="paidAmount" width="150">
           <template slot-scope="scope">
             {{
-              $calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount)
+              formatCurrency($calc.sub($calc.sub(scope.row.totalPriceWithTax, scope.row.paidPaymentAmount), scope.row.unpaidPaymentAmount))
             }}
           </template>
         </el-table-column>
-        <el-table-column label="已核销含税总价(元)" align="center" prop="paidPaymentAmount" width="150"/>
+        <el-table-column label="已核销含税总价(元)" align="center" prop="paidPaymentAmount" width="150" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="已核销未税总价(元)" align="center" width="150">
           <template slot-scope="scope">
-            {{ calculateExcludingTax(scope.row.paidPaymentAmount, scope.row.taxRate) }}
+            {{ formatCurrency(calculateExcludingTax(scope.row.paidPaymentAmount, scope.row.taxRate)) }}
           </template>
         </el-table-column>
         <el-table-column label="已核销税额(元)" align="center" width="120">
           <template slot-scope="scope">
-            {{ calculateTax(scope.row.paidPaymentAmount, scope.row.taxRate) }}
+            {{ formatCurrency(calculateTax(scope.row.paidPaymentAmount, scope.row.taxRate)) }}
           </template>
         </el-table-column>
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" width="120" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="150"
                          show-overflow-tooltip/>
         <el-table-column label="采购应付单编号" fixed="right" align="center" prop="payableBillCode" width="150"
@@ -196,14 +196,14 @@
 
         <el-table-column label="未核销含税总价(元)" align="center" width="150">
           <template slot-scope="scope">
-            {{ scope.row.preResidueAmount || '0.00' }} <!-- Assuming paymentAmount is total initially -->
+            {{ formatCurrency(scope.row.preResidueAmount || '0.00') }} <!-- Assuming paymentAmount is total initially -->
           </template>
         </el-table-column>
-        <el-table-column label="已核销含税总价(元)" align="center" prop="writeOffAmount" width="150"/>
-        <el-table-column label="已核销未税总价(元)" align="center" width="150" prop="writeOffAmountWithoutTax"/>
-        <el-table-column label="已核销税额(元)" align="center" width="150" prop="writeOffTaxAmount"/>
+        <el-table-column label="已核销含税总价(元)" align="center" prop="writeOffAmount" width="150" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已核销未税总价(元)" align="center" width="150" prop="writeOffAmountWithoutTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
+        <el-table-column label="已核销税额(元)" align="center" width="150" prop="writeOffTaxAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
 
-        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax"/>
+        <el-table-column label="含税总价(元)" align="center" prop="totalPriceWithTax" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)"/>
         <el-table-column label="制造商名称" fixed="right" align="center" prop="vendorName" width="150"
                          show-overflow-tooltip/>
         <el-table-column label="采购付款单号" fixed="right" align="center" prop="paymentBillCode" width="150"
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
index 9aeea145..fbe37d4e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
@@ -115,6 +115,9 @@ public class OmsPaymentBillController extends BaseController
     {
         List<OmsPaymentBill> list = omsPaymentBillService.selectOmsPaymentBillList(omsPaymentBill);
         ExcelUtil<OmsPaymentBill> util = new ExcelUtil<OmsPaymentBill>(OmsPaymentBill.class);
+        todoService.fillApproveNode(list,
+                Arrays.asList(processConfig.getDefinition().getFinancePayment(), processConfig.getDefinition().getFinanceRefund())
+                , OmsPaymentBill::getPaymentBillCode, (a, b) -> a.setApproveNode(b.get(a.getPaymentBillCode())));
         return util.exportExcel(list, "采购付款单数据");
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
index cba2d781..09456208 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
@@ -32,17 +32,18 @@ public class OmsPaymentBill extends BaseEntity
     private List<String> paymentBillCodeList;
 
     /** 付款单类型 (FROM_PAYABLE, PRE_PAYMENT) */
-    @Excel(name = "付款单类型 (FROM_PAYABLE, PRE_PAYMENT)")
+    @Excel(name = "备注", readConverterExp = "FROM_PAYABLE=应付单生成,PRE_PAYMENT=预付单,REFUND=退款单")
     private String paymentBillType;
 
     /** 付款时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd  HH:mm:ss")
+    @Excel(name = "预计付款时间", width = 30, dateFormat = "yyyy-MM-dd  HH:mm:ss")
     private Date paymentTime;
 
     /** 制造商名称 */
-    @Excel(name = "制造商名称")
+
     private String vendorCode;
+    @Excel(name = "制造商名称")
     private String vendorName;
 
     /** 合同编号 */
@@ -73,7 +74,7 @@ public class OmsPaymentBill extends BaseEntity
     private String projectName;
 
     /** 预付单剩余额度 */
-    @Excel(name = "预付单剩余额度")
+//    @Excel(name = "预付单剩余额度")
     private BigDecimal preResidueAmount;
 
     /** 实际付款时间 */
@@ -82,11 +83,11 @@ public class OmsPaymentBill extends BaseEntity
     private Date actualPaymentTime;
 
     /** 付款状态 */
-    @Excel(name = "付款状态")
+    @Excel(name = "付款状态",dictType = "payment_status")
     private String paymentStatus;
 
     /** 审批状态 */
-    @Excel(name = "审批状态")
+    @Excel(name = "审批状态",dictType = "approve_status")
     private String approveStatus;
 
     /** 审批节点 */
@@ -99,7 +100,7 @@ public class OmsPaymentBill extends BaseEntity
     private Date approveTime;
 
     /** 支付方式 */
-    @Excel(name = "支付方式")
+    @Excel(name = "支付方式",dictType = "payment_method")
     private String paymentMethod;
 
     /** 应付单编号（关联查询字段） */