From af94285ab205935fc7e6eaf777030495e1f4283c Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 3 Nov 2022 10:44:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9D=A5=E6=BA=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Views/Notice/Index.js | 14 +++++++++++++- .../Areas/LR_OAModule/Views/Notice/IndexRecycle.js | 14 +++++++++++++- .../Areas/LR_OAModule/Views/Notice/ViewIndex.js | 14 +++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Index.js index 8f1430fc0..8e05abaec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Index.js @@ -89,7 +89,19 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm'); } }, - { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' }, + { + label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name'] || value); + } + }); + } + }, { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' }, { label: "发布状态", name: "F_EnabledMark", index: "F_EnabledMark", width: 80, align: "center", autowidth: false, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexRecycle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexRecycle.js index 6c69bb4ed..0c5eb41f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexRecycle.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexRecycle.js @@ -50,7 +50,19 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm'); } }, - { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' }, + { + label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name'] || value); + } + }); + } + }, { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' }, { label: "发布状态", name: "F_EnabledMark", index: "F_EnabledMark", width: 80, align: "center", autowidth: false, 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 6faf8ccf6..6e3214bb5 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 @@ -53,7 +53,19 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm'); } }, - { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' }, + { + label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name'] || value); + } + }); + } + }, { label: "阅读状态", name: "RNewsId", index: "RNewsId", width: 80, align: "center", autowidth: false, formatter: function (cellvalue) { From a352fd4c236223f046a2d2f30a4df721056e5493 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 3 Nov 2022 12:19:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?app=E6=B5=81=E7=A8=8B=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=8C=87=E5=AE=9A=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/EmpInfo/Index.cshtml | 3 --- .../LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 9b7c44850..21ce58e2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -93,9 +93,6 @@  修改部门、系部  打印 -
-  导入 -
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue index 599dcc739..27a5aa433 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue @@ -231,8 +231,10 @@ export default { } }) this.submitPostData = postData - this.modal = true - return + if(this.reviewerList.length>1){ + this.modal = true + return + } } const success = await this.HTTP_POST(