更新部门管理负责人

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

@@ -22,10 +22,6 @@
     <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>
@@ -33,17 +29,17 @@
     </div>
     <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 id="F_Manager"></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="col-xs-6 lr-form-item">
-            <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,8 +21,6 @@ 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({
@@ -39,8 +37,15 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            //部门负责人
+            $("#F_Manager").lrformselect({
+                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+                layerUrlW: 400,
+                layerUrlH: 300,
+                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            });
 
-            //$('#NoticeCategory').lrDataItemSelect({ code: 'NoticeCategory', type: 'multiple', allowSearch:true }); 
+            $('#NoticeCategory').lrDataItemSelect({ code: 'NoticeCategory', type: 'multiple', allowSearch:true }); 
         },
         initData: function () {
             if (!!selectedRow) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js

@@ -61,6 +61,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_DepartmentId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_OrganizationModule/Department/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 公告发布权限设置
             $('#lr_permission').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('F_DepartmentId');
@@ -77,22 +90,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-
-
-
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('F_DepartmentId');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/LR_OrganizationModule/Department/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
         },
         inittree: function () {
             $('#companyTree').lrtree({
@@ -116,37 +113,31 @@ var bootstrap = function ($, learun) {
                     { 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",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
                         }
                     },
-                    { label: "负责人", name: "F_Manager", width: 100, align: "left" },
+                    { label: "分管校长", name: "F_SchoolMaster", width: 100, align: "left" },
                     {
-                        label: "分管校长", name: "F_SchoolMasterId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                        label: "公告类别", name: "NoticeCategory", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getsAsync('dataItem', {
                                 key: value,
+                                code: 'NoticeCategory',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data);
                                 }
                             });
                         }
                     },
-                    //{
-                    //    label: "公告类别", name: "NoticeCategory", width: 200, align: "left" ,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getsAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'NoticeCategory',
-                    //            callback: function (_data) {
-                    //                callback(_data);
-                    //            }
-                    //        });
-                    //    }
-                    //},
                     { label: "电话号", name: "F_OuterPhone", width: 100, align: "left" },
                     { label: "分机号", name: "F_InnerPhone", width: 60, align: "center" },
                     { label: "排序", name: "F_Order", width: 60, align: "center" },