From 3deaf74a4c29f17648a32acbf3ed77d9c532a511 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 9 Mar 2022 14:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=BF=E8=88=8D=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Accommodation/Corridor.cshtml       |  22 +--
 .../Views/Accommodation/Dormitory.cshtml      | 176 ++----------------
 .../Views/Accommodation/Floor.cshtml          |   2 +-
 .../Views/Accommodation/FormClassify.js       |  21 ++-
 .../Views/Accommodation/Index.js              |  15 +-
 .../Views/Accommodation/Room.cshtml           |   4 +-
 .../Views/Accommodation/Unit.cshtml           |  21 ++-
 7 files changed, 63 insertions(+), 198 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml
index 76b48d7ef..a6de56ca7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml	
@@ -58,11 +58,7 @@
                 <div class="indSec1T">
                     <a :href="'/LogisticsManagement/Accommodation/Floor'">{{dormitoryName}}</a><a :href="'/LogisticsManagement/Accommodation/Unit?ID='+dormitoryID">{{unitName}}</a>
                     <ul class="indSec1List">
-                        @*<li><a href="#"><img src="/Content/images/floor/inSec1-5.png" alt="" />多条件查找宿舍楼</a></li>
-                            <li><a href="#"><img src="/Content/images/floor/inSec1-6.png" alt="" />自动分配宿舍</a></li>*@
                         <li><a href="#" @@click="addFloor()"><img src="/Content/images/floor/inSec1-7.png" alt="" />添加楼层</a></li>
-                        @*<li><a href="#"><img src="/Content/images/floor/inSec1-8.png" alt="" />批量删除</a></li>
-                            <li><a href="#"><img src="/Content/images/floor/inSec1-9.png" alt="" />打印宿舍数据</a></li>*@
                     </ul>
                 </div>
                 <div class="inSec1Row">
@@ -76,7 +72,9 @@
                                         <div class="inSec1Con inSec1Con1">
                                             <img class="inSec1Horn" src="/Content/images/floor/inSec1-11.png" alt="" />
                                             <div class="inSec1Con2">
-                                                <div class="inSec1ConT">{{floor.dormitory.Name}} <div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div></div>
+                                                <div class="inSec1ConT">{{floor.dormitory.Name}} 
+                                                    @*<div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div>*@
+                                                    </div>
                                                 <div class="inSec1ConTxt">
                                                     <span>{{floor.RoomNum}}</span>间 <span>{{floor.BedNum}}</span>床
                                                 </div>
