From 5b3e5ab5047d647a06d32da7eefdba7004eec53c Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Tue, 29 Dec 2020 17:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=A1=A8=E5=8D=95=E8=8E=B7=E5=8F=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Controllers/NoticeController.cs | 1 + .../Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml | 2 +- .../Areas/LR_OAModule/Views/Notice/FormFlowView.js | 3 +++ .../Areas/LR_OAModule/Views/Notice/IndexFlow.js | 1 + .../Areas/LR_OAModule/Views/Notice/ViewIndex.js | 1 + .../Learun.Application.Web/XmlConfig/database.config | 8 ++++---- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs index 85721689d..ad7935c92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs @@ -490,6 +490,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers public ActionResult GetFormDataByProcessId(string processId) { NewsEntity OANewsData = noticeIBLL.GetEntityByProcessId(processId); + OANewsData.F_NewsContent=WebHelper.HtmlDecode(OANewsData.F_NewsContent); var jsonData = new { OANews = OANewsData, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml index efbb7051f..bf8306d53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml @@ -43,7 +43,7 @@
公告内容
-
+
@**@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js index 8b193d7b5..b2d67294e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js @@ -66,6 +66,9 @@ var bootstrap = function ($, learun) { } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); + setTimeout(function () { + ue.setContent(data[id].F_NewsContent); + }, 100); } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js index 30630a9c9..f729446e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js @@ -137,6 +137,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/LR_OAModule/Notice/GetPageList', headData: [ { label: '公告标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' }, + { label: '发布人员', name: 'F_CreateUserName', index: 'F_CreateUserName', width: 100, align: 'left' }, { label: '公告类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' }, { label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js index 849a56450..8c3146061 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js @@ -45,6 +45,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/LR_OAModule/Notice/GetListOfSelfJY', headData: [ { label: '公告标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' }, + { label: '发布人员', name: 'F_CreateUserName', index: 'F_CreateUserName', width: 100, align: 'left' }, { label: '公告类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' }, { label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 489b3b61f..5d293d24b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -16,17 +16,17 @@ - + - +