From 3a0c0eb495b863ff731a628d7a7ea2390f02abea Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 十月 2026 20:52:59 +0800
Subject: [PATCH] feat: 对账按日、薪资明细与合同/检验列表调整
---
src/views/financialManagement/receivable/reconciliation.vue | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/views/financialManagement/receivable/reconciliation.vue b/src/views/financialManagement/receivable/reconciliation.vue
index 03400ef..0ef037a 100644
--- a/src/views/financialManagement/receivable/reconciliation.vue
+++ b/src/views/financialManagement/receivable/reconciliation.vue
@@ -6,10 +6,19 @@
<el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id" />
</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="getTableData">鎼滅储</el-button>
@@ -62,7 +71,7 @@
<FormDialog title="瀵硅处鏄庣粏" v-model="detailDialogVisible" width="900px" @confirm="printDetail" @cancel="detailDialogVisible = false" operationType="detail">
<div class="statement-header">
<h3>{{ currentCustomer }} 搴旀敹瀵硅处鍗�</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" />
@@ -114,15 +123,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀵硅处鏈堜唤" prop="statementMonth">
- <el-date-picker v-model="generateForm.statementMonth" type="month" placeholder="閫夋嫨鏈堜唤" value-format="YYYY-MM" style="width: 100%;" @change="onStatementMonthChange" />
+ <el-form-item label="瀵硅处鏃ユ湡" prop="statementMonth">
+ <el-date-picker v-model="generateForm.statementMonth" type="date" placeholder="閫夋嫨瀵硅处鏃ユ湡" value-format="YYYY-MM-DD" format="YYYY-MM-DD" style="width: 100%;" @change="onStatementMonthChange" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if="statementDetailLoaded" class="sales-section">
- <div v-if="salesData.length > 0" class="section-title">鏈湀閿�鍞暟鎹�</div>
+ <div v-if="salesData.length > 0" class="section-title">瀵硅处鏃ユ湡閿�鍞暟鎹�</div>
<el-table
v-if="salesData.length > 0"
ref="salesTableRef"
@@ -148,7 +157,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>
@@ -159,7 +168,7 @@
</div>
<div v-else-if="generateForm.customerId && generateForm.statementMonth && !salesLoading" class="empty-tip">
- <el-empty description="璇ュ鎴锋湰鏈堟殏鏃犻攢鍞暟鎹�" />
+ <el-empty description="璇ュ鎴峰綋鏃ユ殏鏃犻攢鍞暟鎹�" />
</div>
<template #footer>
@@ -192,8 +201,7 @@
const filters = reactive({
customerId: "",
- startMonth: "",
- endMonth: "",
+ dateRange: [],
});
const pagination = reactive({
@@ -205,7 +213,7 @@
const columns = [
{ label: "瀵硅处鍗曞彿", prop: "statementNumber", width: "150" },
{ label: "瀹㈡埛鍚嶇О", prop: "customerName", 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" },
@@ -341,13 +349,9 @@
if (filters.customerId) {
result.customerId = filters.customerId;
}
- 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;
};
@@ -444,8 +448,7 @@
const resetFilters = () => {
filters.customerId = "";
- filters.startMonth = "";
- filters.endMonth = "";
+ filters.dateRange = [];
pagination.currentPage = 1;
getTableData();
};
@@ -645,7 +648,7 @@
const viewDetail = (row) => {
if (!row.customerId || !row.statementMonth) {
- ElMessage.warning("缂哄皯瀹㈡埛鎴栧璐︽湀浠斤紝鏃犳硶鏌ヨ鏄庣粏");
+ ElMessage.warning("缂哄皯瀹㈡埛鎴栧璐︽棩鏈燂紝鏃犳硶鏌ヨ鏄庣粏");
return;
}
--
Gitblit v1.9.3