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/pendingSettlementBusiness/index.vue | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index c8baab3..c9a840a 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -191,7 +191,7 @@
label: '瀹㈡埛鍚嶇О',
search: true,
minWidth: 220,
-
+ showOverflowTooltip: true,
type: 'select', // 璁剧疆涓轰笅鎷夋绫诲瀷
dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
disabled: false // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
@@ -204,14 +204,28 @@
vehicleType: {
label: '杞﹀瀷', search: true,
},
+ // createdTime: {
+ // label: '涓嬪崟鏃堕棿',
+ // display: false,
+ // search: true,
+ // type: 'date',
+ // format: 'YYYY-MM-DD',
+ // searchSpan: 5, minWidth: 120,
+ // valueFormat: 'YYYY-MM-DD',
+ // },
+ createdTimeArray: {
+ label: '涓嬪崟鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true
+ },
createdTime: {
label: '涓嬪崟鏃堕棿',
- display: false,
- search: true,
- type: 'date',
- format: 'YYYY-MM-DD',
- searchSpan: 5, minWidth: 120,
- valueFormat: 'YYYY-MM-DD',
+ minWidth: 180,
},
operationMode: {
label: '杩愯惀妯″紡',
@@ -246,15 +260,18 @@
carrierName: {
label: '鎵胯繍鍟�',
- minWidth: 210,
+ minWidth: 220,
+ showOverflowTooltip: true,
},
departureLocation: {
label: '鍑哄彂鍦�',
- minWidth: 200,
+ minWidth: 220,
+ showOverflowTooltip: true,
},
arrivalLocation: {
label: '鐩殑鍦�',
- minWidth: 200,
+ minWidth: 220,
+ showOverflowTooltip: true,
},
@@ -308,7 +325,7 @@
minWidth: 120,
},
- isCreate: {
+ isCreate: {
label: '鏄惁宸插叆璐�', dataType: 'string',
type: 'select',
fixed: 'right',
@@ -327,7 +344,7 @@
type: 'select',
dataType: 'string',
minWidth: 120,
-
+
dicUrl: '/system/dict/data/type/sys_matching_status',
},
isCostMatched: {
@@ -465,7 +482,17 @@
generateDisabled.value = false;
}
selectionList.value = selection;
+ },
+ getBeginListFunc: (params = {}) => {
+ // 鍒涘缓鏂板弬鏁板璞�
+ let newParams = { ...params };
+
+ newParams = proxy.addDateRangeNew(newParams, newParams?.createdTimeArray, 'createdTime') || [];
+ delete newParams.createdTimeArray;
+ queryParams.value = newParams;
+ return newParams;
}
+
})
const dialog = reactive({
visible: false,
@@ -553,7 +580,7 @@
dispatchNo.value = row.dispatchNo;
dialog.title = '璐圭敤鏄庣粏';
if (activeName.value == 'first') {
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -561,7 +588,7 @@
})
} else if (activeName.value == 'second') {
// 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -570,7 +597,7 @@
}
}
const getListVable = (dispatchNo, feeType) => {
- listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
tableDataList.value = res.rows || [];
}
@@ -608,3 +635,13 @@
return sums;
}
</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