From 7399174bd626cd2d3fda5a5bd58205fc33505563 Mon Sep 17 00:00:00 2001
From: caojia <1301869380@qq.com>
Date: Wed, 4 Nov 2026 11:57:09 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8D=95=E7=8A=B6=E6=80=81=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=AD=A3=E6=9C=89=E6=95=88=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ar/ArBillMapper.xml   |  1 +
 .../customermoney/CustomerBillListDialog.vue    | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml
index 924e4cfc..a3e86e24 100644
--- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml
@@ -114,6 +114,7 @@
                coalesce(sum(unwritten_amount), 0) as unwritten_amount
         from ar_bill b
         <include refid="arBillListFilter"/>
+        and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF', 'WRITTEN_OFF')
     </select>
 
     <select id="selectArBillById" parameterType="long" resultMap="ArBillResult">
diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/CustomerBillListDialog.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/CustomerBillListDialog.vue
index 274e27d8..8513063b 100644
--- a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/CustomerBillListDialog.vue
+++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/CustomerBillListDialog.vue
@@ -29,9 +29,9 @@
       </template>
       <template #pagination-extra>
         <div class="bill-summary">
-          <span>应收总额：<b class="amount">{{ money(billSummary.totalAmount) }}</b></span>
+          <span>有效账单金额：<b class="amount">{{ money(billSummary.totalAmount) }}</b></span>
           <span>已核销：<b class="written">{{ money(billSummary.writtenOffAmount) }}</b></span>
-          <span>未核销：<b class="unwritten">{{ money(billSummary.unwrittenAmount) }}</b></span>
+          <span>当前未核销：<b class="unwritten">{{ money(billSummary.unwrittenAmount) }}</b></span>
         </div>
       </template>
       <template #col-status="{ row }">
@@ -44,7 +44,7 @@
         <span class="written">{{ money(row.writtenOffAmount) }}</span>
       </template>
       <template #col-unwrittenAmount="{ row }">
-        <span class="unwritten">{{ money(row.unwrittenAmount) }}</span>
+        <span class="unwritten">{{ isCurrentReceivable(row.status) ? money(row.unwrittenAmount) : '-' }}</span>
       </template>
     </basic-table>
     <template #footer>
@@ -56,7 +56,7 @@
 <script setup>
 import { computed, getCurrentInstance, ref } from 'vue'
 import { listCustomerBills } from '@/api/customersuppliermanagement/customermoney/customerbill'
-import { AR_BILL_STATUS_OPTIONS, AR_BILL_STATUS_TYPES } from '@/constants/ar/bill'
+import { AR_BILL_STATUS, AR_BILL_STATUS_OPTIONS, AR_BILL_STATUS_TYPES } from '@/constants/ar/bill'
 import { arEnumLabel } from '@/constants/ar/enums'
 
 const props = defineProps({
@@ -86,16 +86,16 @@ const columns = [
   { label: '客户编码', prop: 'customerCode', minWidth: 120, showOverflowTooltip: true },
   { label: '账单截止日', prop: 'billPeriodEnd', minWidth: 120, formatter: row => `截至 ${date(row.billPeriodEnd)}` },
   { label: '订单数', prop: 'orderCount', width: 80 },
-  { label: '应收总额', prop: 'totalAmount', width: 120, align: 'right', slot: 'totalAmount' },
+  { label: '账单金额', prop: 'totalAmount', width: 120, align: 'right', slot: 'totalAmount' },
   { label: '已核销', prop: 'writtenOffAmount', width: 110, align: 'right', slot: 'writtenOffAmount' },
-  { label: '未核销', prop: 'unwrittenAmount', width: 110, align: 'right', slot: 'unwrittenAmount' },
+  { label: '当前未核销', prop: 'unwrittenAmount', width: 110, align: 'right', slot: 'unwrittenAmount' },
   { label: '状态', prop: 'status', width: 110, slot: 'status' },
   { label: '账单日期', prop: 'billDate', width: 120, formatter: row => date(row.billDate) }
 ]
 const searchColumns = [
   { label: '账单号', prop: 'billNo', component: 'input', placeholder: '账单号', width: '180px' },
   { label: '账单名称', prop: 'billName', component: 'input', placeholder: '账单名称', width: '180px' },
-  { label: '状态', prop: 'status', component: 'select', options: statusOptions, placeholder: '全部状态', width: '150px' },
+  { label: '状态', prop: 'statuses', component: 'select', options: statusOptions, placeholder: '全部状态', width: '190px', props: { multiple: true, clearable: true, collapseTags: true, collapseTagsTooltip: true } },
   { label: '账单日期', prop: 'billDateRange', component: 'daterange', width: '300px' },
   { label: '账单截止日', prop: 'billPeriodEnd', component: 'date', width: '160px' }
 ]
@@ -142,6 +142,9 @@ function money(value) {
 }
 function statusText(value) { return arEnumLabel(AR_BILL_STATUS_OPTIONS, value) }
 function statusType(value) { return AR_BILL_STATUS_TYPES[value] || 'info' }
+function isCurrentReceivable(status) {
+  return [AR_BILL_STATUS.CONFIRMED, AR_BILL_STATUS.PARTIAL_WRITTEN_OFF, AR_BILL_STATUS.WRITTEN_OFF].includes(status)
+}
 </script>
 
 <style scoped>