@@ -344,7 +342,7 @@
                 },
                 addFloor: function () {
                     var url = "";
-                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.unitID + '&ParentName=' + this.unitName;
+                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.unitID + '&ParentName=' + this.unitName;
                     top.learun.layerForm({
                         id: 'form',
                         title: '新增',
@@ -361,7 +359,7 @@
                     top.learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id,
+                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -393,7 +391,7 @@
                            '<div class="laySec1L">' +
                            '<div class="laySec1ConTitle">' + this.dormitoryName + '&nbsp;&nbsp;' + this.unitName + '</div> ' +
                            '<div class="laySec1ConT">' + floor.dormitory.Name +
-                           this.filter_sex(floor.dormitory.Sex) +
+                           '<span style="display:none">' + this.filter_sex(floor.dormitory.Sex) + '</span>'  +
                             '</div>' +
                             '<div class="laySec1R">' +
                             '<div><div class="laySec1Txt"><span>负&nbsp;责&nbsp;人</span>' + floor.dormitory.Functionary + '</div>  <div class="laySec1Txt"><span>负责人电话</span>' + floor.dormitory.Phone + '</div></div>' +
@@ -403,14 +401,14 @@
                             '</div>' +
                             '<div class="layer_sec layer_sec2">' +
                            '<ul class="laySec2List">' +
-                           '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.Name + '</li>' +
-                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + floor.dormitory.Price + ' <i>元</i></li>' +
+                           '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.DNo + '</li>' +
+                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' <i>元</i></li>' +
                             '<li><span>房&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</span>' + floor.RoomNum + ' <i>间</i></li>' +
                             '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>' + floor.HasStudentNum + ' <i>人</i></li>' +
                            '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>' + floor.NoStudentNum + ' <i>床</i></li>' +
                            '<li><span>床&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>' + floor.BedNum + ' <i>个</i></li>' +
-                            '<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
-                            '<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
+                            //'<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
+                            //'<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
                             '</ul>' +
                             '<div class="laySec2Btn">' +
                             //'<a href="#"><img src="/Content/images/floor/inSec1-1.png" alt="" /></a>' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
index b9a5635ac..b85a292ec 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml	
@@ -62,11 +62,7 @@
                         <div class="crumbsList3"></div>
                     </div>
                     <ul class="indSec1List">
-                        @*<li><a href="#"><img src="/Content/images/floor/inSec1-5.png" alt="" />多条件查找宿舍楼</a></li>
-                            <li><a href="#"><img src="/Content/images/floor/inSec1-6.png" alt="" />自动分配宿舍</a></li>*@
                         <li><a href="#" @@click="addFloor()"><img src="/Content/images/floor/inSec1-7.png" alt="" />添加房间</a></li>
-                        @*<li><a href="#"><img src="/Content/images/floor/inSec1-8.png" alt="" />批量删除</a></li>
-                            <li><a href="#"><img src="/Content/images/floor/inSec1-9.png" alt="" />打印宿舍数据</a></li>*@
                     </ul>
                 </div>
                 <div class="inSec1Row">
@@ -118,155 +114,6 @@
 
     <script>
 
-
-
-        //var data = {
-        //    "rows": [
-        //        {
-        //            "ID": "289fb13a-8e91-4c5d-bd6b-7b7de344dc17",
-        //            "Name": "101室",
-        //            "Functionary": '负责人',
-        //            "Leader": '舍长',
-        //            "BuildType": "宿舍楼-类型",
-        //            "CreateBy": '创建人',
-        //            "CreateTime": '创建时间',
-        //            "UpdateBy": '更新人',
-        //            "UpdateTime": '更新时间',
-        //            "Price": '价格',
-        //            "Remark": '备注说明',
-        //            "Phone": '负责人电话',
-        //            "Address": '地址',
-        //            "Campus": '校区',
-        //            "Dept": '系',
-        //            "Major": '专业',
-        //            "Class": '班级',
-        //            "Sex": "0",//性别
-        //            "StudentID": '学生id',
-        //            "ParentID": "父ID",
-        //            "StuName": 'null'
-        //        }, {
-        //            "ID": "289fb13a-8e91-4c5d-bd6b-7b7de344dc17",
-        //            "Name": "202室",
-        //            "Functionary": '张丽梅',
-        //            "Leader": '舍长',
-        //            "BuildType": "宿舍楼-类型",
-        //            "CreateBy": '薛礼根',
-        //            "CreateTime": '2019-05-14',
-        //            "UpdateBy": '薛礼根',
-        //            "UpdateTime": '2019-05-14',
-        //            "Price": '800~1200',
-        //            "Remark": '备注说明',
-        //            "Phone": '15735806069',
-        //            "Address": '山西省小店区南中环街高新区23号',
-        //            "Campus": '山西省小店区高新校区',
-        //            "Dept": '数学系',
-        //            "Major": '数学与应用数学',
-        //            "Class": '班级',
-        //            "Sex": "0",//性别
-        //            "StudentID": '学生id',
-        //            "ParentID": "父ID",
-        //            "StuName": 'null'
-        //        }
-        //    ],
-        //    "total": 1,
-        //    "page": 1,
-        //    "records": 10
-        //}
-        //var html = '';
-        //$.each(data.rows, function (i, n) {
-        //    var floor = floorName(n.Name, 1);
-        //    html += '<div class="inSec1Col3">' +
-        //        '<div class="inSec1Box">' +
-        //        '<div class="inSec1Top">' +
-        //        '<span><span>' + floor + '</span> 室</span>' +
-        //        '<ul class="inSec1TopList">' +
-        //        '<li>' +
-        //        '<a href="javascript:;"><img src="/Content/images/floor/inSec1-2.png" alt="" /></a>' +
-        //        '<div class="inSec1Con inSec1Con1">' +
-        //        '<img class="inSec1Horn" src="/Content/images/floor/inSec1-11.png" alt="" />' +
-        //        '<div class="inSec1Con2">' +
-        //        '<div class="inSec1ConT"><span>' + floor + '</span>室  <div class="inSec1Sex"><img src="/Content/images/floor/inSec1-10.png" alt="" />女生宿舍</div></div>' +
-        //        '<div class="inSec1ConTxt">' +
-        //        '舍长 <span>' + n.Functionary + '</span> <span>4</span>床' +
-        //        '</div>' +
-        //        '<div class="inSec1ConTxt">' +
-        //        '入住 <span>4</span>人 &nbsp;&nbsp;&nbsp;&nbsp; 空闲<span>0</span>床位' +
-        //        '</div>' +
-        //        '<div class="inSec1Btn" index="' + i + '">查看更多信息  <i class="fa fa-angle-right"></i></div>' +
-        //        '</div>' +
-        //        '</div>' +
-        //        '</li>' +
-        //        '<li><a href="#"><img src="/Content/images/floor/inSec1-1.png" alt="" /></a></li>' +
-        //        '<li><a href="javascript:;"><img src="/Content/images/floor/inSec1-3.png" alt="" /></a></li>' +
-        //        '</ul>' +
-        //        '<div class="clear"></div>' +
-        //        '</div>' +
-        //        '<div class="inSec1Imgs">101</div>' +
-        //        '<div class="inSec1Img">' +
-        //        '<a href="room"><img src="/Content/images/floor/dorm1-1.png" alt="" /></a>' +
-        //        '<div class="inSec1ImgCon">' +
-        //        '<div class="inSec1ImgCon1"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i></div>' +
-        //        '<div class="inSec1ImgCon2"><img src="/Content/images/floor/dorm1-3.png" alt="" /> 独卫</div>' +
-        //        '<div class="inSec1ImgCon3">满</div>' +
-        //        '</div>' +
-        //        '</div></div></div>';
-        //})
-
-        //$('.inSec1Row').html(html).on('click', '.inSec1Btn', function () {
-        //    var ind = $(this).attr('index');
-        //    var datas = data.rows[ind];
-        //    var floor = floorName(datas.Name, 1);
-        //    layer.open({
-        //        type: 1,
-        //        closeBtn: 2,
-        //        area: ['888px', '80%'],
-        //        content: '<div class="layerBox unitLayer dormitoryLayer">' +
-        //            '<div class="layer_sec1 layer_sec">' +
-        //            '<div class="laySec1L">' +
-        //            '<div class="laySec1ConTitle"><span>1</span>号楼&nbsp;&nbsp;<span>1</span>单元&nbsp;&nbsp;<span>1</span>层</div> ' +
-        //            '<div class="laySec1ConT"><span>' + floor + '</span>室 ' +
-        //            '<div class="laySec1Sex"><img src="/Content/images/floor/inSec1-10.png" alt="" />女生宿舍</div></div>' +
-        //            '</div>' +
-        //            '<div class="laySec1R">' +
-        //            '<div><div class="laySec1Txt"><span>负&nbsp;责&nbsp;人</span>' + datas.Functionary + '</div>  <div class="laySec1Txt"><span>负责人电话</span>' + datas.Phone + '</div></div>' +
-        //            '<div class="laySec1Txt"><span>校&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</span>' + datas.Campus + '</div>' +
-        //            '<div class="laySec1Txt"><span>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</span>' + datas.Address + '</div>' +
-        //            '</div>' +
-        //            '</div>' +
-        //            '<div class="layer_sec layer_sec2">' +
-        //            '<ul class="laySec2List">' +
-        //            '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>001</li>' +
-        //            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + datas.Price + ' <i>元</i></li>' +
-        //            '<li><span>舍&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;长</span>' + datas.Leader + '</li>' +
-        //            '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>4 <i>人</i></li>' +
-        //            '<li><span>床&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>4 <i>个</i></li>' +
-        //            '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>0 <i>床</i></li>' +
-        //            '<li><span>涉及院系</span>' + datas.Dept + '</li>' +
-        //            '<li><span>涉及专业</span>' + datas.Major + '</li>' +
-        //            '<li><span>卫生等级</span><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i></li>' +
-        //            '<li><span>卫&nbsp;生&nbsp;间</span>0 <i>床</i></li>' +
-        //            '</ul>' +
-        //            '<div class="laySec2Btn">' +
-        //            '<a href="#"><img src="/Content/images/floor/inSec1-1.png" alt="" /></a>' +
-        //            '<a href="#"><img src="/Content/images/floor/inSec1-3.png" alt="" /></a>' +
-        //            '<a href="#"><img src="/Content/images/floor/inSec1-12.png" alt="" /></a>' +
-        //            '</div>' +
-        //            '</div>' +
-        //            '<div class="layer_sec layer_sec2 layer_sec4">' +
-        //            '<ul class="laySec2List">' +
-        //            '<li><span>创  建 人 </span>' + datas.CreateBy + '</li>' +
-        //            '<li><span>创建时间 </span>' + datas.CreateTime + '</li>' +
-        //            '<li><span>更 新 人</span>' + datas.UpdateBy + ' </li>' +
-        //            '<li><span>更新时间</span>' + datas.UpdateTime + ' </li>' +
-        //            '</ul>' +
-        //            '</div>' +
-        //            '<img class="layerImg" src="/Content/images/floor/dorm1-2.png" alt="" />' +
-        //            '<div class="inSec1Imgs">' + datas.Name + '</div>' +
-        //            '</div>'
-        //    })
-        //})
-
-
               var parentID='@ViewBag.ParentID';
         var vm = new Vue({
             el: "#app",
@@ -302,7 +149,8 @@
                     }.bind(this), 1000);
                 },
                 filter_Dept: function (value) {
-                    var result;
+                    var result = '';
+                    if (!!value) {
                     top.learun.clientdata.getAsync('custmerData', {
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                         key: value,
@@ -310,20 +158,22 @@
                         callback: function (_data) {
                             result = _data.deptname;
                         }
-                    });
+                        });
+                    }
                     return result;
                 },
                 filter_Major: function (value) {
-                    var result;
+                    var result = '';
+                    if (!!value) {
                     top.learun.clientdata.getAsync('custmerData', {
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                         key: value,
-                        keyId: 'id',
+                        keyId: 'majorno',
                         callback: function (_data) {
                             result = _data.majorname;
 
                         }
-                    });
+                    });}
                     return result;
 
                 },
