Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml

@@ -3,27 +3,28 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
+    @*<input value="@ViewBag.BuildType"/>*@
     @if (ViewBag.ParentID != null)
     {
         <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">上级</div>
-            <input id="ParentID" type="hidden" value="@ViewBag.ParentID" />
-            <input type="text" class="form-control" value="@ViewBag.ParentName" readonly="readonly" />
+            <input id="ParentID" type="hidden" value="@ViewBag.ParentID"/>
+            <input type="text" class="form-control" value="@ViewBag.ParentName" readonly="readonly"/>
         </div>
 
     }
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">名称</div>
-        <input id="Name" type="text" class="form-control" />
+        <input id="Name" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">编号<font face="宋体">*</font></div>
-        <input id="DNo" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="DNo" type="number" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
 
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">位置</div>
-        <input id="Address" type="text" class="form-control" />
+        <input id="Address" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">类别<font face="宋体">*</font></div>
@@ -35,51 +36,56 @@
         <div id="Campus"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
-        <div class="lr-form-item-title">系</div>
-        <div id="Dept"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
-        <div class="lr-form-item-title">专业</div>
-        <div id="Major"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
-        <div class="lr-form-item-title">班级</div>
-        <div id="Class"></div>
-    </div>*@
+            <div class="lr-form-item-title">系</div>
+            <div id="Dept"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
+            <div class="lr-form-item-title">专业</div>
+            <div id="Major"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
+            <div class="lr-form-item-title">班级</div>
+            <div id="Class"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">负责人</div>
-        <input id="Functionary" type="text" class="form-control" />
+        <input id="Functionary" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">负责人电话</div>
-        <input id="Phone" type="text" class="form-control" />
+        <input id="Phone" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">价格</div>
-        <input id="Price" type="text" class="form-control" />
+        <input id="Price" type="text" class="form-control"/>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
+    @*<div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">顺序</div>
         <input id="sort" type="number" class="form-control"/>
-    </div>
+    </div>*@
 
