From 7467f186ac57f6ca88987c6afb5483c4c5b11bce Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 3 Nov 2022 14:09:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E9=80=89=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Accommodation/Dormitory.cshtml | 7 ++++++- .../LogisticsManagement/Views/Accommodation/FormClass.js | 7 +++++-- .../Views/Accommodation/IndexDistribution.js | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) 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 b85a292ec..2af49c720 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 @@ -45,6 +45,11 @@ left: 0px; width: 206px } + .indSec1T > a { + width: fit-content; + padding-left: 6px; + padding-right: 6px; + } @@ -98,7 +103,7 @@
独卫
-
满
+
满
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js index 4a3fd0578..ab7e16d53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js @@ -19,12 +19,14 @@ var bootstrap = function ($, learun) { $('#Class').lrselect({ 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) { @@ -50,7 +52,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]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js index 5f5a65ac7..94c88de0f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js @@ -271,7 +271,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({ @@ -308,8 +308,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); }