From d81756ba2233a997ed6d40095f6517ffb30ecba1 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 13 Apr 2021 17:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_OAModule/Controllers/NoticeController.cs    |  9 +++++++++
 .../LR_OAModule/Views/Notice/IndexFlow.cshtml      |  1 +
 .../Areas/LR_OAModule/Views/Notice/IndexFlow.js    | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
index a5043c015..bd079127d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
@@ -94,6 +94,15 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             return View();
         }
         /// <summary>
+        /// 回收站
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexRecycle()
+        {
+            return View();
+        }
+        /// <summary>
         /// 表单页面【查看通知公告】
         /// </summary>
         /// <returns></returns>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml
index 73331bcf5..b1fc059d7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml	
@@ -25,6 +25,7 @@
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlt">提交</span></a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlt">删除</span></a>
                         <a id="lr_recycle" class="btn btn-default"><i class="fa fa-circle-o-notch"></i>&nbsp;<span class="lrlt">放入回收站</span></a>
+                        <a id="lr_openrecycle" class="btn btn-default"><i class="fa fa-circle-o-notch"></i>&nbsp;<span class="lrlt">打开回收站</span></a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
index d0d4213f2..aadb445bc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
@@ -91,12 +91,22 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            $('#lr_openrecycle').on('click', function () {
+                learun.layerForm({
+                    id: 'formrecycle',
+                    title: '查看回收站',
+                    url: top.$.rootUrl + '/LR_OAModule/Notice/IndexRecycle',
+                    width: 1100,
+                    height: 700,
+                    btn: null
+                });
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('F_NewsId');
                 var status = $('#gridtable').jfGridValue('F_Status');
                 console.log(status);
-                if (status.indexOf("1")>0 || status.indexOf("2")>0) {
+                if (status.indexOf("1") > 0 || status.indexOf("2") > 0) {
                     learun.alert.warning("只能删除草稿！");
                     return;
                 } else {
@@ -132,7 +142,7 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning('只能提交一个!');
                     return;
                 }
-                if (learun.checkrow(keyValue) ) {
+                if (learun.checkrow(keyValue)) {
                     var SendFlag = $('#gridtable').jfGridValue('F_Status');
                     if (SendFlag == "1" || SendFlag == "2") {
                         learun.alert.warning("当前项目已提交，请耐心等待审批！");