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/returnLog/index.vue |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
index a29dc93..243ffd9 100644
--- a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
@@ -3,7 +3,7 @@
         <avue-crud :option="option" :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" @current-change="currentChange"
+            @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange" 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']"
@@ -92,10 +92,21 @@
         reqTime: {
             label: '瀛樺叆鏃堕棿',
             minWidth: 150,
-            search: true,
             type: 'datetime',  // 鏀逛负 datetime 绫诲瀷
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        },
+        reqTimeArray: {
+            label: '瀛樺叆鏃堕棿',
+            search: true,
+            searchRange: true,
+            type: 'daterange',
+            startPlaceholder: '寮�濮嬫棩鏈�',
+            endPlaceholder: '缁撴潫鏃ユ湡',
+            valueFormat: 'YYYY-MM-DD',
+            hide: true,
+            addDisplay: false,
+            editDisplay: false,
         },
         // reqTime: {
         //   label: '璇锋眰鏃堕棿',
@@ -135,9 +146,11 @@
             selectionList.value = selection;
         },
         getBeginListFunc: (params = {}) => {
-            params.type = 1;
-            return params
-
+            let newParams = { ...params };
+            newParams.type = 1;
+            newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
+            delete newParams.reqTimeArray;
+            return newParams
         }
     })
 

--
Gitblit v1.8.0