@@ -384,8 +234,8 @@
                         id: 'form',
                         title: '新增',
                         url: url,
-                        width: 600,
-                        height: 400,
+                        width: 900,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(this.laterGetData());
                         }.bind(this)
@@ -397,8 +247,8 @@
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id,
-                        width: 600,
-                        height: 400,
+                        width: 900,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(this.laterGetData());
                         }.bind(this)
@@ -439,7 +289,7 @@
                             '<div class="layer_sec layer_sec2">' +
                             '<ul class="laySec2List">' +
                             '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.Name + '</li>' +
-                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + floor.dormitory.Price + ' <i>元</i></li>' +
+                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' <i>元</i></li>' +
                             '<li><span>舍&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;长</span>' + floor.dormitory.Leader + '</li>' +
                             '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>' + floor.HasStudentNum + ' <i>人</i></li>' +
                             '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>' + floor.NoStudentNum + ' <i>床</i></li>' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
index d76eb7d4e..06d008f5d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
@@ -259,7 +259,7 @@
                             '</div>' +
                             '<div class="layer_sec layer_sec2">' +
                             '<ul class="laySec2List">' +
-                            '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.Name + '</li>' +
+                            '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.DNo + '</li>' +
                             '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' <i>元</i></li>' +
                             '<li><span>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元</span>' + floor.UnitNum + ' <i>个</i></li>' +
                             '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>' + floor.HasStudentNum + ' <i>人</i></li>' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js
