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 @@
'' +
'
' +
'
' +
- '- 编 号' + floor.dormitory.Name + '
' +
+ '- 编 号' + floor.dormitory.DNo + '
' +
'- 价 格' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' 元
' +
'- 单 元' + floor.UnitNum + ' 个
' +
'- 入 住' + floor.HasStudentNum + ' 人
' +
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 ba8722658..eaa1cef89 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) {