From 55e852854d06126ee3a24eb786c5460aa5ef2282 Mon Sep 17 00:00:00 2001
From: edy <edy@LAPTOP-FJ5VQJ6J>
Date: Fri, 2 Jul 2021 18:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=96=87=E9=80=9A=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DispatchController.cs         |  31 ++-
 .../Views/Dispatch/Form.cshtml                |  54 ++---
 .../Views/Dispatch/Form.js                    |   1 +
 .../Views/Dispatch/FormView.cshtml            |  66 +++---
 .../Views/Dispatch/FormView.js                |   2 +-
 .../Views/Dispatch/Index.js                   |  77 +++----
 .../Views/Dispatch/IndexXF.js                 |  77 +++----
 .../Views/Dispatch/Print.cshtml               | 194 +++++++++++-------
 .../Dispatch/DispatchEntity.cs                |   5 +-
 9 files changed, 299 insertions(+), 208 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
index f32fb6b14..793b5e950 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs	
@@ -194,12 +194,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 return View(new DispatchEntity());
             }
+            #region 获取附件名称
             if (dispatchEntity.AttachmentName != null)
             {
                 dispatchEntity.AttachmentName = annexesFileIBLL.GetFileNames(dispatchEntity.AttachmentName);
             }
+            #endregion
 
-            #region 读取数据
+            #region 读取标题和办公室
             if (dispatchEntity.DisTitle != null)
             {
                 var Model = dataItemIBLL.GetDetailList("DisPatch");
@@ -224,14 +226,31 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             #endregion
 
-            //获取校长的签名盖章
+            //获取校长的签名盖章  批示+时间+阅 
             var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
             var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "超级管理员");
-            if (nwfTaskLogEntity != null)
+            var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderByDescending(o => o.F_Id).ToList();
+            string strnull = "                   ";
+            if (listTaskLog.Count() > 0)
             {
-                ViewBag.StampImg = nwfTaskLogEntity.F_StampImg;
-                ViewBag.SignImg = nwfTaskLogEntity.F_SignImg;
-                ViewBag.F_Des = nwfTaskLogEntity.F_Des;
+                for (int i = 1; i < PrintList.Count; i++)
+                {
+                    if (i == 1)
+                    {
+                        dispatchEntity.Render = PrintList[i].F_Des;
+                        ViewBag.StampImg = nwfTaskLogEntity.F_StampImg;
+                        ViewBag.SignImg = nwfTaskLogEntity.F_SignImg;
+                    }
+
+                    dispatchEntity.Listarray += PrintList[i].F_CreateUserName + strnull + PrintList[i].F_CreateDate + strnull + "阅" + "&";
+                    //ViewBag.Time += PrintList[i].F_CreateDate + "  ";
+                    //ViewBag.Remark += "阅" + "&";
+                }
+                dispatchEntity.Listarray = dispatchEntity.Listarray.TrimEnd('&');
+                List<string> aaList = new List<string>(dispatchEntity.Listarray.Split('&'));
+                ViewBag.aaList = aaList;
+                //ViewBag.Time = ViewBag.Time.ToString().TrimEnd('&');
+                //ViewBag.Remark = ViewBag.Remark.TrimEnd('&');
             }
             return View(dispatchEntity);
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.cshtml
index 45b3f451f..511c4f05f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.cshtml	
@@ -3,60 +3,66 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">标题</div>
-        <div id="DisTitle"></div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</div>
+        <div id="DisTitle" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
         <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">字<font face="宋体">*</font></div>
         <input id="DisWork" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">号<font face="宋体">*</font></div>
         <input id="DisMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">份数<font face="宋体">*</font></div>
         <input id="Copies" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">年<font face="宋体">*</font></div>
         <input id="DisYear" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">月<font face="宋体">*</font></div>
         <input id="DisMonth" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">日<font face="宋体">*</font></div>
         <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">事由</div>
