From 30f072dac3bf54dd318b4f0eb08b945e75563ffa Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Sat, 11 Jun 2022 15:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/route/mail/forward-mail.html | 18 ++++++++++----- .../static/route/mail/mail-del-list.html | 21 ++++++++++++++++- .../static/route/mail/mail-del-show.html | 22 +++++++++++++++++- .../static/route/mail/mail-draft-list.html | 21 ++++++++++++++++- .../static/route/mail/mail-inbox-list.html | 20 +++++++++++++++- .../static/route/mail/mail-inbox-show.html | 18 ++++++++++----- .../route/mail/mail-send-draft-edit.html | 23 ++++++++++++------- .../static/route/mail/mail-send-list.html | 21 ++++++++++++++++- .../static/route/mail/replay-mail.html | 18 ++++++++++----- .../static/route/mail/send-mail.html | 18 ++++++++++++--- 10 files changed, 166 insertions(+), 34 deletions(-) diff --git a/src/main/resources/static/route/mail/forward-mail.html b/src/main/resources/static/route/mail/forward-mail.html index a9bf375..87845a8 100644 --- a/src/main/resources/static/route/mail/forward-mail.html +++ b/src/main/resources/static/route/mail/forward-mail.html @@ -19,11 +19,8 @@
- - 抄送 - 密送 + 添加抄送 + 添加密送
@@ -94,7 +91,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 1) { }} + {{# if(d[fileName].length < 9) { }}
@@ -115,6 +112,15 @@
+
+
+
+ +
+
+
diff --git a/src/main/resources/static/route/mail/mail-del-list.html b/src/main/resources/static/route/mail/mail-del-list.html index f1645c9..34ce353 100644 --- a/src/main/resources/static/route/mail/mail-del-list.html +++ b/src/main/resources/static/route/mail/mail-del-list.html @@ -98,7 +98,7 @@ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } - return rowData; + return '' + rowData + ''; } }, {field: 'delTime', title: '删除时间', width: 170, align:'center', @@ -247,6 +247,25 @@ return; } }); + + table.on('tool(dataTable)', function(obj) { + var layEvent = obj.event; + if(layEvent === 'showEvent') { + layer.open({ + type: 2, + title: '查看', + closeBtn: 1, + area: ['95%', '95%'], + shadeClose: false, + anim: 2, + content: top.restAjax.path('route/mail/mail-del-show.html?id={arg}', [obj.data.id]), + end: function() { + reloadTable(); + } + }); + return; + } + }) }); diff --git a/src/main/resources/static/route/mail/mail-del-show.html b/src/main/resources/static/route/mail/mail-del-show.html index f45d22d..300785c 100644 --- a/src/main/resources/static/route/mail/mail-del-show.html +++ b/src/main/resources/static/route/mail/mail-del-show.html @@ -20,7 +20,7 @@
-
@@ -105,6 +105,17 @@
+
+
+
+
+ +
+
+
+
@@ -166,6 +177,15 @@ }); }); + $(document).on('click', '#recover-btn-bottom', function(){ + top.restAjax.get(top.restAjax.path('api/mail/get-recover-del-mail/{ids}', [id]), {}, null, function(code, data) { + top.dialog.msg("邮件已恢复"); + closeBox(); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + }); + // 初始化文件列表 function initFileList(fileName, ids, callback) { var dataForm = {}; diff --git a/src/main/resources/static/route/mail/mail-draft-list.html b/src/main/resources/static/route/mail/mail-draft-list.html index 5eb3bcd..d548a81 100644 --- a/src/main/resources/static/route/mail/mail-draft-list.html +++ b/src/main/resources/static/route/mail/mail-draft-list.html @@ -95,7 +95,7 @@ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } - return rowData; + return '' + rowData + ''; } }, {field: 'gmtCreate', title: '时间', width: 170, align:'center', @@ -201,6 +201,25 @@ return; } }); + + table.on('tool(dataTable)', function(obj) { + var layEvent = obj.event; + if(layEvent === 'showEvent') { + layer.open({ + type: 2, + title: '修改编辑', + closeBtn: 1, + area: ['95%', '95%'], + shadeClose: false, + anim: 2, + content: top.restAjax.path('route/mail/mail-send-draft-edit.html?mailId={arg}', [obj.data.mailId]), + end: function() { + reloadTable(); + } + }); + return; + } + }) }); diff --git a/src/main/resources/static/route/mail/mail-inbox-list.html b/src/main/resources/static/route/mail/mail-inbox-list.html index f832726..69202c7 100644 --- a/src/main/resources/static/route/mail/mail-inbox-list.html +++ b/src/main/resources/static/route/mail/mail-inbox-list.html @@ -95,7 +95,7 @@ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } - return rowData; + return '' + rowData + ''; } }, {field: 'gmtCreate', title: '时间', width: 170, align:'center', @@ -209,6 +209,24 @@ return; } }); + + table.on('tool(dataTable)', function(obj) { + var layEvent = obj.event; + if(layEvent === 'showEvent') { + layer.open({ + type: 2, + title: '收件箱', + closeBtn: 1, + area: ['95%', '95%'], + shadeClose: false, + anim: 2, + content: top.restAjax.path('route/mail/mail-inbox-show.html?id={arg}', [obj.data.id]), + end: function() { + } + }); + return; + } + }) }); diff --git a/src/main/resources/static/route/mail/mail-inbox-show.html b/src/main/resources/static/route/mail/mail-inbox-show.html index d4b6dd9..fbb79fa 100644 --- a/src/main/resources/static/route/mail/mail-inbox-show.html +++ b/src/main/resources/static/route/mail/mail-inbox-show.html @@ -21,12 +21,6 @@
发件人: - -
@@ -109,6 +103,18 @@ +
+
+
+ + +
+
+
diff --git a/src/main/resources/static/route/mail/mail-send-draft-edit.html b/src/main/resources/static/route/mail/mail-send-draft-edit.html index 663d1bb..cf610bc 100644 --- a/src/main/resources/static/route/mail/mail-send-draft-edit.html +++ b/src/main/resources/static/route/mail/mail-send-draft-edit.html @@ -20,14 +20,8 @@
- - - 抄送 - 密送 + 添加抄送 + 添加密送
@@ -119,6 +113,19 @@
+
+
+
+ + +
+
+
+
diff --git a/src/main/resources/static/route/mail/mail-send-list.html b/src/main/resources/static/route/mail/mail-send-list.html index 840bec3..5ff1f85 100644 --- a/src/main/resources/static/route/mail/mail-send-list.html +++ b/src/main/resources/static/route/mail/mail-send-list.html @@ -95,7 +95,7 @@ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } - return rowData; + return '' + rowData + ''; } }, {field: 'gmtCreate', title: '时间', width: 170, align:'center', @@ -201,6 +201,25 @@ return; } }); + + table.on('tool(dataTable)', function(obj) { + var layEvent = obj.event; + if(layEvent === 'showEvent') { + layer.open({ + type: 2, + title: '查看', + closeBtn: 1, + area: ['95%', '95%'], + shadeClose: false, + anim: 2, + content: top.restAjax.path('route/mail/mail-send-show.html?mailId={arg}', [obj.data.mailId]), + end: function() { + reloadTable(); + } + }); + return; + } + }) }); diff --git a/src/main/resources/static/route/mail/replay-mail.html b/src/main/resources/static/route/mail/replay-mail.html index 41a3dc3..a2799d3 100644 --- a/src/main/resources/static/route/mail/replay-mail.html +++ b/src/main/resources/static/route/mail/replay-mail.html @@ -19,11 +19,8 @@
- - 抄送 - 密送 + 添加抄送 + 添加密送
@@ -94,7 +91,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 1) { }} + {{# if(d[fileName].length < 9) { }}
@@ -115,6 +112,15 @@
+
+
+
+ +
+
+
diff --git a/src/main/resources/static/route/mail/send-mail.html b/src/main/resources/static/route/mail/send-mail.html index 1fbd16a..0766e1a 100644 --- a/src/main/resources/static/route/mail/send-mail.html +++ b/src/main/resources/static/route/mail/send-mail.html @@ -25,8 +25,8 @@ -
抄送 - 密送 + 添加抄送 + 添加密送
@@ -97,7 +97,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 1) { }} + {{# if(d[fileName].length < 9) { }}
@@ -118,6 +118,18 @@
+
+
+
+ + +
+
+