From 09d72c7b4821cda0c9e49d643b04eb2561424f81 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 29 Apr 2021 16:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Department/DepartmentEntity.cs | 3 +++ .../Views/Department/Form.cshtml | 16 ++++++++++------ .../Views/Department/Form.js | 2 ++ .../Views/Department/Index.js | 12 +++++++++++- .../MP_PerformanceTracking/IndexManagement.js | 7 +++---- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs index 5aba87495..07dc70fe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs @@ -172,6 +172,9 @@ namespace Learun.Application.Organization /// [Column("F_ORDER")] public int? F_Order { get; set; } + + [Column("F_ISVIRTUALIZATION")] + public bool? F_IsVirtualization { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml index 2a2881c1e..3309d0b52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml @@ -22,6 +22,10 @@
部门性质
+
+
+
是否虚拟部门
+
上级部门
@@ -30,16 +34,16 @@
负责人
-
+
分管校长
-
- +
+
@*
-
公告类别
-
-
*@ +
公告类别
+
+ *@
电话号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js index 6db751a57..893d0e625 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js @@ -21,6 +21,8 @@ var bootstrap = function ($, learun) { bind: function () { // 部门性质 $('#F_Nature').lrDataItemSelect({ code: 'DepartmentNature', maxHeight: 230 }); + $('#F_IsVirtualization').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#F_IsVirtualization').lrselectSet(false); // 上级部门 $('#F_ParentId').lrDepartmentSelect({ companyId: companyId, maxHeight: 160 }); $("#F_SchoolMasterId").lrformselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js index 8cdcd2e9a..29741f684 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js @@ -115,6 +115,15 @@ var bootstrap = function ($, learun) { { label: "部门编号", name: "F_EnCode", width: 100, align: "left" }, { label: "部门简称", name: "F_ShortName", width: 100, align: "left" }, { label: "部门性质", name: "F_Nature", width: 100, align: "left" }, + { + label: "是否虚拟部门", name: "F_IsVirtualization", width: 100, align: "left", formatter: function (cellvalue) { + if (cellvalue) { + return '是'; + } else{ + return '否'; + } + } + }, { label: "负责人", name: "F_Manager", width: 100, align: "left" }, { label: "分管校长", name: "F_SchoolMasterId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -124,7 +133,8 @@ var bootstrap = function ($, learun) { callback(_data.name); } }); - }}, + } + }, //{ // label: "公告类别", name: "NoticeCategory", width: 200, align: "left" , // formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index cb221f741..440d2ff88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js @@ -184,7 +184,7 @@ var bootstrap = function ($, learun) { label: "月份", name: "MPMonth", width: 100, align: "left" }, { - label: "部门", name: "MPDepartment", width: 250, align: "left", + label: "部门", name: "MPDepartment", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) { console.log(res); @@ -195,7 +195,7 @@ var bootstrap = function ($, learun) { } }, { - label: "接收人", name: "MPReceiveUser", width: 250, align: "left", + label: "接收人", name: "MPReceiveUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) { if (res.code == learun.httpCode.success) { @@ -204,7 +204,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "名称", name: "MPProjectName", width: 100, align: "left" }, + { label: "名称", name: "MPProjectName", width: 200, align: "left" }, { label: "上传文件", name: "MPFileTwo", @@ -216,7 +216,6 @@ var bootstrap = function ($, learun) { data: { folderId: value }, type: 'GET', dataType: "json", - async: false, cache: false, success: function (res) { var bb = '';