From 045fbc240ced1e1bc005b734098e59779b67bb1c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 29 九月 2025 10:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue |   64 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
index 50ce33f..e92f1fe 100644
--- a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
@@ -6,12 +6,12 @@
       @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
       @size-change="sizeChange" @on-load="onLoad">
       <template #menu-left>
-        <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:keyCollectionInfo:edit']"
+        <!-- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:keyCollectionInfo:edit']"
           @click="handleUpdate">淇敼
         </el-button>
         <el-button type="danger" icon="Delete" :disabled="pageF.multiple" @click="handleDelete"
           v-hasPermi="['cwgl:keyCollectionInfo:remove']">鍒犻櫎
-        </el-button>
+        </el-button> -->
         <el-button type="warning" plain icon="Download" @click="handleExport"
           v-hasPermi="['cwgl:keyCollectionInfo:export']">瀵煎嚭
         </el-button>
@@ -69,8 +69,9 @@
     // },
     customerName: {
       label: '瀹㈡埛鍚嶇О',
-      minWidth: 200,
-        search: true,
+      minWidth: 220,
+      search: true,
+      showOverflowTooltip: true,
     },
     carrier: {
       label: '鎵胯繍鍟�',
@@ -80,7 +81,7 @@
     dispatchNo: {
       label: '璋冨害鍗曞彿',
       minWidth: 200,
-        search: true,
+      search: true,
     },
     driverName: {
       label: '鍙告満鍚嶇О',
@@ -96,29 +97,62 @@
     orderTime: {
       label: '璁㈠崟涓嬪崟鏃堕棿',
       minWidth: 180,
-        search: true,
       type: 'datetime',  // 鏀逛负 datetime 绫诲瀷
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
       minWidth: 200,
+    },
+    orderTimeArray: {
+      label: '璁㈠崟涓嬪崟鏃堕棿',
+      search: true,
+      searchRange: true,
+      type: 'daterange',
+      startPlaceholder: '寮�濮嬫棩鏈�',
+      endPlaceholder: '缁撴潫鏃ユ湡',
+      valueFormat: 'YYYY-MM-DD',
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
     },
     orderCreatedTime: {
       label: '璁㈠崟鍒涘缓鏃堕棿',
       minWidth: 180,
-        search: true,
       type: 'datetime',  // 鏀逛负 datetime 绫诲瀷
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
       minWidth: 200,
     },
+    orderCreatedTimeArray: {
+      label: '璁㈠崟鍒涘缓鏃堕棿',
+      search: true,
+      searchRange: true,
+      type: 'daterange',
+      startPlaceholder: '寮�濮嬫棩鏈�',
+      endPlaceholder: '缁撴潫鏃ユ湡',
+      valueFormat: 'YYYY-MM-DD',
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+    },
     dispatchCreatedTime: {
       label: '璋冨害鍗曞垱寤烘椂闂�',
       minWidth: 180,
-        search: true,
       type: 'datetime',  // 鏀逛负 datetime 绫诲瀷
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
       minWidth: 200,
+    },
+    dispatchCreatedTimeArray: {
+      label: '璋冨害鍗曞垱寤烘椂闂�',
+      search: true,
+      searchRange: true,
+      type: 'daterange',
+      startPlaceholder: '寮�濮嬫棩鏈�',
+      endPlaceholder: '缁撴潫鏃ユ湡',
+      valueFormat: 'YYYY-MM-DD',
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
     },
     keyCollectionTime: {
       label: '閽ュ寵棰嗗彇鏃堕棿',
@@ -205,7 +239,21 @@
     },
     handleSelectionChangeFunc: (selection: any) => {
       selectionList.value = selection;
+    },
+    getBeginListFunc: (params = {}) => {
+      let newParams = { ...params };
+
+      newParams = proxy.addDateRangeNew(newParams, newParams?.orderTimeArray, 'orderTime') || [];
+      newParams = proxy.addDateRangeNew(newParams, newParams?.orderCreatedTimeArray, 'orderCreatedTime') ||  [] ;
+      newParams = proxy.addDateRangeNew(newParams, newParams?.dispatchCreatedTimeArray, 'dispatchCreatedTime') || [];
+
+      delete newParams.orderTimeArray;
+      delete newParams.orderCreatedTimeArray;
+      delete newParams.dispatchCreatedTimeArray;
+
+      return newParams;
     }
+
   })
 
 

--
Gitblit v1.8.0