添加虚拟部门

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs

@@ -172,6 +172,9 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         [Column("F_ORDER")]
         public int? F_Order { get; set; }
+
+        [Column("F_ISVIRTUALIZATION")]
+        public bool? F_IsVirtualization { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml

@@ -22,6 +22,10 @@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">部门性质</div>
         <div id="F_Nature"></div>
+    </div> 
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否虚拟部门</div>
+        <div id="F_IsVirtualization"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">上级部门</div>
@@ -30,16 +34,16 @@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">负责人</div>
         <input id="F_Manager" type="text" class="form-control" />
-    </div>       
+    </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">分管校长</div>
-        <div id="F_SchoolMasterId" ></div>
-        <input type="hidden" id="F_SchoolMaster"/>
+        <div id="F_SchoolMasterId"></div>
+        <input type="hidden" id="F_SchoolMaster" />
     </div>
     @*<div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">公告类别</div>
-        <div id="NoticeCategory" ></div>
-    </div>*@
+            <div class="lr-form-item-title">公告类别</div>
+            <div id="NoticeCategory" ></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">电话号</div>
         <input id="F_OuterPhone" type="text" class="form-control" />

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({

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 '<span class=\"label label-success\" style=\"cursor: pointer;\">是</span>';
+                            } else{
+                                return '<span class=\"label label-default\" style=\"cursor: pointer;\">否</span>';
+                            }
+                        }
+                    },
                     { 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) {

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 = '';