【修改】宿舍管理；

pirms 2 gadiem · 1ea78941c0
--- a/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
+++ b/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
@@ -45,6 +45,11 @@
            left: 0px;
            width: 206px
        }
        .indSec1T > a {
            width: fit-content;
            padding-left: 6px;
            padding-right: 6px;
        }
    </style>
 </head>
 <body>
@@ -98,7 +103,7 @@
                                <div class="inSec1ImgCon">
                                    <div class="inSec1ImgCon1"><i v-for="count in parseInt(floor.dormitory.Starred>0?floor.dormitory.Starred:0)" class="fa fa-star"></i></div>
                                    <div v-if="floor.dormitory.HasToilet=='1'" class="inSec1ImgCon2"><img src="/Content/images/floor/dorm1-3.png" alt="" /> 独卫</div>
                                    <div v-if="floor.NoStudentNum==0" class="inSec1ImgCon3">满</div>
                                    <div v-if="floor.NoStudentNum==0 && floor.BedNum!=0" class="inSec1ImgCon3">满</div>
                                </div>
                            </div>
                        </div>
--- a/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js
+++ b/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js
@@ -20,12 +20,14 @@ var bootstrap = function ($, learun) {
            $('#Class').lrselect({
                type: 'multiple',// default,tree,treemultiple,gird,multiple
                value: "classno",
                text: "classname"
                text: "classname",
                allowSearch: true
            });

            $('#Major').lrselect({
                value: "majorno",
                text: "majorname",
                allowSearch: true,
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
                param: { code: "CdMajorInfo", strWhere: "DeptNo='" + Dept + "'" },
                select: function (item) {
@@ -51,7 +53,8 @@ var bootstrap = function ($, learun) {
        },
        initData: function () {
            if (!!keyValue) {
                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + keyValue, function (data) {
                var kv = keyValue.split(',')[0];
                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + kv, function (data) {
                    for (var id in data) {
                        if (!!data[id].length && data[id].length > 0) {
                            $('#' + id).jfGridSet('refreshdata', data[id]);
--- a/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js
+++ b/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js
@@ -275,7 +275,7 @@ var bootstrap = function ($, learun) {
                    if (arrDept.some(function (value, index) {
                        return value != arrDept[0];
                    })) {
                        return learun.alert.warning("选中记录包含多种专业的数据，不可批量分配班级！");
                        return learun.alert.warning("选中记录包含多种系的数据，不可批量分配班级！");
                    }
                }
                learun.layerForm({
@@ -312,8 +312,8 @@ var bootstrap = function ($, learun) {
                    id: 'formRoom',
                    title: '分配宿舍--' + Name,
                    url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormRoom?keyValue=' + keyValue + '&Class=' + Class + '&Sex=' + Sex,
                    width: 600,
                    height: 400,
                    width: 800,
                    height: 600,
                    callBack: function (id) {
                        return top[id].acceptClick(refreshGirdData);
                    }
--- a/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml
+++ b/V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml
@@ -36,7 +36,7 @@
                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
                        <a id="lr_out"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;学生出宿</a>
                        <a id="lr_return"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;学生归宿</a>
                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                        @*<a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>*@
                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                    </div>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs
@@ -83,7 +83,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
            {
                string sql = @"select (case t.isreturn when 1 then 1 else 0 end) as isreturn,a.Dept,a.Major,a.class from
 (
 select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0)
 select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) and (IsReturn is not null and len(IsReturn)>0)
 ) t
 join Acc_DormitoryBuild a on a.ID=t.parentid where 1=1 
 ";