From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/cwgl/ageAnalysis/index.vue | 76 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/ageAnalysis/index.vue b/ui/admin-ui3/src/views/cwgl/ageAnalysis/index.vue
index adcbcfd..6f9f76b 100644
--- a/ui/admin-ui3/src/views/cwgl/ageAnalysis/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/ageAnalysis/index.vue
@@ -75,7 +75,7 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞"><el-input v-model="editForm.remark" /></el-form-item>
+ <el-form-item label="澶囨敞"><el-input v-model="editForm.accountRemark" /></el-form-item>
</el-col>
</el-row>
<el-row>
@@ -139,7 +139,7 @@
</template>
<script setup name="AgeAnalysis" lang="ts">
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, watch } from 'vue';
import { useRoute } from 'vue-router';
import router from "@/router";
import { agingAnalysisList, addPaymentFeedback, listPaymentFeedback, listAgingLog, receivableBillManagementAging } from "@/api/cwgl/analysisManagement";
@@ -177,34 +177,30 @@
* Avue 閰嶇疆椤�
*/
const option = ref({
- align: 'center',
- headerAlign: 'center',
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
addBtn: false,
editBtn: false,
delBtn: false,
viewBtn: false,
- menu: true,
- stripe: true,
- columnBtn: true,
- searchIndex: 1,
- searchMenuSpan: 4,
- searchSpan: 5,
- height: 'auto',
- menuWidth: 180,
+ dicCache: true,
+ menuWidth: 220,
labelWidth: 150,
+ page: true,
+ pagination: true,
searchLabelWidth: 120,
- menuFixed: 'right',
-
+ showSummary: true,
// --- 鍚堣琛岄厤缃� ---
- // showSummary: true,
- // sumText: '鍚堣',
- // sumColumnList: [
- // { name: 'estimateAmount', type: 'sum' },
- // { name: 'confirmedAmount', type: 'sum' },
- // { name: 'balanceAmount', type: 'sum' },
- // { name: 'overdueAmount', type: 'sum' },
- // { name: 'unInvoicedAmount', type: 'sum' }
- // ],
+ // 寮哄埗鎸囧畾鍚堣鏂囨锛堝鏋� method 杩斿洖绌猴紝瀹冧綔涓轰繚搴曪級
+ sumText: '鍚堣',
+ sumColumnList: [
+ // { label: '鍚堣:', name: 'responsiblePerson', type: 'sum', },
+ { name: 'totalAmount', type: 'sum' },
+ { name: 'pendingAmount', type: 'sum' },
+ { name: 'overdueAmount', type: 'sum' },
+ { name: 'unInvoicedAmount', type: 'sum' },
+ ],
column: [
{ label: '璐ｄ换浜�', prop: 'responsiblePerson', width: 100 },
@@ -226,9 +222,7 @@
detail: true,
formatter: (row: any, value: any) => dictFormat(sys_account_business, value)
},
-
{ label: '璐﹀崟绯荤粺缂栧彿', prop: 'systemNo', width: 200, search: true },
-
// 閲戦鍒�
{ label: '鍚殏浼板簲鏀惰处娆句綑棰�', prop: 'totalAmount', width: 160, type: 'number' },
{ label: '宸茬‘璁ゅ簲鏀惰处娆鹃噾棰�', prop: 'totalAmount', width: 160, type: 'number' },
@@ -244,11 +238,18 @@
{ label: '閫炬湡1骞翠互涓�', prop: 'overdueOver1Year', width: 130 },
{ label: '鎺ㄨ繘瑕佹眰', prop: 'promotionRequirement', width: 250, overHidden: true },
- { label: '澶囨敞', prop: 'remark', width: 150 },
- { label: '閫炬湡閲戦鎵�灞炴湡', prop: 'overduePeriod', width: 150 },
- { label: '璐﹀崟鏄惁纭', prop: 'isConfirmed', width: 120 },
+ { label: '澶囨敞', prop: 'accountRemark', width: 150 },
+ {
+ label: '閫炬湡閲戦鎵�灞炴湡', width: 200,
+ formatter: (row) => {
+ if (row.billingStartDate && row.billingEndDate) {
+ return `${row.billingStartDate} 鑷� ${row.billingEndDate}`;
+ }
+ return row.periodType || '-';
+ }
+ },
{ label: '寮�绁ㄦ棩鏈�', prop: 'invoiceDate', width: 120 },
- { label: '鏈紑绁ㄩ噾棰�', prop: 'unInvoicedAmount', width: 120 }
+ { label: '鏈紑绁ㄩ噾棰�', prop: 'pendingAmount', width: 120 }
]
});
@@ -385,8 +386,8 @@
onLoad();
};
+// 淇敼 goReturn 鏂规硶
const goReturn = () => router.push('/basic/analysisManagement');
-
// --- 寮圭獥閫昏緫 ---
const editVisible = ref(false);
const editForm = ref<any>({});
@@ -510,11 +511,26 @@
padding-left: 10px;
border-left: 4px solid #409eff;
}
+
/* 鎿嶄綔鍒楁寜閽棿璺� */
.menu-btn-container .el-link {
margin-right: 12px;
}
+
.menu-btn-container .el-link:last-child {
margin-right: 0;
}
+
+/* 寮哄埗鍦ㄥ悎璁¤鐨勭涓�涓潪澶嶉�夋鍗曞厓鏍硷紙璐ｄ换浜哄垪锛夋樉绀烘枃妗� */
+:deep(.el-table__footer-wrapper .el-table__cell.avue-crud__color .cell),
+:deep(.el-table__footer-wrapper .el-table__cell:nth-child(2) .cell) {
+ visibility: visible !important;
+}
+
+/* 濡傛灉鏄閫夋鍒楀鑷寸殑閬尅锛岄�氳繃浼厓绱犲己琛屽湪绗簩鍒楁敞鍏� */
+:deep(.el-table__footer-wrapper tr td:nth-child(2) .cell::before) {
+ content: '鍚堣';
+ font-weight: bold;
+ color: #333;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0