合同归档调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -172,6 +172,11 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+        [HttpGet]
+        public ActionResult ContractFilingMonitor()
+        {
+            return View();
+        }
         /// <summary>
         /// 人事归档
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js

@@ -10,7 +10,6 @@ var bootstrap = function ($, learun) {
     var categoryId = '1';
     var logbegin = '';
     var logend = '';
-    var F_EnabledMark = false;
 
     var page = {
         init: function () {
@@ -112,15 +111,23 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
                 headData: [
-                    { label: '合同编号', name: 'LC_htbh', width: 200, align: "left" },
+                    { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
                     { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
                     { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
-                    { label: '申报人', name: 'F_ModifyUserName', width: 200, align: "left" },
+                    { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
                     { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
-                    { label: '联系人', name: 'LC_dflxr', width: 120, align: "left" },
+                    { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
                     { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
-                    { label: '合同开始时间', name: 'LC_htkssj', width: 200, align: "left" },
-                    { label: '合同结束时间', name: 'LC_htjssj', width: 200, align: "left" },
+                    {
+                        label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
                     { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
                 ],
@@ -137,14 +144,13 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.categoryId = 2;
-            param.F_Category = '合同类';
+            param.F_IsFinished = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {
             var processId = $('#gridtable').jfGridValue('LC_ID') || '';
             var title = $('#gridtable').jfGridValue('LC_htmc');
-            
+
             if (learun.checkrow(processId)) {
                 learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml

@@ -0,0 +1,50 @@
+@{
+    ViewBag.Title = "流程监控";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div id="lr_layout" class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
+            <div class="lr-layout-body">
+                <ul class="lr-left-list" id="lr_left_list">
+                    <li class="active lrlg" data-value="0">未完成</li>
+                    <li data-value="1" class="lrlg">已完成</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_eye" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">查看</span></a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="lr-layout-body" id="gridtable">
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js")
+
+
+
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js

@@ -0,0 +1,124 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：力软-前端开发组
+ * 日 期：2018.12.19
+ * 描 述：流程监控
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var categoryId = '0';
+    var logbegin = '';
+    var logend = '';
+
+    var page = {
+        init: function () {
+            $('#lr_verify').hide();
+            page.initleft();
+            page.initGrid();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_eye').on('click', function () {
+                page.eye();
+            });
+            
+        },
+        initleft: function () {
+            $('#lr_left_list li').on('click', function () {
+                var $this = $(this);
+                var $parent = $this.parent();
+                $parent.find('.active').removeClass('active');
+                $this.addClass('active');
+                categoryId = $this.attr('data-value');
+                page.search();
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
+                headData: [
+                    { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
+                    { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
+                    { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
+                    { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
+                    { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
+                    { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
+                    { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
+                    {
+                        label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
+                    { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
+                ],
+                mainId: 'F_Id',
+                isPage: true,
+                sidx: 'F_ModifyDate DESC',
+                dblclick: function () {
+                    page.eye();
+                }
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = logbegin;
+            param.EndTime = logend;
+            param.F_IsFinished = categoryId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        eye: function () {
+            var processId = $('#gridtable').jfGridValue('LC_ID') || '';
+            var title = $('#gridtable').jfGridValue('LC_htmc');
+
+            if (learun.checkrow(processId)) {
+                learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
+            }
+        }
+    };
+
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1271,6 +1271,7 @@
     <Content Include="Areas\LR_LGManager\Views\StampApply\Form.js" />
     <Content Include="Areas\LR_LGManager\Views\StampApply\Index.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFilingMonitor.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.js" />
@@ -7118,6 +7119,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\PrintView.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexRecycle.cshtml" />
     <Content Include="Areas\LR_SystemModule\Views\Log\ApiIndex.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFilingMonitor.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_hetong/LC_hetongService.cs

@@ -110,8 +110,22 @@ namespace Learun.Application.TwoDevelopment.LR_LGManager
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT t.* ");
-                strSql.Append(" FROM LC_hetong t left join adms7ultimate2.dbo.LR_NWF_Process b on t.lc_id=b.f_id where b.F_IsFinished=1 and b.F_EnabledMark!=2 and F_IsChild=0 ");
-                return this.BaseRepository("CollegeMIS").FindList<LC_hetongEntity>(strSql.ToString(), pagination);
+                strSql.Append(" FROM LC_hetong t left join adms7ultimate2.dbo.LR_NWF_Process b on t.lc_id=b.f_id where  b.F_EnabledMark!=2 and F_IsChild=0 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_IsFinished"].IsEmpty())
+                {
+                    dp.Add("F_IsFinished", queryParam["F_IsFinished"].ToString(), DbType.String);
+                    strSql.Append(" and b.F_IsFinished=@F_IsFinished ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.F_ModifyDate >= @startTime AND t.F_ModifyDate <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<LC_hetongEntity>(strSql.ToString(), dp,pagination);
             }
             catch (Exception ex)
             {