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/estimatedReceivable/index.vue | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
index 7ee0f59..bd6f351 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -231,7 +231,7 @@
label: '瀹㈡埛鍚嶇О',
search: true,
minWidth: 220,
-
+ showOverflowTooltip: true,
type: 'select', // 璁剧疆涓轰笅鎷夋绫诲瀷
dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
disabled: false // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
@@ -240,15 +240,27 @@
label: '椤圭洰鍚嶇О',
search: true,
disabled: true,
- minWidth: 150,
+ minWidth: 220,
+ showOverflowTooltip: true,
},
orderDate: {
label: '涓嬪崟鏃ユ湡',
- search: true,
minWidth: 180,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ orderDateArray: {
+ label: '涓嬪崟鏃ユ湡',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
feeName: {
label: '璐圭敤鍚嶇О',
@@ -307,6 +319,7 @@
remark: {
label: '澶囨敞',
minWidth: 120,
+ showOverflowTooltip: true,
type: 'textarea', minRows: 3, maxRows: 5,
},
@@ -409,9 +422,13 @@
},
getBeginListFunc: (params = {}) => {
- params.feeType = 0;
- return params
+ let newParams = { ...params };
+ newParams.feeType = 0;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.orderDateArray, 'orderDate') || [];
+ delete newParams.orderDateArray;
+ queryParams.value = newParams;
+ return newParams
}
})
@@ -628,3 +645,12 @@
}
getSelectCustomName()
</script>
+<style>
+:deep(.avue-crud__table) {
+ overflow-y: auto;
+}
+
+:deep(.el-scrollbar__bar.is-horizontal) {
+ pointer-events: auto;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0