Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

wujianwei

6 天以前 89fd2cf7202c321512c2ea699a3a220a7138ed44

 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="应结算金额">
@@ -23,7 +24,7 @@
            </el-descriptions-item>
            <el-descriptions-item label="减免金额">{{ billInfo.discountAmount }}</el-descriptions-item>

            <el-descriptions-item label="周期类型">{{ billInfo.periodType }}</el-descriptions-item>
            <el-descriptions-item label="周期类型">{{ dictFormat(sys_period_type,billInfo.periodType)  }}</el-descriptions-item>
            <el-descriptions-item label="业务期间">
                {{ billInfo.businessStartDate }} {{ billInfo.businessEndDate ? '-' + billInfo.businessEndDate : '' }}
            </el-descriptions-item>
@@ -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) => {
const { sys_clearing_form,sys_period_type
} = proxy.useDict('sys_clearing_form','sys_period_type');
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
    }