index dd54bbc88..878fe4fc5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js	
@@ -6,6 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var ParentID = request('ParentID');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -113,16 +114,18 @@ var bootstrap = function ($, learun) {
         initData: function () {
 
             if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + keyValue, function (data) {
-                    for (var id in data) {
-                        if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + keyValue,
+                    function(data) {
+                        for (var id in data) {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            } else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
                         }
-                        else {
-                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                        }
-                    }
-                });
+                    });
+            } else {
+                $('#ParentID').lrselectSet(ParentID);
             }
         },
         initSelect: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
index 9a5db2317..ff87bf30a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
@@ -382,14 +382,25 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'majorno',
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
                             });
                         }
                     },
-                    { label: "班级", name: "Class", width: 100, align: "left" },
+                    {
+                        label: "班级", name: "Class", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "寝室类型", name: "RoomType", width: 100, align: "left",
                         formatter: function (value, row) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml
index 0a38bd286..3caa5325a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml	
@@ -398,7 +398,7 @@
                 },
                 addFloor: function () {
                     var url = "";
-                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.roomID + '&ParentName=' + this.roomName;
+                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormBed?ParentID=' + this.roomID + '&ParentName=' + this.roomName;
                     top.learun.layerForm({
                         id: 'form',
                         title: '新增',
@@ -415,7 +415,7 @@
                     top.learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id,
+                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormBed?keyValue=' + id,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml
index f398e50a6..3e3925d18 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml	
@@ -76,7 +76,9 @@
                                         <div class="inSec1Con inSec1Con1">
                                             <img class="inSec1Horn" src="/Content/images/floor/inSec1-11.png" alt="" />
                                             <div class="inSec1Con2">
-                                                <div class="inSec1ConT">{{floor.dormitory.Name}} <div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div></div>
+                                                <div class="inSec1ConT">{{floor.dormitory.Name}} 
+                                                    @*<div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div>*@
+                                                    </div>
                                                 <div class="inSec1ConTxt">
                                                     <span>{{floor.floorNum}}</span>层 <span>{{floor.RoomNum}}</span>间 <span>{{floor.BedNum}}</span>床
                                                 </div>
@@ -255,7 +257,7 @@
                 floors: "",
                 sexImgUrl: "/Content/images/floor/inSec1-10.png",
                 dormitoryName: "",
-                dormitoryID:""
+                dormitoryID: ""
             },
             methods: {
                 getData: function () {
@@ -338,7 +340,7 @@
                 },
                 addFloor: function () {
                     var url = "";
-                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.dormitoryID + '&ParentName=' + this.dormitoryName;
+                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.dormitoryID;
                     top.learun.layerForm({
                         id: 'form',
                         title: '新增',
@@ -355,7 +357,7 @@
                     top.learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id,
+                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -385,7 +387,8 @@
                        content: '<div class="layerBox unitLayer">' +
                             '<div class="layer_sec1 layer_sec">' +
                             '<div class="laySec1L">' +
-                            '<div class="laySec1ConT">' + floor.dormitory.Name + this.filter_sex(floor.dormitory.Sex) +
+                           '<div class="laySec1ConT">' + floor.dormitory.Name+
+                           '<span style="display:none">' + this.filter_sex(floor.dormitory.Sex) + '</span>' +
                             '</div>' +
                             '<div class="laySec1R">' +
                             '<div><div class="laySec1Txt"><span>负&nbsp;责&nbsp;人</span>' + floor.dormitory.Functionary + '</div>  <div class="laySec1Txt"><span>负责人电话</span>' + floor.dormitory.Phone + '</div></div>' +
@@ -395,15 +398,15 @@
                             '</div>' +
                             '<div class="layer_sec layer_sec2">' +
                            '<ul class="laySec2List">' +
-                           '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.Name + '</li>' +
-                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + floor.dormitory.Price + ' <i>元</i></li>' +
+                           '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.DNo + '</li>' +
+                           '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' <i>元</i></li>' +
                             '<li><span>楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;层</span>' + floor.floorNum + ' <i>层</i></li>' +
                             '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>' + floor.HasStudentNum + ' <i>人</i></li>' +
                             '<li><span>房&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</span>' + floor.RoomNum + ' <i>间</i></li>' +
                            '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>' + floor.NoStudentNum + ' <i>床</i></li>' +
                            '<li><span>床&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>' + floor.BedNum + ' <i>个</i></li>' +
-                            '<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
-                            '<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
+                            //'<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
+                            //'<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
                             '</ul>' +
                             '<div class="laySec2Btn">' +
                             //'<a href="#"><img src="/Content/images/floor/inSec1-1.png" alt="" /></a>' +