From 3ce715a4e66955eac86dcd2f5c8afcfdf8becb6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:46:47 +0800
Subject: [PATCH] Merge origin/dev_项目管理 into dev_项目管理
---
src/views/financialManagement/payable/reconciliation.vue | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/views/financialManagement/payable/reconciliation.vue b/src/views/financialManagement/payable/reconciliation.vue
index a3b8495..3ef6a81 100644
--- a/src/views/financialManagement/payable/reconciliation.vue
+++ b/src/views/financialManagement/payable/reconciliation.vue
@@ -11,10 +11,19 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="瀵硅处鏈熼棿:">
- <el-date-picker v-model="filters.startMonth" type="month" placeholder="寮�濮嬫湀浠�" value-format="YYYY-MM" style="width: 140px;" />
- <span style="margin: 0 10px;">鑷�</span>
- <el-date-picker v-model="filters.endMonth" type="month" placeholder="缁撴潫鏈堜唤" value-format="YYYY-MM" style="width: 140px;" />
+ <el-form-item label="瀵硅处鏃ユ湡:">
+ <el-date-picker
+ v-model="filters.dateRange"
+ type="daterange"
+ placeholder="璇烽�夋嫨瀵硅处鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ range-separator="鑷�"
+ clearable
+ style="width: 300px;"
+ />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSearch">鎼滅储</el-button>
@@ -66,7 +75,7 @@
<FormDialog title="瀵硅处鏄庣粏" v-model="detailDialogVisible" width="900px" @confirm="printDetail" @cancel="detailDialogVisible = false" operationType="detail">
<div class="statement-header">
<h3>{{ currentSupplier }} 搴斾粯瀵硅处鍗�</h3>
- <p>瀵硅处鏈熼棿: {{ currentPeriod }}</p>
+ <p>瀵硅处鏃ユ湡: {{ currentPeriod }}</p>
</div>
<el-table :data="detailData" border style="width: 100%" v-loading="detailLoading">
<el-table-column prop="date" label="鏃ユ湡" width="120" />
@@ -124,12 +133,13 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀵硅处鏈堜唤" prop="statementMonth">
+ <el-form-item label="瀵硅处鏃ユ湡" prop="statementMonth">
<el-date-picker
v-model="generateForm.statementMonth"
- type="month"
- placeholder="閫夋嫨鏈堜唤"
- value-format="YYYY-MM"
+ type="date"
+ placeholder="閫夋嫨瀵硅处鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
style="width: 100%;"
@change="onStatementMonthChange"
/>
@@ -139,7 +149,7 @@
</el-form>
<div v-if="statementDetailLoaded" class="purchase-section">
- <div v-if="purchaseData.length > 0" class="section-title">鏈湀閲囪喘鏁版嵁</div>
+ <div v-if="purchaseData.length > 0" class="section-title">瀵硅处鏃ユ湡閲囪喘鏁版嵁</div>
<el-table
v-if="purchaseData.length > 0"
ref="purchaseTableRef"
@@ -165,7 +175,7 @@
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" />
</el-table>
- <el-empty v-else description="璇ヤ緵搴斿晢鏈湀鏆傛棤鏄庣粏鏁版嵁" :image-size="80" />
+ <el-empty v-else description="璇ヤ緵搴斿晢褰撴棩鏆傛棤鏄庣粏鏁版嵁" :image-size="80" />
<div class="summary-row">
<span>鏈熷垵浣欓: <strong class="text-primary">楼{{ formatMoney(generateForm.openingBalance) }}</strong></span>
@@ -176,7 +186,7 @@
</div>
<div v-else-if="generateForm.supplierId && generateForm.statementMonth && !purchaseLoading" class="empty-tip">
- <el-empty description="璇ヤ緵搴斿晢鏈湀鏆傛棤閲囪喘鏁版嵁" />
+ <el-empty description="璇ヤ緵搴斿晢褰撴棩鏆傛棤閲囪喘鏁版嵁" />
</div>
<template #footer>
@@ -209,8 +219,7 @@
const filters = reactive({
supplierId: "",
- startMonth: "",
- endMonth: "",
+ dateRange: [],
});
const pagination = reactive({
@@ -222,7 +231,7 @@
const columns = [
{ label: "瀵硅处鍗曞彿", prop: "statementNumber", width: "150" },
{ label: "渚涘簲鍟�", prop: "supplierName", width: "180" },
- { label: "瀵硅处鏈熼棿", prop: "statementMonth", width: "150" },
+ { label: "瀵硅处鏃ユ湡", prop: "statementMonth", width: "150" },
{ label: "鏈熷垵浣欓", prop: "openingBalance", dataType: "slot", slot: "openingBalance" },
{ label: "鏈湡搴斾粯", prop: "currentPlan", dataType: "slot", slot: "currentPlan" },
{ label: "鏈湡浠樻", prop: "currentActually", dataType: "slot", slot: "currentActually" },
@@ -358,13 +367,9 @@
if (filters.supplierId) {
result.customerId = filters.supplierId;
}
- if (filters.startMonth && filters.endMonth && filters.startMonth === filters.endMonth) {
- result.statementMonth = filters.startMonth;
- } else if (filters.startMonth) {
- result.startMonth = filters.startMonth;
- }
- if (filters.endMonth && filters.startMonth !== filters.endMonth) {
- result.endMonth = filters.endMonth;
+ if (Array.isArray(filters.dateRange) && filters.dateRange.length === 2) {
+ result.startDate = filters.dateRange[0];
+ result.endDate = filters.dateRange[1];
}
return result;
};
@@ -466,8 +471,7 @@
const resetFilters = () => {
filters.supplierId = "";
- filters.startMonth = "";
- filters.endMonth = "";
+ filters.dateRange = [];
pagination.currentPage = 1;
getTableData();
};
@@ -671,7 +675,7 @@
const viewDetail = (row) => {
const partnerId = row.customerId ?? row.supplierId;
if (!partnerId || !row.statementMonth) {
- ElMessage.warning("缂哄皯渚涘簲鍟嗘垨瀵硅处鏈堜唤锛屾棤娉曟煡璇㈡槑缁�");
+ ElMessage.warning("缂哄皯渚涘簲鍟嗘垨瀵硅处鏃ユ湡锛屾棤娉曟煡璇㈡槑缁�");
return;
}
--
Gitblit v1.9.3