收文

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs

@@ -22,7 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         private DispatchIBLL dispatchIBLL = new DispatchBLL();
         private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
         private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
-
+        private DataItemIBLL dataItemIBLL = new DataItemBLL();
         #region 视图功能
 
         /// <summary>
@@ -189,6 +189,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult Print(string keyValue)
         {
             var dispatchEntity = dispatchIBLL.GetDispatchEntity(keyValue);
+
             if (dispatchEntity == null)
             {
                 return View(new DispatchEntity());
@@ -198,6 +199,31 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 dispatchEntity.AttachmentName = annexesFileIBLL.GetFileNames(dispatchEntity.AttachmentName);
             }
 
+            #region 读取数据
+            if (dispatchEntity.DisTitle != null)
+            {
+                var Model = dataItemIBLL.GetDetailList("DisPatch");
+                foreach (var item in Model)
+                {
+                    if (!string.IsNullOrEmpty(dispatchEntity.DisTitle) && item.F_ItemValue == dispatchEntity.DisTitle)
+                    {
+                        dispatchEntity.DisTitle = item.F_ItemName;
+                    }
+                }
+            }
+            if (dispatchEntity.DisOffice != null)
+            {
+                var Model = dataItemIBLL.GetDetailList("DisOffice");
+                foreach (var item in Model)
+                {
+                    if (!string.IsNullOrEmpty(dispatchEntity.DisOffice) && item.F_ItemValue == dispatchEntity.DisOffice)
+                    {
+                        dispatchEntity.DisOffice = item.F_ItemName;
+                    }
+                }
+            }
+            #endregion
+
             //获取校长的签名盖章
             var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
             var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "超级管理员");

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

@@ -4,8 +4,8 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
-        <input id="DisTitle" isvalid="yes" class="form-control" checkexpession="NotNull" />
+        <div class="lr-form-item-title">标题</div>
+        <div id="DisTitle"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
@@ -53,10 +53,6 @@
                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">
-            <div class="lr-form-item-title">批示</div>
-            <textarea id="Instructions" 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>
         <div id="DisOffice"></div>

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

@@ -7,6 +7,7 @@
 var acceptClick;
 var keyValue = request('keyValue');
 var DisOffice = request('DisOffice');
+var WorkName = request('WorkName');
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -50,6 +51,12 @@ var bootstrap = function ($, learun) {
             } else {
                 $('#DisOffice').lrselectSet("2");
             }
+            $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
+            if (WorkName == "1") {
+                $('#DisTitle').lrselectSet("1");
+            } else {
+                $('#DisTitle').lrselectSet("2");
+            }
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -4,8 +4,8 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="Dispatch">
-        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
-        <input id="DisTitle" isvalid="yes" class="form-control" checkexpession="NotNull" />
+        <div class="lr-form-item-title">标题</div>
+        <div id="DisTitle"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>

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

@@ -7,6 +7,7 @@
 var acceptClick;
 var keyValue = request('keyValue');
 var DisOffice = request('DisOffice');
+var WorkName = request('WorkName');
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -50,6 +51,12 @@ var bootstrap = function ($, learun) {
             } else {
                 $('#DisOffice').lrselectSet("2");
             }
+            $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
+            if (WorkName == "1") {
+                $('#DisTitle').lrselectSet("1");
+            } else {
+                $('#DisTitle').lrselectSet("2");
+            }
 
         },
         initData: function () {

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

@@ -139,7 +139,18 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
                 headData: [
-                    { label: "标题", name: "DisTitle", width: 250, align: "center" },
+                    {
+                        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" },
@@ -150,7 +161,18 @@ var bootstrap = function ($, learun) {
                     { 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" },
+                    {
+                        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) {

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

@@ -136,7 +136,18 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
                 headData: [
-                    { label: "标题", name: "DisTitle", width: 250, align: "center" },
+                    {
+                        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" },
@@ -147,7 +158,18 @@ var bootstrap = function ($, learun) {
                     { 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" },
+                    {
+                        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) {

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

@@ -217,7 +217,7 @@
 
                 <span>线</span>
             </p>
-            <h5>@Model.WorkName</h5>
+            <h5>@Model.DisTitle</h5>
             <div class="heder">
                 <div class="hederL"></div>
                 <div class="hederR">