份数隐藏，年当前年、事由取上传附件的名字

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

@@ -177,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             DispatchEntity entity = strEntity.ToObject<DispatchEntity>();
             entity.FlowNo = "0";
+            entity.Reasons = entity.AttachmentName;
             if (entity.DisOffice == "1")
             {
                 entity.WorkName = "1";
@@ -225,7 +226,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             #region 获取附件名称
             if (dispatchEntity.AttachmentName != null)
             {
-                dispatchEntity.AttachmentName = annexesFileIBLL.GetFileNames(dispatchEntity.AttachmentName);
+                string str = "";
+                string[] array = annexesFileIBLL.GetFileNames(dispatchEntity.AttachmentName).Split(',');
+                if (array.Length > 0)
+                {
+                    for (int i = 0; i < array.Length; i++)
+                    {
+                        str += array[i].Substring(0, array[i].IndexOf(".")) + ",";
+                    }
+                    str.TrimEnd(',');
+                }
+                dispatchEntity.Reasons = str;
             }
             #endregion
 
@@ -254,7 +265,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             #endregion
 
-            //获取校长的签名盖章  批示+时间+阅 
+            #region 获取校长的签名盖章  批示+时间+阅 
             //var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
             var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
             var Auditlist = dispatchAuditIBLL.ReadList(keyValue);
@@ -281,6 +292,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             dispatchEntity.Listarray = dispatchEntity.Listarray.TrimEnd('&');
             List<string> aaList = new List<string>(dispatchEntity.Listarray.Split('&'));
             ViewBag.aaList = aaList;
+            #endregion
 
             return View(dispatchEntity);
         }

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

@@ -11,18 +11,18 @@
         <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="col-xs-6 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-4 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-6 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-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-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-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" />
@@ -35,24 +35,24 @@
         <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">事&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">附&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">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
+        <div id="Reasons" class="form-control" style="height:100px;" readonly="readonly"></div>
+    </div>*@
     <div class="col-xs-4 lr-form-item" data-table="Dispatch" hidden="hidden">
         <div class="lr-form-item-title">收文单位</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="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>

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

@@ -44,6 +44,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            var NowYear = new Date();
+            $('#DisYear').val(NowYear.getFullYear()); 
             $('#AttachmentName').lrUploader();
             $('#DisOffice').lrDataItemSelect({ code: 'DisOffice' });
             if (DisOffice == "1") {
@@ -70,6 +72,7 @@ var bootstrap = function ($, learun) {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
                     }
+                    
                 });
             }
         }

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

@@ -11,18 +11,18 @@
         <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="col-xs-6 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-4 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-6 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-4 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>*@
     <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" />
@@ -35,10 +35,10 @@
         <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="col-xs-12 lr-form-item" data-table="Dispatch">
         <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>*@
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
         <div id="AttachmentName"></div>

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

@@ -180,11 +180,34 @@ 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: "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" },
-                    { label: "事由", name: "Reasons", width: 500, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function(i, item) {
+
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }},
                     {
                         label: "审批状态", name: "FlowNo", width: 100, align: "center",
                         formatter: function (cellvalue, row) {

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

@@ -181,11 +181,34 @@ 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: "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" },
-                    { label: "事由", name: "Reasons", width: 500, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function(i, item) {
+
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }},
                     {
                         label: "审批状态", name: "FlowNo", width: 100, align: "center",
                         formatter: function (cellvalue, row) {

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

@@ -240,8 +240,8 @@
                 <div class="hederR">
                     <p><em>@Model.DisFrom</em><h6> 来 文 单 位 </h6></p>
                     <p>
-                        <em>@Model.Copies</em>
-                        <span> 份 数 </span>
+                        @*<em>@Model.Copies</em>
+                        <span> 份 数 </span>*@
                         <em>@Model.DisWork</em>
                         <span>字</span>
                         <em>@Model.DisMark</em>
@@ -265,11 +265,11 @@
                     </em>
                 </span>
             </div>
-            <div class="sy">
+            @*<div class="sy">
                 <span>
                     <em>  附  </em><em>  件：  </em><em style="color: #000000">@Model.AttachmentName</em>
                 </span>
-            </div>
+            </div>*@
             <div class="yj">
                 <div>
                     <span>呈送意见：<em style="color: #000000">@Model.Render</em></span>

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

@@ -11,18 +11,18 @@
         <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
         <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-6 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" readonly="readonly" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+    <div class="col-xs-6 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" readonly="readonly" />
     </div>
-    <div class="col-xs-4 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" readonly="readonly" />
-    </div>
+    </div>*@
     <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" readonly="readonly" />
@@ -35,10 +35,10 @@
         <div class="lr-form-item-title">日<font face="宋体">*</font></div>
         <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
         <textarea id="Reasons" class="form-control" style="height:100px;" readonly="readonly"></textarea>
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item" data-table="Dispatch">
         <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
         <div id="AttachmentName"></div>

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

@@ -68,11 +68,34 @@ var bootstrap = function ($, learun) {
                     { label: "来文单位", name: "DisFrom", width: 300, align: "center" },
                     { label: "字", name: "DisWork", width: 100, align: "center" },
                     { label: "号", name: "DisMark", width: 100, align: "center" },
-                    { label: "份数", name: "Copies", width: 100, 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" },
-                    { label: "事由", name: "Reasons", width: 400, align: "center" },
+                    { label: "事由", name: "Reasons", width: 400, align: "center" ,,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function(i, item) {
+
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }},
                     { label: "传阅人员", name: "Reader", width: 100, align: "center",hidden:true},
                     //{ label: "呈送意见", name: "Render", width: 200, align: "center" },
                     //{ label: "呈送时间", name: "RenderDate", width: 100, align: "center" },