From 486b62e149dab20c2bbfcdd6f262dd8f88a317d9 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 13 一月 2026 17:13:28 +0800
Subject: [PATCH] 新增状态字段
---
ui/admin-ui3/src/components/BillSettlementHistory/index.vue | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/ui/admin-ui3/src/components/BillSettlementHistory/index.vue b/ui/admin-ui3/src/components/BillSettlementHistory/index.vue
index 1855e4d..9c87fb9 100644
--- a/ui/admin-ui3/src/components/BillSettlementHistory/index.vue
+++ b/ui/admin-ui3/src/components/BillSettlementHistory/index.vue
@@ -1,13 +1,14 @@
<template>
<el-dialog v-model="visible" :title="type === 'receivable' ? '搴旀敹璐﹀崟缁撶畻璁板綍' : '搴斾粯璐﹀崟缁撶畻璁板綍'" width="1200px"
destroy-on-close>
-
<el-descriptions title="璐﹀崟淇℃伅" :column="3" border class="mb-5">
<el-descriptions-item label="绯荤粺缂栧彿">{{ billInfo.systemNo }}</el-descriptions-item>
<el-descriptions-item label="璐﹀崟鍚嶇О">{{ billInfo.billName }}</el-descriptions-item>
- <el-descriptions-item :label="type === 'receivable' ? '瀹㈡埛鍚嶇О' : '渚涘簲鍟嗗悕绉�'">
- {{ billInfo.customerName }}
- </el-descriptions-item>
+
+ <el-descriptions-item v-if="type == 'receivable'" label="瀹㈡埛鍚嶇О">{{ billInfo.customerName
+ }}</el-descriptions-item>
+ <el-descriptions-item v-if="type == 'payable'" label="渚涘簲鍟嗗悕绉�">{{ billInfo.supplierName
+ }}</el-descriptions-item>
<el-descriptions-item label="鍗曟嵁鏁伴噺">{{ billInfo.documentCount }}</el-descriptions-item>
<el-descriptions-item label="搴旂粨绠楅噾棰�">
@@ -43,34 +44,37 @@
{{ dictFormat(sys_clearing_form, row.settlementMethod) }}
</template>
</el-table-column>
- <el-table-column prop="customerBank" :label="type === 'receivable' ? '瀹㈡埛寮�鎴疯' : '渚涘簲鍟嗗紑鎴疯'" align="center"
- min-width="150" />
- <el-table-column prop="customerBankAccount" :label="type === 'receivable' ? '瀹㈡埛閾惰璐﹀彿' : '渚涘簲鍟嗛摱琛岃处鍙�'"
- align="center" min-width="180" />
- <el-table-column prop="receivingBank" label="鏀舵璐︽埛寮�鎴疯" align="center" min-width="150" />
- <el-table-column prop="receivingBankAccount" label="鏀舵閾惰璐︽埛" align="center" min-width="180" />
- <el-table-column prop="settleDate" :label="type === 'receivable' ? '鏀舵鏃ユ湡' : '浠樻鏃ユ湡'" align="center"
- width="110" />
- <el-table-column prop="settleAmount" :label="type === 'receivable' ? '鏀舵閲戦' : '浠樻閲戦'" align="center"
- width="110">
- <template #default="{ row }">
- <span class="text-bold">{{ row.settleAmount }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="remainingAmount" :label="type === 'receivable' ? '鏀舵鍚庡緟鏀堕噾棰�' : '浠樻鍚庡緟浠橀噾棰�'"
+
+ <el-table-column v-if="type == 'receivable'" prop="customerBank" label="瀹㈡埛寮�鎴疯" align="center"
+ min-width="150" />
+ <!-- <el-table-column v-if="type == 'payable'" prop="supplierName" label="渚涘簲鍟嗗悕绉�" align="center"
+ min-width="150" /> -->
+
+ <el-table-column v-if="type == 'receivable'" prop="customerBankAccount" label="瀹㈡埛閾惰璐﹀彿"
+ align="center" min-width="180" />
+ <el-table-column v-if="type == 'receivable'" prop="receivingBank" label="鏀舵璐︽埛寮�鎴疯" align="center" min-width="150" />
+ <el-table-column v-if="type == 'receivable'" prop="receivingBankAccount" label="鏀舵閾惰璐︽埛" align="center" min-width="180" />
+ <el-table-column v-if="type == 'receivable'" prop="receiptDate" label="鏀舵鏃ユ湡" align="center"
+ min-width="150" />
+ <el-table-column v-if="type == 'receivable'" prop="receiptAmount" label="鏀舵閲戦" align="center"
+ min-width="150" />
+
+ <el-table-column v-if="type == 'payable'" prop="paymentBank" label="浠樻璐︽埛寮�鎴疯" align="center" min-width="150" />
+ <el-table-column v-if="type == 'payable'" prop="paymentBankAccount" label="浠樻璐︽埛閾惰璐﹀彿" align="center" min-width="150" />
+ <el-table-column v-if="type == 'payable'" prop="paymentDate" label="浠樻鏃ユ湡" align="center" min-width="150" />
+ <el-table-column v-if="type == 'payable'" prop="paymentAmount" label="浠樻閲戦" align="center" min-width="150" />
+ <el-table-column prop="remainingPendingAmount" :label="type === 'receivable' ? '鏀舵鍚庡緟鏀堕噾棰�' : '浠樻鍚庡緟浠橀噾棰�'"
align="center" width="140" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="160" />
<el-table-column prop="createBy" label="鍒涘缓浜�" align="center" width="100" />
</el-table>
+ <pagination v-show="pageF.total > 0" :total="pageF.total" v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize" @pagination="getDataList" />
- <div class="pagination-container">
- <pagination v-show="pageF.total > 0" :total="pageF.total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getDataList" />
- </div>
- <template #footer>
+ <template #footer style="margin-top: 15px;">
<el-button @click="visible = false">鍏抽棴</el-button>
</template>
</el-dialog>
@@ -81,10 +85,13 @@
import { getReceivableBillManagement } from "@/api/cwgl/receivableBillManagement";
import { listReceivableBillSettlementDetail } from "@/api/cwgl/receivableBillSettlementDetail";
import useCurrentInstance from "@/utils/useCurrentInstance";
+import { getPayableBillManagement, } from "@/api/cwgl/payableBillManagement";
+import { listPayableBillSettlementDetail } from "@/api/cwgl/payableBillSettlementDetail";
+
const { proxy } = useCurrentInstance();
const { sys_clearing_form
- } = proxy.useDict('sys_clearing_form');
- const dictFormat = (dict: any, value: any) => {
+} = proxy.useDict('sys_clearing_form');
+const dictFormat = (dict: any, value: any) => {
return proxy.selectDictLabel(dict, value);
}
const props = defineProps<{
@@ -124,16 +131,20 @@
pageF.total = res.total
}
})
+ } else {
+ getPayableBillManagement(queryParams.billId).then(response => {
+ if (response.code === 200) {
+ billInfo.value = response.data
+ }
+ })
+ listPayableBillSettlementDetail(queryParams).then(res => {
+ if (res.code == 200) {
+ dataList.value = res.rows
+ pageF.total = res.total
+ }
+ })
}
- // getReceivableBillManagement(queryParams).then(response => {
- // billInfo.value = response.data
- // dataList.value = response.data.settlementHistoryList
- // pageF.total = response.data.total
- // })
- // 姝ゅ鏇挎崲涓轰綘鐨勫疄闄呮帴鍙ｈ皟鐢� listReceivableBillSettlementDetail
- // const response = await getReceivableBillManagement(queryParams)
- // dataList.value = response.rows
- // pageF.total = response.total
+
} finally {
loading.value = false
}
--
Gitblit v1.8.0