From 5b45c48c8906579b9d02dd01f72beafaf5ec94fc Mon Sep 17 00:00:00 2001 From: edy Date: Mon, 2 Aug 2021 15:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BD=E6=95=B0=E9=9A=90=E8=97=8F=EF=BC=8C?= =?UTF-8?q?=E5=B9=B4=E5=BD=93=E5=89=8D=E5=B9=B4=E3=80=81=E4=BA=8B=E7=94=B1?= =?UTF-8?q?=E5=8F=96=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DispatchController.cs | 16 ++++++++-- .../Views/Dispatch/Form.cshtml | 32 +++++++++---------- .../Views/Dispatch/Form.js | 3 ++ .../Views/Dispatch/FormView.cshtml | 12 +++---- .../Views/Dispatch/Index.js | 27 ++++++++++++++-- .../Views/Dispatch/IndexXF.js | 27 ++++++++++++++-- .../Views/Dispatch/Print.cshtml | 8 ++--- .../Views/Dispatch/ReadForm.cshtml | 12 +++---- .../Views/Dispatch/ReadIndex.js | 27 ++++++++++++++-- 9 files changed, 124 insertions(+), 40 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 93bfdfde4..3ad402737 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 @@ -177,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { DispatchEntity entity = strEntity.ToObject(); 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 aaList = new List(dispatchEntity.Listarray.Split('&')); ViewBag.aaList = aaList; + #endregion 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 511c4f05f..ce3903c87 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 @@ -11,18 +11,18 @@
来文单位*
-
+
字*
-
+
号*
-
-
份数*
- -
+ @*
+
份数*
+ +
*@
年*
@@ -35,24 +35,24 @@
日*
-
-
事       由
- -
附       件
+ @*
+
事       由
+
+
*@ -
- -
+
+ +
@*
呈送意见
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 15ea7d6c6..55b3f679d 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 @@ -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]); } } + }); } } 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 1aff7bceb..4a687d39e 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 @@ -11,18 +11,18 @@
来文单位*
-
+
字*
-
+
号*
-
+ @*
份数*
-
+
*@
年*
@@ -35,10 +35,10 @@
日*
-
+ @*
事       由
-
+
*@
附       件
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 c503eb571..5569bbd7c 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 @@ -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 += '' + + item.F_FileName + + ',   '; + }) + callback(bb); + } + }); + }}, { label: "审批状态", name: "FlowNo", width: 100, align: "center", formatter: function (cellvalue, row) { 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 a29a0c67e..5a4d465d5 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 @@ -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 += '' + + item.F_FileName + + ',   '; + }) + callback(bb); + } + }); + }}, { label: "审批状态", name: "FlowNo", width: 100, align: "center", formatter: function (cellvalue, row) { 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 7490a5825..82fea4558 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 @@ -240,8 +240,8 @@

@Model.DisFrom

来 文 单 位

- @Model.Copies - 份 数 + @*@Model.Copies + 份 数 *@ @Model.DisWork 字 @Model.DisMark @@ -265,11 +265,11 @@

-
+ @*
附 件： @Model.AttachmentName -
+
*@
呈送意见：@Model.Render diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.cshtml index 8de5a276f..c5a127e18 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.cshtml @@ -11,18 +11,18 @@
来文单位*
-
+
字*
-
+
号*
-
+ @*
份数*
-
+
*@
年*
@@ -35,10 +35,10 @@
日*
-
+ @*
事       由
-
+
*@
附       件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js index 603dc7b4c..7a0703ae0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js +++ b/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 += '' + + item.F_FileName + + ',   '; + }) + 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" },