Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml

@@ -31,8 +31,8 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 提交</a>
-                        <a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
-                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;设置传阅</a>
+                        @*<a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;设置传阅</a>*@
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js

@@ -133,7 +133,6 @@ var bootstrap = function ($, learun) {
             $('#lr_setread').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var loginInfo = learun.clientdata.get(['userinfo']);
-                console.log(loginInfo);
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
@@ -180,7 +179,6 @@ var bootstrap = function ($, learun) {
                     { label: "来文单位", name: "DisFrom", width: 400, align: "center" },
                     { label: "字", name: "DisWork", width: 150, align: "center" },
                     { label: "号", name: "DisMark", width: 150, align: "center" },
-                    //{ label: "份数", name: "Copies", width: 100, align: "center" },
                     { label: "年", name: "DisYear", width: 100, align: "center" },
                     { label: "月", name: "DisMonth", width: 100, align: "center" },
                     { label: "日", name: "DisDay", width: 100, align: "center" },
@@ -194,7 +192,6 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
                                         bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
@@ -252,7 +249,6 @@ var bootstrap = function ($, learun) {
     page.init();
 }
 function downLoad(fileId, fileTwo) {
-    console.log(222);
     if (fileTwo) {
 
         top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml

@@ -31,8 +31,8 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 提交</a>
-                        <a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
-                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;设置传阅</a>
+                        @*<a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;设置传阅</a>*@
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js

@@ -157,7 +157,6 @@ var bootstrap = function ($, learun) {
             $('#lr_setread').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var loginInfo = learun.clientdata.get(['userinfo']);
-                console.log(loginInfo);
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
@@ -195,7 +194,6 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
                                         bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
@@ -229,7 +227,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {
-            console.log(111);
             top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
         }
     };
@@ -251,7 +248,6 @@ var bootstrap = function ($, learun) {
     page.init();
 }
 function downLoad(fileId, fileTwo) {
-    console.log(222);
     if (fileTwo) {
 
         top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js

@@ -82,7 +82,6 @@ var bootstrap = function ($, learun) {
                                 async: false,
                                 cache: false,
                                 success: function (res) {
-                                    console.log(res);
                                     var bb = '';
                                     $.each(res.data, function (i, item) {
                                         bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) 
@@ -120,7 +119,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {
-            console.log(111);
             top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
         }
     };
@@ -142,7 +140,6 @@ var bootstrap = function ($, learun) {
     page.init();
 }
 function downLoad(fileId, fileTwo) {
-    console.log(222);
     if (fileTwo) {
 
         top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js

@@ -168,7 +168,6 @@ var bootstrap = function ($, learun) {
             })
             // 选中人员按钮点击事件
             $('#selected_user_list').on('click', function (e) {
-                console.log(11);
                 var et = e.target || e.srcElement;
                 var $et = $(et);
                 if ($et.hasClass('user-reomve')) {

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

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Web.Mvc;
 using Learun.Application.Organization;
 using Learun.Application.Base.AuthorizeModule;
-using System;
 using Learun.Application.TwoDevelopment.LR_LGManager;
 
 namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
@@ -20,6 +19,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
     public class NWFProcessController : MvcControllerBase
     {
         private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL();
+        //LC_hetongIBLL lcHetongIbll=new LC_hetongBLL();
 
         private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL();
         private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
@@ -130,9 +130,10 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             }
             var beginTime = data?.LC_htkssj.ToDate();
             var endTime = data?.LC_htjssj.ToDate();
-            var operationTime = data?.OperationTime.ToDate();
+            var operationTime = nwfTaskLogEntity?.F_CreateDate;
             ViewBag.UserName = userInfo?.F_RealName;
             ViewBag.IDCard = userInfo?.F_IdentityCardNo;
+            ViewBag.Htmc = data?.LC_htmc;
             ViewBag.BeginYear = beginTime?.Year;
             ViewBag.BeginMonth = beginTime?.Month;
             ViewBag.BeginDay = beginTime?.Day;
@@ -278,6 +279,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+
         /// <summary>
         /// 普通教师请假归档
         /// </summary>
@@ -364,6 +366,23 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             };
             return Success(jsonData);
         }
+
+        //[HttpGet]
+        //[AjaxOnly]
+        //public ActionResult GetContractList(string pagination, string queryJson)
+        //{
+        //    Pagination paginationobj = pagination.ToObject<Pagination>();
+        //    var list = lcHetongIbll.GetPageList(paginationobj, queryJson);
+        //    var jsonData = new
+        //    {
+        //        rows = list,
+        //        total = paginationobj.total,
+        //        page = paginationobj.page,
+        //        records = paginationobj.records,
+        //    };
+        //    return Success(jsonData);
+        //}
+        
         /// <summary>
         /// 获取我的流程信息列表
         /// </summary>
@@ -437,6 +456,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             var data = nWFTaskIBLL.GetEntity(taskId);
             return Success(data);
         }
+
         /// <summary>
         /// 获取普通教师请假归档列表
         /// </summary>
@@ -458,6 +478,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             };
             return Success(jsonData);
         }
+
         /// <summary>
         /// 获取中层领导请假归档列表
         /// </summary>
@@ -493,6 +514,18 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             nWFProcessIBLL.DeleteEntity(processId);
             return Success("删除成功");
         }
+        /// <summary>
+        /// 流程合同监控--作废
+        /// </summary>
+        /// <param name="processId">流程进程主键</param>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateEnabledMark(string processId,string EnabledMark)
+        {
+            nWFProcessIBLL.UpdateEnabledMark(processId, EnabledMark);
+            return Success("操作成功");
+        }
+        
         /// <summary>
         /// 普通教师请假归档
         /// </summary>
@@ -516,6 +549,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             studentLeave_ZcIBLL.DoFile(keyValue);
             return Success("归档成功");
         }
+
         #endregion
 
         #region 流程API

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

@@ -251,6 +251,19 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
                 {
                     item.imgUrl = null;
                 }
+
+                if (item.F_Id == "3a9e9db8-a928-435b-a9d2-4a4660b4cdeb")
+                {
+                    item.F_Name = "采购申请(普通)";
+                    item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY";
+                    item.F_Code = "caigoupt";
+                }
+                else if (item.F_Id == "307b2c75-174f-424d-84d8-e0f8374ec6d1")
+                {
+                    item.F_Name = "采购申请(耗材)";
+                    item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC";
+                    item.F_Code = "caigouhc";
+                }
             }
             return Success(data);
         }

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

@@ -2,20 +2,9 @@
     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="1">未完成</li>
-                    <li data-value="2" class="lrlg">已完成</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-
+<div class="lr-layout "  >
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+        <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">
@@ -34,8 +23,6 @@
                     </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>
-                        <a id="lr_appoint" class="btn btn-default"><i class="fa fa-magic"></i>&nbsp;<span class="lrlg">指派审核人</span></a>
-                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlg">作废</span></a>
                     </div>
                 </div>
             </div>

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

@@ -111,10 +111,36 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
                 headData: [
-                    { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
+                    { label: '申报日期', name: 'F_ModifyDate', 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: 100, align: "left" },
+                    {
+                        label: '申报人', name: 'F_CreateUserName', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '授权委托人', name: 'LC_sqwtr', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
                     { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
                     { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
@@ -129,7 +155,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
-                    { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
                 ],
                 mainId: 'F_Id',
                 isPage: true,

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

@@ -7,14 +7,14 @@
         <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>
+                    <li data-value="1" class="lrlg">运行中</li>
+                    <li data-value="4" 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-wrap lr-layout-wrap-notitle">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
@@ -33,6 +33,7 @@
                     </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>
+                        <a id="lr_del" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;<span class="lrlg">作废</span></a>
                     </div>
                 </div>
             </div>
@@ -42,6 +43,7 @@
         </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

@@ -7,9 +7,10 @@
  */
 var bootstrap = function ($, learun) {
     "use strict";
-    var categoryId = '0';
+    //var categoryId = '0';
     var logbegin = '';
     var logend = '';
+    var F_EnabledMark1 = '';
 
     var page = {
         init: function () {
@@ -56,7 +57,30 @@ var bootstrap = function ($, learun) {
             $('#lr_eye').on('click', function () {
                 page.eye();
             });
-            
+            // 作废
+            $('#lr_del').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ProcessId');
+                var F_EnabledMark1 = $('#gridtable').jfGridValue('F_EnabledMark1');
+                var F_IsFinished = $('#gridtable').jfGridValue('F_IsFinished');
+                if (learun.checkrow(keyValue)) {
+                    if (F_IsFinished == 1) {
+                        return learun.alert.warning("选中项已结束！");
+                    } else if (F_IsFinished == 0 && (F_EnabledMark1 == 4 || F_EnabledMark1 == 3)) {
+                        return learun.alert.warning("选中项已作废！");
+                    }
+                    learun.layerConfirm('是否确认作废该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/UpdateEnabledMark', { processId: keyValue, F_EnabledMark: 4 }, function (res) {
+                                if (res.code == 200) {
+                                    page.refreshGirdData();
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+
+
         },
         initleft: function () {
             $('#lr_left_list li').on('click', function () {
@@ -64,7 +88,7 @@ var bootstrap = function ($, learun) {
                 var $parent = $this.parent();
                 $parent.find('.active').removeClass('active');
                 $this.addClass('active');
-                categoryId = $this.attr('data-value');
+                F_EnabledMark1 = $this.attr('data-value');
                 page.search();
             });
         },
@@ -72,10 +96,36 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
                 headData: [
-                    { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
+                    { label: '申报日期', name: 'F_ModifyDate', 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: 100, align: "left" },
+                    {
+                        label: '申报人', name: 'F_CreateUserName', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '授权委托人', name: 'LC_sqwtr', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
                     { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
                     { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
@@ -90,7 +140,33 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
-                    { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
+                    {
+                        label: '状态', name: 'F_EnabledMark1', width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (row.F_IsFinished == 0) {
+                                if (cellvalue == 1) {
+                                    //if (row.F_IsUrge == "1" && categoryId == '2') {
+                                    //    return "<span class=\"label label-danger\">催办加急</span>";
+                                    //}
+                                    return "<span class=\"label label-success\">运行中</span>";
+                                } else if (cellvalue == 2) {
+                                    return "<span class=\"label label-primary\">草稿</span>";
+                                }
+                                else {
+                                    //4
+                                    return "<span class=\"label label-danger\">作废</span>";
+                                }
+                            }
+                            else {
+                                if (cellvalue == 4) {
+                                    return "<span class=\"label label-default\">终止</span>";
+                                } else {
+                                    return "<span class=\"label label-warning\">结束</span>";
+                                }
+                            }
+
+                        }
+                    },
                 ],
                 mainId: 'F_Id',
                 isPage: true,
@@ -105,7 +181,12 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.F_IsFinished = categoryId;
+            param.F_IsFinished = 0;
+            if (F_EnabledMark1 == 1) {
+                param.SqlParameter = " and b.F_EnabledMark=1";
+            } else if (F_EnabledMark1 == 4) {
+                param.SqlParameter = " and (b.F_EnabledMark<>1 and b.F_EnabledMark<>2)";
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {
@@ -115,6 +196,9 @@ var bootstrap = function ($, learun) {
             if (learun.checkrow(processId)) {
                 learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
             }
+        },
+        refreshGirdData: function () {
+            page.search();
         }
     };
 

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

@@ -15,9 +15,9 @@
             <li><a data-value="workflowshcemeinfo">流程信息</a></li>
         </ul>
     </div>
-    <div class="tab-content" id="tab_content" style="position:relative;width:100%;height:100%;">
+    <div class="tab-content" id="tab_content" style="position:relative;width:100%;height:100%; overflow: auto;">
         <div id="auditinfo" class="tab-pane active" style="position:relative;padding:5px;width:100%;height:100%;">
-            <div style="position:relative;width:100%;height:100%;border:1px solid #ccc;" id="wf_timeline">
+            <div style="position:relative;width:100%;height:100%;border:1px solid #ccc; overflow: auto;" id="wf_timeline">
 
             </div>
         </div>

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

@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
         if (btn.next == '2') {
             isNext = '1';
         }
-
+        console.log(isNext,111111);
         if (isNext == '1') {// 获取下一节点数据
             var param = {
                 code: shcemeCode,
@@ -309,6 +309,11 @@ var bootstrap = function ($, learun) {
                     //$('#savedraft').show();
                     $('#savedraft').showBtn();
                     $('#savedraft').on('click', function () {
+                        // 验证表单数据完整性
+                        if (!custmerForm.validForm('create'))// create创建流程
+                        {
+                            return false;
+                        }
                         tabProcessId = nwflow.processId;
                         // 保存表单数据
                         custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () {
@@ -490,6 +495,11 @@ var bootstrap = function ($, learun) {
                     //$('#savedraft').show();
                     $('#savedraft').showBtn();
                     $('#savedraft').on('click', function () {
+                        // 验证表单数据完整性
+                        if (!custmerForm.validForm('create'))// create创建流程
+                        {
+                            return false;
+                        }
                         tabProcessId = nwflow.processId;
                         // 保存表单数据
                         custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () {
@@ -670,7 +680,7 @@ var bootstrap = function ($, learun) {
                                     _nodeMap[_item.id] = _item;
                                 });
                                 $.each(data, function (_id, _list) {
-                                    if (_list.length > 1) {
+                                	if (_list.length > 1) {
                                         _flag = true;
                                         return false;
                                     }
@@ -689,6 +699,7 @@ var bootstrap = function ($, learun) {
                                             return top[id].acceptClick(function (auditers) {
                                                 // 保存表单数据
                                                 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () {
+                                               
                                                     // 审批流程
                                                     learun.loading(true, '审批流程...');
                                                     var postData = {
@@ -800,7 +811,7 @@ var bootstrap = function ($, learun) {
 
                         });
                     }
-                    
+
 
                     //if (data.parentProcessId) {
                     //    nwflow.pProcessId = data.parentProcessId;
@@ -1828,13 +1839,24 @@ var bootstrap = function ($, learun) {
                     html = $('.tab-flow-audit').html();
                 }
 
+                var isContract = false;
+
+
                 var $iframes = $('#form_list_iframes');
                 var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
                 if (iframeId) {
                     var $iframe = learun.iframe(iframeId, frames);
                     //$iframe.$('.lr-form-wrap:visible').jqprint();
                     var res = $iframe.$('body').lrGetFormShow();
+                    if (res[0].text.indexOf('合同审批流程单') > -1) {
+                        isContract = true;
+                    }
                     for (var len = ainfo.length, i = ainfo.length - 1; i >= 0; i--) {
+                        if (isContract) {
+                            if (ainfo[i].user.indexOf('关亮') > -1) {
+                                continue;
+                            }
+                        }
                         res.push(ainfo[i]);
                     }
                     $.jqprintForm(res);
@@ -1844,8 +1866,18 @@ var bootstrap = function ($, learun) {
                     //$iframes.find(".lr-scroll-box")[0].style.top = 0;
                     //$iframes.find(".lr-formselect i").removeClass();
                     //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint(null,html);
+
                     var res1 = $iframes.lrGetFormShow();
+                    if (res1[0].text.indexOf('合同审批流程单') > -1) {
+                        isContract = true;
+                    }
+
                     for (var len1 = ainfo.length, i1 = ainfo.length - 1; i1 >= 0; i1--) {
+                        if (isContract) {
+                            if (ainfo[i1].user.indexOf('关亮') > -1) {
+                                continue;
+                            }
+                        }
                         res1.push(ainfo[i1]);
                     }
                     $.jqprintForm(res1);

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

@@ -74,6 +74,9 @@ var bootstrap = function ($, learun) {
             // 加载自定义流程列表
             learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoList', {}, function (data) {
                 schemeList = data;
+                //增加资产申请项目
+                schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' });
+                schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' });
                 render();
             });
 
@@ -103,8 +106,12 @@ var bootstrap = function ($, learun) {
         var shcemeCode = $selected.attr('data-value');
         if (!!shcemeCode) {
             var id = $selected[0].shceme.F_Id;
-            // 发起流程
-            learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: '发起流程【' + $selected[0].shceme.F_Name + '】', F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/NWFContainerForm?shcemeCode=' + shcemeCode + '&tabIframeId=' + id + '&type=create' });
+            if (!!$selected[0].shceme.F_CodeUrl) {
+                //代码开发调用
+                learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: $selected[0].shceme.F_Name, F_UrlAddress: $selected[0].shceme.F_CodeUrl });
+            } else {  // 发起流程
+                learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: '发起流程【' + $selected[0].shceme.F_Name + '】', F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/NWFContainerForm?shcemeCode=' + shcemeCode + '&tabIframeId=' + id + '&type=create' });
+            }
             return true;
         }
         else {

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

@@ -15,7 +15,13 @@
                 <div class="tableT">授权委托书</div>
 
                 <div class="entrTxt">
-                    兹委托<span>@ViewBag.UserName</span>(身份证号码：<span style="width: 237px;">@ViewBag.IDCard</span>)负责联系办理业务并签订合同或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
+                    兹委托<span>@ViewBag.UserName</span>(身份证号码：<span style="width: 237px;">@ViewBag.IDCard</span>)负责联系办理业务并签订合同，合同名称：
+                </div>
+                <div class="entrTxt">
+                    <span style="width: 88%;">@ViewBag.Htmc</span>
+                </div>
+                <div class="entrTxt">
+                    或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
                 </div>
                 <div class="entrTxt">
                     特此授权！
@@ -33,13 +39,15 @@
                 </div>
                 <div class="entrTxt">
                     (签字)
-                    <img id="signImg" hidden="hidden">
+                    <img id="signImg" hidden="hidden">)
                     <img id="stampImg" hidden="hidden">
                 </div>
                 <div class="entrTime">
+
                     @ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日
                 </div>
 
+
             </div>
         </div>
 
@@ -53,12 +61,16 @@
 </body>
 </html>
 <script>
+    var aurl = '@ViewBag.StampImg' ;
+    var burl = '@ViewBag.SignImg';
     //盖章图片
     var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
     var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=@ViewBag.SignImg';
     $('#signImg').attr('src', signUrl);
     $('#stampImg').attr('src', stampUrl);
 
+    if(!aurl){$('#signImg').hide()}
+    if(!burl){$('#stampImg').hide()}
     var signImg = new Image();
     var stampImg = new Image();
     signImg.src = $('#signImg')[0].src;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.cshtml

@@ -19,6 +19,10 @@
         <div class="lr-form-item-title">需要签名或盖章<font face="宋体">*</font></div>
         <div id="isSign" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">需要填写意见<font face="宋体">*</font></div>
+        <div id="isOpinion" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">下一节点审核人<font face="宋体">*</font></div>
         <div id="next" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.js

@@ -23,11 +23,14 @@ var bootstrap = function ($, learun) {
                 placeholder: false,
                 data: [{ 'id': '1', 'text': '是' }, { 'id': '2', 'text': '否' }]
             }).lrselectSet('2');
-            $('#isSign').lrselect({// 是否可编辑1.是2.否
+            $('#isSign').lrselect({
+                placeholder: false,
+                data: [{ 'id': '1', 'text': '需要' }, { 'id': '2', 'text': '不需要' }]
+            }).lrselectSet('2');
+            $('#isOpinion').lrselect({
                 placeholder: false,
                 data: [{ 'id': '1', 'text': '需要' }, { 'id': '2', 'text': '不需要' }]
             }).lrselectSet('2');
-
 
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.js

@@ -322,6 +322,8 @@ var bootstrap = function ($, learun) {
             var formdata = $('#step-1').lrGetFormData(keyValue);
             var shcemeData = $('#step-3').lrworkflowGet();
 
+            //console.log(JSON.stringify(shcemeData));
+
             if (authorizeType == 1) {
                 schemeAuthorizes = [];
                 schemeAuthorizes.push({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js

@@ -16,7 +16,7 @@ var auditors = [];
 var workforms = [];
 var workformMap = {};
 // 按钮
-var btnList = [{ id: '1', name: '同意', code: 'agree', file: '1', next: '1' }, { id: '2', name: '不同意', code: 'disagree', file: '1', next: '1' }];
+var btnList = [{ id: '1', name: '同意', code: 'agree', file: '1', option: '1', next: '1' }, { id: '2', name: '不同意', code: 'disagree', file: '1', option: '1', next: '1' }];
 // 条件节点
 var conditions = [];
 
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     $('.div_batchAudit').show();
                     $('.div_agreeGz').show();
                     $('.div_noPeopleGz').show();
-                    
+
                     $('#name').removeAttr('readonly');
                     break;
                 case 'auditornode':    // 传阅节点
@@ -344,7 +344,7 @@ var bootstrap = function ($, learun) {
             $('#lr_form_schoolmaster').on('click', function () {
                 learun.layerConfirm('是否确认增加分管校长？', function (res) {
                     if (res) {
-                        var data = { auditorId:'fgxzid', type: '7', auditorName:'分管校长'};
+                        var data = { auditorId: 'fgxzid', type: '7', auditorName: '分管校长' };
                         if (!isRepeat(data.auditorId)) {
                             data.id = learun.newGuid();
                             auditors.push(data);
@@ -387,120 +387,120 @@ var bootstrap = function ($, learun) {
                 subGridExpanded: function (subid, rowdata) {
                     $('#' + subid).jfGrid({
                         headData: [
-                           {
-                               label: "字段名称", name: "fieldName", width: 240, align: "left",
-                               edit: {
-                                   type: rowdata.type == '0' ? 'input' : 'label',
-                                   change: function (data, num) {// 行数据和行号
-                                       workformMap[rowdata.id].authorize[data.id] = data;
-                                   }
-                               }
-                           },
-                           {
-                               label: "字段ID", name: "fieldId", width: 240, align: "left",
-                               edit: {
-                                   type: rowdata.type == '0' ? 'input' : 'label',
-                                   change: function (data, num) {// 行数据和行号
-                                       workformMap[rowdata.id].authorize[data.id] = data;
-                                   }
-                               }
-                           },
-                           {
-                               label: "查看", name: "isLook", width: 70, align: "center",
-                               formatter: function (cellvalue, row, dfop, $dcell) {
-                                   $dcell.on('click', function () {
+                            {
+                                label: "字段名称", name: "fieldName", width: 240, align: "left",
+                                edit: {
+                                    type: rowdata.type == '0' ? 'input' : 'label',
+                                    change: function (data, num) {// 行数据和行号
+                                        workformMap[rowdata.id].authorize[data.id] = data;
+                                    }
+                                }
+                            },
+                            {
+                                label: "字段ID", name: "fieldId", width: 240, align: "left",
+                                edit: {
+                                    type: rowdata.type == '0' ? 'input' : 'label',
+                                    change: function (data, num) {// 行数据和行号
+                                        workformMap[rowdata.id].authorize[data.id] = data;
+                                    }
+                                }
+                            },
+                            {
+                                label: "查看", name: "isLook", width: 70, align: "center",
+                                formatter: function (cellvalue, row, dfop, $dcell) {
+                                    $dcell.on('click', function () {
 
-                                       if (row.isLook == 1) {
-                                           if (dfop.isEdit) {// 系统表单
-                                               workformMap[rowdata.id].authorize[row.id].isLook = 0;
-                                           }
-                                           else {// 自定义表单
-                                               var _formAuthorize = workformMap[row.formId].authorize;
-                                               _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                               _formAuthorize[row.fieldId].isLook = 0;
-                                           }
-                                           row.isLook = 0;
-                                           $(this).html('<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>');
-                                       }
-                                       else {
-                                           if (dfop.isEdit) {// 系统表单
-                                               workformMap[rowdata.id].authorize[row.id].isLook = 1;
-                                           }
-                                           else {// 自定义表单
-                                               var _formAuthorize = workformMap[row.formId].authorize;
-                                               _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                               _formAuthorize[row.fieldId].isLook = 1;
-                                           }
+                                        if (row.isLook == 1) {
+                                            if (dfop.isEdit) {// 系统表单
+                                                workformMap[rowdata.id].authorize[row.id].isLook = 0;
+                                            }
+                                            else {// 自定义表单
+                                                var _formAuthorize = workformMap[row.formId].authorize;
+                                                _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                                _formAuthorize[row.fieldId].isLook = 0;
+                                            }
+                                            row.isLook = 0;
+                                            $(this).html('<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>');
+                                        }
+                                        else {
+                                            if (dfop.isEdit) {// 系统表单
+                                                workformMap[rowdata.id].authorize[row.id].isLook = 1;
+                                            }
+                                            else {// 自定义表单
+                                                var _formAuthorize = workformMap[row.formId].authorize;
+                                                _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                                _formAuthorize[row.fieldId].isLook = 1;
+                                            }
 
-                                           row.isLook = 1;
-                                           $(this).html('<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>');
-                                       }
-                                   });
+                                            row.isLook = 1;
+                                            $(this).html('<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>');
+                                        }
+                                    });
 
-                                   //默认绑定授权值
-                                   if (dfop.isEdit) {// 系统表单
-                                       workformMap[rowdata.id].authorize[row.id].isLook = cellvalue;
-                                   }
-                                   else {// 自定义表单
-                                       var _formAuthorize = workformMap[row.formId].authorize;
-                                       _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                   }
+                                    //默认绑定授权值
+                                    if (dfop.isEdit) {// 系统表单
+                                        workformMap[rowdata.id].authorize[row.id].isLook = cellvalue;
+                                    }
+                                    else {// 自定义表单
+                                        var _formAuthorize = workformMap[row.formId].authorize;
+                                        _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                    }
 
-                                   if (cellvalue == 1) {
-                                       return '<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>';
-                                   } else if (cellvalue == 0) {
-                                       return '<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>';
-                                   }
-                               }
-                           },
-                           {
-                               label: "编辑", name: "isEdit", width: 70, align: "center",
-                               formatter: function (cellvalue, row, dfop, $dcell) {
-                                   $dcell.on('click', function () {
-                                       if (row.isEdit == 1) {
-                                           if (dfop.isEdit) {// 系统表单
-                                               workformMap[rowdata.id].authorize[row.id].isEdit = 0;
-                                           }
-                                           else {// 自定义表单
-                                               var _formAuthorize = workformMap[row.formId].authorize;
-                                               _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                               _formAuthorize[row.fieldId].isEdit = 0;
-                                           }
+                                    if (cellvalue == 1) {
+                                        return '<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>';
+                                    } else if (cellvalue == 0) {
+                                        return '<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>';
+                                    }
+                                }
+                            },
+                            {
+                                label: "编辑", name: "isEdit", width: 70, align: "center",
+                                formatter: function (cellvalue, row, dfop, $dcell) {
+                                    $dcell.on('click', function () {
+                                        if (row.isEdit == 1) {
+                                            if (dfop.isEdit) {// 系统表单
+                                                workformMap[rowdata.id].authorize[row.id].isEdit = 0;
+                                            }
+                                            else {// 自定义表单
+                                                var _formAuthorize = workformMap[row.formId].authorize;
+                                                _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                                _formAuthorize[row.fieldId].isEdit = 0;
+                                            }
 
-                                           row.isEdit = 0;
-                                           $(this).html('<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>');
-                                       }
-                                       else {
-                                           if (dfop.isEdit) {// 系统表单
-                                               workformMap[rowdata.id].authorize[row.id].isEdit = 1;
-                                           }
-                                           else {// 自定义表单
-                                               var _formAuthorize = workformMap[row.formId].authorize;
-                                               _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                               _formAuthorize[row.fieldId].isEdit = 1;
-                                           }
+                                            row.isEdit = 0;
+                                            $(this).html('<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>');
+                                        }
+                                        else {
+                                            if (dfop.isEdit) {// 系统表单
+                                                workformMap[rowdata.id].authorize[row.id].isEdit = 1;
+                                            }
+                                            else {// 自定义表单
+                                                var _formAuthorize = workformMap[row.formId].authorize;
+                                                _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                                _formAuthorize[row.fieldId].isEdit = 1;
+                                            }
 
-                                           row.isEdit = 1;
-                                           $(this).html('<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>');
-                                       }
-                                   });
+                                            row.isEdit = 1;
+                                            $(this).html('<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>');
+                                        }
+                                    });
 
-                                   //默认绑定授权值
-                                   if (dfop.isEdit) {// 系统表单
-                                       workformMap[rowdata.id].authorize[row.id].isEdit = cellvalue;
-                                   }
-                                   else {// 自定义表单
-                                       var _formAuthorize = workformMap[row.formId].authorize;
-                                       _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
-                                   }
+                                    //默认绑定授权值
+                                    if (dfop.isEdit) {// 系统表单
+                                        workformMap[rowdata.id].authorize[row.id].isEdit = cellvalue;
+                                    }
+                                    else {// 自定义表单
+                                        var _formAuthorize = workformMap[row.formId].authorize;
+                                        _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+                                    }
 
-                                   if (cellvalue == 1) {
-                                       return '<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>';
-                                   } else if (cellvalue == 0) {
-                                       return '<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>';
-                                   }
-                               }
-                           }
+                                    if (cellvalue == 1) {
+                                        return '<span class=\"label label-success \" style=\"cursor: pointer;\">是</span>';
+                                    } else if (cellvalue == 0) {
+                                        return '<span class=\"label label-default \" style=\"cursor: pointer;\">否</span>';
+                                    }
+                                }
+                            }
                         ],
                         onAddRow: function (row, rows) {//行数据和所有行数据
                             row.isLook = 0;
@@ -679,7 +679,7 @@ var bootstrap = function ($, learun) {
                 value: 'F_StrategyCode',
                 url: top.$.rootUrl + '/LR_Message/LR_StrategyInfo/GetList'
             });
-            
+
             /*按钮设置*/
             $('#btn_girdtable').jfGrid({
                 headData: [
@@ -709,6 +709,16 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    {
+                        label: "需要填写意见", name: "isOpinion", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == '1') {
+                                return '需要';
+                            } else {
+                                return '不需要';
+                            }
+                        }
+                    },
                     {
                         label: "下一节点审核人", name: "next", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -728,11 +738,11 @@ var bootstrap = function ($, learun) {
                     title: '添加按钮',
                     url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ButtonForm',
                     width: 400,
-                    height: 320,
+                    height: 350,
                     callBack: function (id) {
                         return top[id].acceptClick(function (data) {
                             var _flag = true;
-                            $.each(btnList, function (_index,_item) {
+                            $.each(btnList, function (_index, _item) {
                                 if (_item.code == data.code) {
                                     learun.alert.error('按钮编码重复！');
                                     _flag = false;
@@ -761,7 +771,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑按钮',
                         url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ButtonForm?id=' + _id,
                         width: 400,
-                        height: 320,
+                        height: 350,
                         callBack: function (id) {
                             return top[id].acceptClick(function (data) {
                                 for (var i = 0, l = btnList.length; i < l; i++) {
@@ -974,7 +984,7 @@ var bootstrap = function ($, learun) {
             if (currentNode.auditors) {
                 auditors = currentNode.auditors;
             }
-            if (currentNode.btnList && currentNode.btnList.length >0) {
+            if (currentNode.btnList && currentNode.btnList.length > 0) {
                 btnList = currentNode.btnList;
             }
             if (currentNode.conditions) {
@@ -1000,7 +1010,7 @@ var bootstrap = function ($, learun) {
                     $('#iocName').val(currentNode.iocName);
                     break;
             }
-          
+
         }
     };
     // 保存数据
@@ -1024,7 +1034,7 @@ var bootstrap = function ($, learun) {
                 currentNode.auditorAgainType = baseInfo.auditorAgainType;
                 currentNode.auditorType = baseInfo.auditorType;
                 currentNode.auditExecutType = baseInfo.auditExecutType;
-                
+
 
                 currentNode.isSign = baseInfo.isSign;
                 currentNode.isBatchAudit = baseInfo.isBatchAudit;
@@ -1086,7 +1096,6 @@ var bootstrap = function ($, learun) {
                 }
                 break;
         };
-
         callBack();
         return true;
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js

@@ -59,6 +59,10 @@ var bootstrap = function ($, learun) {
         }
         var postData = $('.lr-item').lrGetFormData();
         var F_Password = $.md5(postData.F_Password);
+        if (!keyValue) {
+            learun.alert.error("请选择印章！");
+            return false;
+        }
         learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
             callBack(keyValue);
         });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

@@ -191,6 +191,14 @@ namespace Learun.Application.WorkFlow
         {
             nWFProcessSerive.DeleteEntity(processId);
         }
+        /// <summary>
+        /// 作废
+        /// </summary>
+        /// <param name="processId">流程进程主键</param>
+        public void UpdateEnabledMark(string processId, string EnabledMark)
+        {
+            nWFProcessSerive.UpdateEnabledMark(processId, EnabledMark);
+        }
 
         #endregion
 
@@ -1571,6 +1579,7 @@ namespace Learun.Application.WorkFlow
             nWFProcessDetailsModel.CurrentNodeIds = nWFTaskIBLL.GetCurrentNodeIds(processId);
             nWFProcessDetailsModel.TaskLogList = (List<NWFTaskLogEntity>)nWFTaskIBLL.GetLogList(processId);
             nWFProcessDetailsModel.parentProcessId = nWFIEngine.GetConfig().ParentProcessId;
+            nWFProcessDetailsModel.SchemeCode = nWFIEngine.GetConfig().SchemeCode;
 
             if (string.IsNullOrEmpty(taskId))
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs

@@ -36,5 +36,9 @@ namespace Learun.Application.WorkFlow
         /// 父流程进程主键
         /// </summary>
         public string parentProcessId { get; set; }
+        /// <summary>
+        /// 流程编码
+        /// </summary>
+        public string SchemeCode { get; set; }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs

@@ -112,6 +112,12 @@ namespace Learun.Application.WorkFlow
         /// </summary>
         /// <param name="processId">流程进程主键</param>
         void DeleteEntity(string processId);
+        /// <summary>
+        /// 作废
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <param name="EnabledMark"></param>
+        void UpdateEnabledMark(string processId, string EnabledMark);
         #endregion
 
         #region 流程API

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
                     {
@@ -1441,6 +1452,32 @@ namespace Learun.Application.WorkFlow
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <param name="EnabledMark"></param>
+        public void UpdateEnabledMark(string processId, string EnabledMark)
+        {
+            try
+            {
+               var entity= this.BaseRepository().FindEntity<NWFProcessEntity>(t => t.F_Id == processId);
+                entity.F_EnabledMark =Convert.ToInt32(EnabledMark) ;
+                this.BaseRepository().Update(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 删除流程进程所有信息（流程撤销）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs

@@ -130,6 +130,14 @@ namespace Learun.Application.WorkFlow
         /// <returns></returns>
         [NotMapped]
         public string F_ProcessId { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string F_CodeUrl { get; set; }
+
+        
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs

@@ -15,7 +15,7 @@ namespace Learun.Application.WorkFlow
     /// 日 期：2018.12.06
     /// 描 述：工作流模板(新)
     /// </summary>
-    public class NWFSchemeService: RepositoryFactory
+    public class NWFSchemeService : RepositoryFactory
     {
         #region 获取数据
         /// <summary>
@@ -34,7 +34,8 @@ namespace Learun.Application.WorkFlow
                 strSql.Append(" FROM LR_NWF_SchemeInfo t LEFT JOIN LR_NWF_Scheme t1 ON t.F_SchemeId = t1.F_Id WHERE 1=1 ");
 
                 var dp = new DynamicParameters();
-                if (!string.IsNullOrEmpty(queryJson)) {
+                if (!string.IsNullOrEmpty(queryJson))
+                {
                     var queryParam = queryJson.ToJObject();
                     if (!queryParam["keyword"].IsEmpty())
                     {
@@ -87,7 +88,8 @@ namespace Learun.Application.WorkFlow
 
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT * ");
-                strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1  AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds);
+                strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE (t.F_EnabledMark = 1  AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds + ")");
+                strSql.Append(" or t.F_Id in('3a9e9db8-a928-435b-a9d2-4a4660b4cdeb','307b2c75-174f-424d-84d8-e0f8374ec6d1')");
 
                 return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString());
             }
@@ -180,7 +182,7 @@ namespace Learun.Application.WorkFlow
                 }
             }
         }
-        
+
         /// <summary>
         /// 获取模板基础信息的实体
         /// </summary>
@@ -303,7 +305,7 @@ namespace Learun.Application.WorkFlow
                 }
             }
         }
-        
+
 
 
         #endregion
@@ -492,7 +494,7 @@ namespace Learun.Application.WorkFlow
                     strSql.Append(" and DATEPART(yyyy,p.F_CreateDate) = @year ");
                 }
                 strSql.Append(" where si.F_EnabledMark=1 ");
-                
+
                 return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)