+        <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
         <textarea id="Reasons" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">附件</div>
+        <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
         <div id="AttachmentName"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">呈送意见</div>
-        <textarea id="Render" class="form-control" style="height:100px;"></textarea>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">呈送时间</div>
-        <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
-               onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
-               isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch" hidden="hidden">
         <div class="lr-form-item-title">收文单位</div>
-        <div id="DisOffice"></div>
+        <div id="DisOffice" readonly="readonly"></div>
     </div>
+    <div class="lr-form-wrap" id="form"> 
+        <div class="col-xs-12 lr-form-item"  data-table="Dispatch" style="display: none; " > 
+            <div class="lr-form-item-title">呈送时间</div> 
+            <input id="RenderDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" /> 
+        </div> 
+    </div> 
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送意见</div>
+            <textarea id="Render" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
+                   onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
+                   isvalid="yes" checkexpession="NotNull" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
         <div class="lr-form-item-title">流程</div>
         <input id="FlowNo" type="text" class="form-control" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js
index e5add66ad..15ea7d6c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Form.js	
@@ -57,6 +57,7 @@ var bootstrap = function ($, learun) {
             } else {
                 $('#DisTitle').lrselectSet("2");
             }
+            $('#RenderDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.cshtml
index 5448dc2cd..d9c49dcd2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.cshtml	
@@ -3,67 +3,73 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">标题</div>
-        <div id="DisTitle"></div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</div>
+        <div id="DisTitle" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
-        <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
+            <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">字<font face="宋体">*</font></div>
         <input id="DisWork" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">号<font face="宋体">*</font></div>
         <input id="DisMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">份数<font face="宋体">*</font></div>
         <input id="Copies" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">年<font face="宋体">*</font></div>
         <input id="DisYear" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">月<font face="宋体">*</font></div>
         <input id="DisMonth" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-2 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">日<font face="宋体">*</font></div>
         <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">事由</div>
+        <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
         <textarea id="Reasons" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">附件</div>
+        <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
         <div id="AttachmentName"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">呈送意见</div>
-        <textarea id="Render" class="form-control" style="height:100px;"></textarea>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">呈送时间</div>
-        <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
-               onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
-               isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">收文单位</div>
+        <div id="DisOffice" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+    <div class="lr-form-wrap" id="form"> 
+        <div class="col-xs-12 lr-form-item"  data-table="Dispatch" style="display: none; " > 
+            <div class="lr-form-item-title">呈送时间</div> 
+            <input id="RenderDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" /> 
+        </div> 
+    </div> 
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送意见</div>
+            <textarea id="Render" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
+                   onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
+                   isvalid="yes" checkexpession="NotNull" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
         <div class="lr-form-item-title">流程</div>
         <input id="FlowNo" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
         <div class="lr-form-item-title">关联流程</div>
         <input id="processId" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">收文单位</div>
-        <div id="DisOffice"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js
index 56a77b6ae..0456780eb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js	
@@ -57,7 +57,7 @@ var bootstrap = function ($, learun) {
             } else {
                 $('#DisTitle').lrselectSet("2");
             }
-
+            $('#RenderDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
index fb6646926..730f85159 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js	
@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 1 + '&DisOffice=' + 1,
-                    width: 1000,
-                    height: 500,
+                    width: 800,
+                    height: 380,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -61,8 +61,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 1 + '&DisOffice=' + 1,
-                        width: 1000,
-                        height: 500,
+                        width: 800,
+                        height: 380,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -139,40 +139,40 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
                 headData: [
-                    {
-                        label: "标题", name: "DisTitle", width: 250, align: "center",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'Dispatch',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "来文单位", name: "DisFrom", width: 200, align: "center" },
-                    { label: "字", name: "DisWork", width: 80, align: "center" },
-                    { label: "号", name: "DisMark", width: 80, align: "center" },
-                    { label: "份数", name: "Copies", width: 50, align: "center" },
+                    //{
+                    //    label: "标题", name: "DisTitle", width: 400, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'Dispatch',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    { 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: 50, align: "center" },
-                    { label: "日", name: "DisDay", width: 50, align: "center" },
-                    { label: "事由", name: "Reasons", width: 150, align: "center" },
-                    { label: "呈送意见", name: "Render", width: 200, align: "center" },
-                    { label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
-                    {
-                        label: "收文单位", name: "DisOffice", width: 200, align: "center",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'DisOffice',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    { label: "月", name: "DisMonth", width: 100, align: "center" },
+                    { label: "日", name: "DisDay", width: 100, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" },
+                    //{ label: "呈送意见", name: "Render", width: 200, align: "center" },
+                    //{ label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
+                    //{
+                    //    label: "收文单位", name: "DisOffice", width: 200, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'DisOffice',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "审批状态", name: "FlowNo", width: 100, align: "center",
                         formatter: function (cellvalue, row) {
@@ -201,7 +201,8 @@ var bootstrap = function ($, learun) {
         if (res.code == 200) {
             // 发起流程
             var postData = {
-                schemeCode: 'DBSW',// 填写流程对应模板编号
+                schemeCode: 'Dispatch',// 填写流程对应模板编号
+                //schemeCode: 'DBSW',// 填写流程对应模板编号
                 processId: processId,
                 level: '1',
             };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
index d636a935e..6baa78230 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js	
@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 2 + '&DisOffice=' + 2,
-                    width: 1000,
-                    height: 500,
+                    width: 800,
+                    height: 380,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -58,8 +58,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 2 + '&DisOffice=' + 2,
-                        width: 1000,
-                        height: 500,
+                        width: 800,
+                        height: 380,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -136,40 +136,40 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
                 headData: [
-                    {
-                        label: "标题", name: "DisTitle", width: 250, align: "center",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'Dispatch',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "来文单位", name: "DisFrom", width: 200, align: "center" },
-                    { label: "字", name: "DisWork", width: 80, align: "center" },
-                    { label: "号", name: "DisMark", width: 80, align: "center" },
-                    { label: "份数", name: "Copies", width: 50, align: "center" },
+                    //{
+                    //    label: "标题", name: "DisTitle", width: 400, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'Dispatch',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    { 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: 50, align: "center" },
-                    { label: "日", name: "DisDay", width: 50, align: "center" },
-                    { label: "事由", name: "Reasons", width: 150, align: "center" },
-                    { label: "呈送意见", name: "Render", width: 200, align: "center" },
-                    { label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
-                    {
-                        label: "收文单位", name: "DisOffice", width: 200, align: "center",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'DisOffice',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    { label: "月", name: "DisMonth", width: 100, align: "center" },
+                    { label: "日", name: "DisDay", width: 100, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" },
+                    //{ label: "呈送意见", name: "Render", width: 200, align: "center" },
+                    //{ label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
+                    //{
+                    //    label: "收文单位", name: "DisOffice", width: 200, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'DisOffice',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "审批状态", name: "FlowNo", width: 100, align: "center",
                         formatter: function (cellvalue, row) {
@@ -198,7 +198,8 @@ var bootstrap = function ($, learun) {
         if (res.code == 200) {
             // 发起流程
             var postData = {
-                schemeCode: 'XBSW',// 填写流程对应模板编号
+                schemeCode: 'Dispatch',// 填写流程对应模板编号
+                //schemeCode: 'XBSW',// 填写流程对应模板编号
                 processId: processId,
                 level: '1',
             };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml
index 7c5207b52..72c22fe58 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml	
@@ -102,19 +102,30 @@
             border-left: 2px solid red;
             height: 180px;
             padding-left: 50px;
+            word-wrap: break-word;
+            word-break: break-all;
         }
 
-        .hederR p {
-            margin-top: 20px;
-        }
+            .hederR p {
+                margin-top: 10px;
+            }
 
-        .hederR p:nth-child(2) {
-            margin-top: 40px;
-        }
+            .hederR h6 {
+                color: red;
+                font-size: 16px;
+            }
 
-        .hederR span, em {
-            padding: 10px 20px;
-        }
+            .hederR p:nth-child(2) {
+                margin-top: 30px;
+            }
+
+            .hederR span, em {
+                padding: 10px 12px;
+            }
+
+            .hederR span {
+                display: inline-block;
+            }
 
         .sy {
             width: 90%;
@@ -123,10 +134,10 @@
             border-bottom: 2px solid red;
         }
 
-        .sy span em {
-            display: inline-block;
-            padding: 10px 20px;
-        }
+            .sy span em {
+                display: inline-block;
+                padding: 10px 20px;
+            }
 
         .yj {
             width: 90%;
@@ -134,11 +145,12 @@
             height: 270px;
             border-bottom: 2px solid red;
         }
-        .yj div {
+
+            .yj div {
                 height: 232px;
             }
 
-        .yj div span {
+                .yj div span {
                     display: inline-block;
                     padding: 10px 20px;
                 }
@@ -166,7 +178,7 @@
                 .ps div span {
                     display: block;
                     padding: 10px 20px;
-                    height: 235px;
+                    min-height: 235px;
                 }
 
             .ps p {
@@ -186,24 +198,29 @@
             position: relative;
         }
 
-        .ulzp li {
-            float: left;
-            padding: 0;
-            margin: 0;
-            list-style: none;
-        }
+            .ulzp ul {
+                width: 50%;
+                float: left;
+            }
 
-        .ulzp span {
-            display: inline-block;
-            width: 80px;
-            height: 24px;
-            border-bottom: 1px solid #000;
-            vertical-align: bottom;
-            position: relative;
-            top: -5px;
-            text-indent: 0;
-            text-align: center;
-        }
+            .ulzp li {
+                float: left;
+                padding: 0;
+                margin: 0;
+                list-style: none;
+            }
+
+            .ulzp span {
+                display: inline-block;
+                width: 80px;
+                height: 24px;
+                border-bottom: 1px solid #000;
+                vertical-align: bottom;
+                position: relative;
+                top: -5px;
+                text-indent: 0;
+                text-align: center;
+            }
     </style>
 </head>
 
@@ -221,26 +238,45 @@
             <div class="heder">
                 <div class="hederL"></div>
                 <div class="hederR">
-                    <p><span> 来 文 单 位 </span><em>@Model.DisFrom</em><span>字</span>@Model.DisWork<span>号</span><em>@Model.DisMark</em></p>
-                    <p><span> 份 数 </span><em>@Model.Copies</em></p>
-                    <p><span>年</span><em>@Model.DisYear</em><span>月</span><em>@Model.DisMonth</em><span>日</span><em>@Model.DisDay</em></p>
+                    <p><em>@Model.DisFrom</em><h6> 来 文 单 位 </h6></p>
+                    <p>
+                        <em>@Model.Copies</em>
+                        <span> 份 数 </span>
+                        <em>@Model.DisWork</em>
+                        <span>字</span>
+                        <em>@Model.DisMark</em>
+                        <span>号</span>
+                    </p>
+                    <p>
+                        <em>@Model.DisYear</em>
+                        <span>年</span>
+                        <em>@Model.DisMonth</em>
+                        <span>月</span>
+                        <em>@Model.DisDay</em>
+                        <span>日</span>
+                    </p>
                 </div>
             </div>
             <div class="sy">
-                <span><em>事</em><em>由：</em>@Model.Reasons</span>
+                <span>
+                    <em>  事  </em><em>  由：  </em>
+                    <em style="color: #000000">
+                        @Model.Reasons
+                    </em>
+                </span>
             </div>
             <div class="sy">
                 <span>
-                    <em>附</em><em>件:</em>@Model.AttachmentName
+                    <em>  附  </em><em>  件：  </em><em style="color: #000000">@Model.AttachmentName</em>
                 </span>
             </div>
             <div class="yj">
                 <div>
-                    <span>呈送意见：@Model.Render</span>
+                    <span>呈送意见：<em style="color: #000000">@Model.Render</em></span>
                 </div>
                 <p>
                     <span>
-                        <em>
+                        <em style="color: #000000">
                             @Model.RenderDate.ToShortDateString().ToString().Replace("/", "-")
                         </em>
                     </span>
@@ -248,19 +284,35 @@
             </div>
             <div class="ps">
                 <div>
-                    <span> 批 示：@ViewBag.F_Des</span>
-                    <ul class="ulzp" style="height: 200px">
-                        <li>(签字):</li>
-                        <li> <img id="signImg" hidden="hidden"></li>
-                        <li>(签章):</li>
-                        <li><img id="stampImg" hidden="hidden"></li>
-                    </ul>
+                    <span>
+                        批    <em> 示：</em>
+                        <em style="color: #000000">
+                            @foreach (var item in ViewBag.aaList)
+                            {
+                                <em style="display: block; height: 30px; line-height: 30px; margin-left: 60px;">@item</em>
+                            }
+                        </em>
+                    </span>
+                    <div class="ulzp" style="height: 200px; border-bottom:none;">
+                        <ul>
+                            <li>(签字):</li>
+                            <li> <img id="signImg" hidden="hidden"></li>
+                        </ul>
+                        <ul>
+                            <li>(签章):</li>
+                            <li><img id="stampImg" hidden="hidden"></li>
+                        </ul>
+                    </div>
                 </div>
-
-                <p><span> 收 文 单 位 </span><em>@Model.DisOffice</em><span>字</span><em>@Model.DisWork</em><span>号</span><em>@Model.DisMark</em><span>年</span><em>@Model.DisYear</em><span>月</span><em>@Model.DisMonth</em><span>日</span><em>@Model.DisDay</em></p>
+                <p>
+                    <em>@Model.DisOffice</em><span> 收 文 单 位 </span>
+                    <em>@Model.DisWork</em><span>字</span>
+                    <em>@Model.DisMark</em><span>号</span>
+                    <em>@Model.DisYear</em><span>年</span>
+                    <em>@Model.DisMonth</em><span>月</span>
+                    <em>@Model.DisDay</em><span>日</span>
+                </p>
             </div>
-
-
         </div>
     </div>
     <div class="lr-query-btn" id="lr_print">打印</div>
@@ -269,25 +321,27 @@
     <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
     <script>
-    //盖章图片
-    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);
-
-    var signImg = new Image();
-    var stampImg = new Image();
-    signImg.src = $('#signImg')[0].src;
-    stampImg.src = $('#stampImg')[0].src;
-    signImg.onload=function() {
-        $('#signImg').show();
-    }
-    stampImg.onload=function() {
-        $('#stampImg').show();
-    }
-    $('#lr_print').on('click', function () {
-        $('#content').jqprint();
-    });
+        //盖章图片
+        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);
+
+        var signImg = new Image();
+        var stampImg = new Image();
+        signImg.src = $('#signImg')[0].src;
+        stampImg.src = $('#stampImg')[0].src;
+        signImg.onload=function() {
+            $('#signImg').show();
+        }
+        stampImg.onload=function() {
+            $('#stampImg').show();
+        }
+        $('#lr_print').on('click', function () {
+            $('#content').jqprint();
+        });
+
+        console.log(sss);
     </script>
 </body>
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs
index cf3bb960a..f82fb4891 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs	
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2021-06-01 11:49
     /// 描 述：收文报告
     /// </summary>
-    public class DispatchEntity 
+    public class DispatchEntity
     {
         #region 实体成员 
         /// <summary> 
@@ -124,6 +124,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string Listarray { get; set; }
+
         #endregion
     }
 }