From 765a3e0eca86fb545050f03e9e6a8b7eadfd2573 Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 14 Dec 2020 17:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=BD=92=E6=A1=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=BA=9F=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/NWFProcess/ContractFiling.cshtml            |  1 +
 .../LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js | 10 ++++++++++
 .../Process/NWFProcessSerivce.cs                      | 11 +++++++++++
 3 files changed, 22 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml
index 6f1cffdf6..59fcb8238 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml	
@@ -9,6 +9,7 @@
                 <ul class="lr-left-list" id="lr_left_list">
                     <li class="active lrlg" data-value="1">未完成</li>
                     <li data-value="2" class="lrlg">已完成</li>
+                    <li data-value="3" class="lrlg">作废</li>
                 </ul>
             </div>
         </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js
index 66e2b8326..ccf66716c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js	
@@ -10,6 +10,7 @@ var bootstrap = function ($, learun) {
     var categoryId = '1';
     var logbegin = '';
     var logend = '';
+    var F_EnabledMark = false;
 
     var page = {
         init: function () {
@@ -99,6 +100,12 @@ var bootstrap = function ($, learun) {
                 $parent.find('.active').removeClass('active');
                 $this.addClass('active');
                 categoryId = $this.attr('data-value');
+                if (categoryId == 3) {
+                    categoryId = 1;
+                    F_EnabledMark = true;
+                } else {
+                    F_EnabledMark = false;
+                }
                 page.search();
             });
         },
@@ -179,6 +186,9 @@ var bootstrap = function ($, learun) {
             param.EndTime = logend;
             param.categoryId = categoryId;
             param.F_Category = '合同类';
+            if (F_EnabledMark) {
+                param.F_EnabledMark = 3;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs
index b37a2add6..96f9efbff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs	
@@ -108,6 +108,17 @@ namespace Learun.Application.WorkFlow
                     if (queryParam["categoryId"].ToString() == "1")
                     {
                         expression = expression.And(t => t.F_IsFinished == 0);
+                        // 是否作废
+                        if (!queryParam["F_EnabledMark"].IsEmpty()) // 是否作废
+                        {
+                            expression = expression.And(t => t.F_EnabledMark == 3);
+                        }
+                        else
+                        {
+                            expression = expression.And(t => t.F_EnabledMark != 3);
+
+                        }
+
                     }
                     else
                     {