From d9988aa24213dcc84f73304ae8a8ad2ce85d4501 Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Thu, 3 Dec 2020 10:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=89=B9=E5=8D=95?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=95=BF=E5=AE=A1=E6=89=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/NWFProcess/NWFContainerForm.js      | 23 ++++++++++++++++++-
 .../plugin/jqprint/jquery.jqprint-0.3.js      |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js
index cfc398fb0..075978941 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js	
@@ -799,7 +799,7 @@ var bootstrap = function ($, learun) {
 
                         });
                     }
-                    
+
 
                     //if (data.parentProcessId) {
                     //    nwflow.pProcessId = data.parentProcessId;
@@ -1827,13 +1827,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);
@@ -1843,8 +1854,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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js
index 2c3493a80..f47785c7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js	
@@ -203,6 +203,8 @@
                 var _text = _item.text;
                 if (_item.textList) {
                     _text = String(_item.textList);
+                } else {
+                    _text = '';
                 }
 
                 var $td = a('<td class="input" >' + _text + '</td>');