From 5339e71b9a2ac55b99ea82c6c620576aa808d815 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 02 四月 2026 18:36:08 +0800
Subject: [PATCH] 增加推送，和日期时间搜索修改
---
ui/admin-ui3/src/views/cwgl/returnLog/index.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
index 938a30e..7a1bb18 100644
--- a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
@@ -4,7 +4,7 @@
: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" @current-change="currentChange"
- @size-change="sizeChange" @on-load="onLoad">
+ v-model:search="queryParams" @size-change="sizeChange" @on-load="onLoad">
<!-- <template #menu-left>
<el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:requestLog:edit']"
@click="handleUpdate">淇敼
@@ -145,13 +145,53 @@
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
},
- getBeginListFunc: (params = {}) => {
- let newParams = { ...params };
+ // getBeginListFunc: (params = {}) => {
+ // let newParams = { ...params };
+ // newParams.type = 1;
+ // newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
+ // delete newParams.reqTimeArray;
+ // return newParams
+ // }
+
+ getBeginListFunc: (params = {}) => {
+ // 1. 浣跨敤娴呮嫹璐濓紝涓嶅奖鍝嶅師濮嬫煡璇㈠璞�
+ // 鍏抽敭鐐癸細浠庡師濮� queryParams.value 鍙栧�硷紝纭繚鍒嗛〉鏃朵緷鐒惰兘鎷垮埌鏁扮粍
+ let newParams = { ...queryParams.value, ...params };
newParams.type = 1;
- newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
- delete newParams.reqTimeArray;
- return newParams
- }
+ // 2. 瀹氫箟鏃ユ湡瀛楁鏄犲皠 (鏁扮粍鍚� : 鎺ュ彛闇�瑕佺殑鍓嶇紑)
+ const dateMap = {
+ reqTimeArray: 'reqTime',
+ };
+
+ // 3. 閬嶅巻澶勭悊鏃ユ湡
+ Object.keys(dateMap).forEach(arrayKey => {
+ const prefix = dateMap[arrayKey];
+ const range = newParams[arrayKey];
+
+ if (Array.isArray(range) && range.length === 2) {
+ // 璧嬪�兼帴鍙ｉ渶瑕佺殑 Begin 鍜� End
+ newParams[`${prefix}Begin`] = range[0];
+ newParams[`${prefix}End`] = range[1];
+ }
+
+ // 鍙湪缁欐帴鍙ｇ殑鍙傛暟涓垹闄ゆ暟缁勶紝涓嶅奖鍝嶉〉闈㈡樉绀虹殑 queryParams
+ delete newParams[arrayKey];
+ });
+
+ // 4. 娓呮礂鍙傛暟锛氳繃婊ょ┖鍊�
+ const finalParams = {};
+ Object.keys(newParams).forEach(key => {
+ const val = newParams[key];
+ if (val !== '' && val !== null && val !== undefined) {
+ finalParams[key] = val;
+ }
+ });
+
+ console.log('鍙戦�佺粰鎺ュ彛鐨勬渶缁堝弬鏁�:', finalParams);
+
+ // 銆愭牳蹇冧慨鏀广�戯細鐩存帴杩斿洖锛屼笉瑕佽祴鍊肩粰 queryParams.value
+ return finalParams;
+ },
})
--
Gitblit v1.8.0