From 17ad103c34f0fc20c08b520e767aeb22538c02ce Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 23 Dec 2025 14:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E3=80=91=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/email/components/resendList.vue | 11 ++++++-----
 src/views/system/email/index.vue                 |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/system/email/components/resendList.vue b/src/views/system/email/components/resendList.vue
index 6ecfc1b7..87ee91f4 100644
--- a/src/views/system/email/components/resendList.vue
+++ b/src/views/system/email/components/resendList.vue
@@ -14,12 +14,12 @@
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                     <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                         <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                             :value="item.value" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item :label="$t('system:email:search:emailDate')">
                     <el-date-picker v-model="datetimerange" type="datetimerange"
                         :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
@@ -50,7 +50,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -73,7 +73,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip>
+                <el-table-column :label="$t('common:action:action')" prop="" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <el-button type="text" @click="view(scope.row)">
                             {{ $t('common:button:view') }}
@@ -196,6 +196,7 @@ export default {
         // 重置列表查询
         handleReset() {
             this.searchData = searchDataDefault()
+            this.datetimerange = []
             this.getList()
         },
         // 排序
diff --git a/src/views/system/email/index.vue b/src/views/system/email/index.vue
index 43b3b14f..c6118ee0 100644
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@@ -14,12 +14,12 @@
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
+                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                     <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                         <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                             :value="item.value" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item :label="$t('system:email:search:emailDate')">
                     <el-date-picker v-model="datetimerange" type="datetimerange"
                         :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
@@ -50,7 +50,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                             ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
-                                item.RecipientAddress).join(", ") : ''
+                                item.RecipientName).join(", ") : ''
                         }}</span>
                     </template>
                 </el-table-column>
@@ -230,6 +230,7 @@ export default {
         // 重置列表查询
         handleReset() {
             this.searchData = searchDataDefault()
+            this.datetimerange = []
             this.getList()
         },
         // 排序