From 17990449aa731d72a8cadc11a5fabd31bcc76772 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 01 四月 2026 09:26:07 +0800
Subject: [PATCH] 增加导出和作废调度单
---
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 713fcf3..7deecb5 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -3,7 +3,7 @@
<avue-crud :option="option" v-model:search="queryParams" :table-loading="pageF.loading" :data="tableData"
:page="page" :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crudRef"
@row-update="rowUpdate" @row-save="rowSave" @refresh-change="refreshChange" @row-del="rowDel"
- @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @on-load="onLoad">
<template #menu-left>
@@ -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,50 @@
generateDisabled.value = false;
}
selectionList.value = selection;
- }
+ },
+ getBeginListFunc: (params = {}) => {
+ // 1. 鏃ユ湡杞崲
+ let newParams = <any>{ ...params };
+ console.log(newParams, '2');
+ if (newParams) {
+ // 1. 瀹氫箟鏃ユ湡瀛楁鏄犲皠 (鏁扮粍鍚� : 鎺ュ彛闇�瑕佺殑鍓嶇紑)
+ // 杩欐牱鍐欑殑濂藉鏄細濡傛灉浣犳湁澶氫釜鏃ユ湡锛岀洿鎺ュ湪杩欓噷娣诲姞涓�琛屽嵆鍙�
+ const dateMap = {
+ createdTimeArray: 'createdTime',
+ };
+
+ // 2. 閬嶅巻澶勭悊鏃ユ湡
+ Object.keys(dateMap).forEach(arrayKey => {
+ const prefix = dateMap[arrayKey];
+ const range = newParams[arrayKey];
+
+ if (Array.isArray(range) && range.length > 0) {
+ // 璧嬪�� Begin 鍜� End
+ newParams[`${prefix}Begin`] = range[0];
+ newParams[`${prefix}End`] = range[1];
+ }
+
+ // 銆愭牳蹇冩敼鍔ㄣ�戯細鏃犺鏄惁鏈夊�硷紝澶勭悊瀹屽悗閮芥妸鍘熷鐨� Array 瀛楁鍒犳帀
+ // 杩欐牱璇锋眰閲屽氨涓嶄細鍑虹幇 confirmTimeRangeArray: [...]
+ delete newParams[arrayKey];
+ });
+
+ // 3. 閫氱敤娓呮礂锛氬垹闄ゆ墍鏈夌┖瀛楃涓层�乶ull 鎴� undefined 鐨勫叾浠栧瓧娈�
+ Object.keys(newParams).forEach(key => {
+ const val = newParams[key];
+ if (val === '' || val === null || val === undefined) {
+ delete newParams[key];
+ }
+ });
+
+ } else {
+ newParams = {};
+ }
+
+ return newParams;
+
+ },
+
})
const dialog = reactive({
visible: false,
@@ -553,7 +613,7 @@
dispatchNo.value = row.dispatchNo;
dialog.title = '璐圭敤鏄庣粏';
if (activeName.value == 'first') {
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 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 +621,7 @@
})
} else if (activeName.value == 'second') {
// 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0 }).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 +630,7 @@
}
}
const getListVable = (dispatchNo, feeType) => {
- listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
tableDataList.value = res.rows || [];
}
@@ -608,3 +668,13 @@
return sums;
}
</script>
+
+<style>
+:deep(.avue-crud__table) {
+ overflow-y: auto;
+}
+
+:deep(.el-scrollbar__bar.is-horizontal) {
+ pointer-events: auto;
+}
+</style>
--
Gitblit v1.8.0