Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js

@@ -122,8 +122,8 @@ var bootstrap = function ($, learun) {
                         }
                     },
                 ],
-                height: 400,
-                mainId: 'AAIId',
+                height: 240,
+                mainId: 'Id',
                 reloadSelected: false,
             });
         },

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

@@ -21,7 +21,7 @@
     <a id="print" class="btn btn-primary">打印表单</a>
 </div>
 <div class="lr-layout-panel">
-    <div class="tab-pane" id="forminfo">
+    <div class="tab-pane" id="forminfo"style="height:510px">
         <div class="form-list" id="form_list_iframes">
         </div>
         <div class="form-list-tabs" id="form_list_tabs_warp">

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

@@ -237,7 +237,8 @@ var bootstrap = function ($, learun) {
             $('#print').on('click', function () {
                 //打印checkbox 选中效果打印不出来
                 $("input[type='checkbox']:checked").attr('checked', 'checked');
-                $.print('.lr-layout-panel');
+                window.print();
+                //$.print('.lr-layout-panel');
             });
             $('#print').show();
         },

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

@@ -1862,6 +1862,11 @@ var bootstrap = function ($, learun) {
                     var $iframe = learun.iframe(iframeId, frames);
                     //$iframe.$('.lr-form-wrap:visible').jqprint();
                     var res = $iframe.$('body').lrGetFormShow();
+                    let grid = res.find(item => item.type == 'gird')
+                    let col = ""
+                    if (grid) {
+                        col = 24 / grid.gridHead.length
+                    }
                     if (res[0].text.indexOf('合同审批流程单') > -1) {
                         isContract = true;
                     }
@@ -1872,6 +1877,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                         if (ainfo[i].title != '开始') {
+                            ainfo[i].col = col
                             res.push(ainfo[i]);
                         } 
                     } 
@@ -1887,7 +1893,11 @@ var bootstrap = function ($, learun) {
                     if (res1[0].text.indexOf('合同审批流程单') > -1) {
                         isContract = true;
                     }
-
+                    let grid = res1.find(item => item.type == 'gird')
+                    let col = ""
+                    if (grid) {
+                        col = 24 / grid.gridHead.length
+                    }
                     for (var len1 = ainfo.length, i1 = ainfo.length - 1; i1 >= 0; i1--) {
                         if (isContract) {
                             if (ainfo[i1].user.indexOf('关亮') > -1) {
@@ -1896,6 +1906,7 @@ var bootstrap = function ($, learun) {
                         }
                         //res1.push(ainfo[i1]);
                         if (ainfo[i1].title != '开始') {
+                            ainfo[i1].col = col
                             res1.push(ainfo[i1]);
                         } 
                     } 

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js

@@ -200,16 +200,16 @@
             }
             else if (_item.type == 'input') {
                 var colspan = _item.col * 2 - 1;
-                var _text = ''; 
+                var _text = '';
                 if (_item.text) {
                     _text = _item.text;
                 }
                 if (_item.textList) {
                     _text = String(_item.textList);
-                } 
-                var $td = a('<td class="input" >' + _text + '</td>');
-                $td.attr('colspan', colspan);
-                $tr.append('<td class="input inputname" >' + _item.name + ':</td>');
+                }
+                var $td = a('<td colspan="' + _item.col + '">' + _text + '</td>');
+
+                $tr.append('<td colspan="' + _item.col + '">' + _item.name + ':</td>');
                 $tr.append($td);
                 num = num - colspan - 1;
                 if (num <= 0) {
@@ -226,9 +226,9 @@
                     num = 24;
                 }
 
-
-                $tr.append('<td class="input inputname" >' + _item.title + ':</td>');
-                var __$td = a('<td class="anodeinfo" colspan="23" ><div class="anodeinfod" >' + _item.content + '</div></td>');
+                var colspan = 24 - _item.col;
+                $tr.append('<td colspan="' + _item.col + '">' + _item.title + ':</td>');
+                var __$td = a('<td class="anodeinfo"colspan="' + colspan + '" ><div class="anodeinfod" >' + _item.content + '</div></td>');
                 var _$div = __$td.find('div');
 
                 _$div.append('<div class="tuser" >' + _item.user + '</div>');