-    @if (ViewBag.BuildType == "4")
-    {
+    @if (ViewBag.BuildType == "3")
+            {
+        //寝室信息
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">性别</div>
             <div id="Sex"></div>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">舍长</div>
-            <input id="Leader" type="text" class="form-control" />
+            <input id="Leader" type="text" class="form-control"/>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">学生名字</div>
-            <input id="StudentID" type="text" class="form-control" />
+            <input id="StudentID" type="text" class="form-control"/>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
+            <div class="lr-form-item-title">类型</div>
+            <div id="RoomType"></div>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">星级</div>
-            <input id="Starred" type="text" class="form-control" />
+            <input id="Starred" type="text" class="form-control"/>
         </div>
         <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
             <div class="lr-form-item-title">是否独卫</div>
@@ -89,7 +95,7 @@
 
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Accommodation/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js

@@ -25,6 +25,7 @@ var bootstrap = function ($, learun) {
                 code: 'HasToilet',
             })
             $('#BuildType').lrDataItemSelect({ code: 'BuildType' });
+            $('#RoomType').lrDataItemSelect({ code: 'RoomType' });
             //$('#StudentID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' }); 
             //$('#StudentID').lrDataSourceSelect({ code: 'StuInfoTwo', value: 'stuid', text: 'stuname' }); 
             $('#StudentID').lrselect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.cshtml

@@ -21,15 +21,27 @@
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
-                            @*<div class="lr-query-formcontent">
-                                    <div class="col-xs-12 lr-form-item">
-                                        <div class="lr-form-item-title">名称</div>
-                                        <input id="Name" type="text" class="form-control" />
-                                    </div>
-                                    <div class="col-xs-12 lr-form-item">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">名称</div>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">宿舍楼</div>
+                                    <div id="Apartment"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">单元</div>
+                                    <div id="Unit"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">楼层</div>
+                                    <div id="Floor"></div>
+                                </div>
+                                    @*<div class="col-xs-12 lr-form-item">
                                         <div class="lr-form-item-title">类别</div>
                                         <input id="BuildType" type="text" class="form-control" />
-                                    </div>
+                                    </div>*@
                                     <div class="col-xs-12 lr-form-item">
                                         <div class="lr-form-item-title">学校</div>
                                         <input id="School" type="text" class="form-control" />
@@ -50,15 +62,7 @@
                                         <div class="lr-form-item-title">性别</div>
                                         <div id="Sex"></div>
                                     </div>
-                                    <div class="col-xs-12 lr-form-item">
-                                        <div class="lr-form-item-title">负责人</div>
-                                        <input id="Functionary" type="text" class="form-control" />
-                                    </div>
-                                    <div class="col-xs-12 lr-form-item">
-                                        <div class="lr-form-item-title">舍长</div>
-                                        <input id="Leader" type="text" class="form-control" />
-                                    </div>
-                                </div>*@
+                                </div>
                         </div>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js

@@ -192,7 +192,7 @@ var bootstrap = function ($, learun) {
                 nodeClick: function (item) {
                     selectedParent.ID = item.value;
                     selectedParent.Name = item.text;
-
+                    selectedParent.BuildType = item.title;
                     if (item.parent) {
                         if (!item.parent.parentId) {
                             selectedParent.ChildType = "2";
@@ -213,9 +213,12 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            console.log('selectedParent.ChildType', selectedParent.ChildType);
-            if (selectedParent.ChildType == undefined || selectedParent.ChildType === "5") {
-                $('#gridtable').lrAuthorizeJfGridLei({
+            $("#gridtable").empty();
+            $("#gridtable")[0].dfop = undefined;
+           // console.log('selectedParent.BuildType', selectedParent.BuildType);
+            if (selectedParent.BuildType == undefined || selectedParent.BuildType === "3") {
+               // console.log('查询寝室列表');
+                $('#gridtable').jfGrid({
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetPageList',
                     headData: [
                         { label: "名称", name: "Name", width: 100, align: "left" },
@@ -284,6 +287,18 @@ var bootstrap = function ($, learun) {
                             }
                         },
                         { label: "班级", name: "Class", width: 100, align: "left" },
+                        {
+                            label: "寝室类型", name: "RoomType", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem', {
+                                    key: value,
+                                    code: 'RoomType',
+                                    callback: function (_data) {
+                                        callback(_data.text);
+                                    }
+                                });
+                            }
+                        },
                         {
                             label: "性别", name: "Sex", width: 100, align: "left",
                             formatterAsync: function (callback, value, row, op, $cell) {
@@ -307,8 +322,8 @@ var bootstrap = function ($, learun) {
                     //sord: 'ASC',
                 });
             } else {
-                console.log('其余');
-                $('#gridtable').lrAuthorizeJfGridLei({
+                //lrAuthorizeJfGridLei
+                $('#gridtable').jfGrid({
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetPageList',
                     headData: [
                         { label: "名称", name: "Name", width: 100, align: "left" },
@@ -395,7 +410,7 @@ var bootstrap = function ($, learun) {
                     ],
                     mainId: 'ID',
                     isPage: true,
-                    isMultiselect: true,
+                    isMultiselect: true
                     //sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ',
                     //sord: 'ASC',
                 });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs

@@ -24,7 +24,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("DNO")]
         public string DNo { get; set; }
-        
+
         /// <summary>
         /// 名称
         /// </summary>
@@ -166,9 +166,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("PLANBEDNUM")]
         public int? PlanBedNum { get; set; }
+        
+        /// <summary>
+        /// 寝室类型
+        /// </summary>
+        [Column("ROOMTYPE")]
+        public string RoomType { get; set; }
         #endregion
 
         #region 扩展字段
+
         [NotMapped]
         public string ApartmentName { get; set; }
         [NotMapped]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs

@@ -290,7 +290,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                         showcheck = false,
                         checkstate = 0,
                         isexpand = true,
-                        parentId = item.ParentID == null ? "" : item.ParentID
+                        parentId = item.ParentID == null ? "" : item.ParentID,
+                        title = item.BuildType
 
                     };
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -280,7 +280,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
         {
             try
             {
-                var entity = this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryBuildEntity>(a => a.ParentID == parentID);
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryBuildEntity>(a => a.ID == parentID);
                 if (null != entity)
                 {
                     return entity.BuildType;