-
日期框*
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
index e11954e18..78e626b42 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
@@ -21,6 +21,8 @@ var bootstrap = function ($, learun) {
selectedParent.ID = item.value;
selectedParent.hasChildren = item.hasChildren;
selectedParent.textName = item.text;
+ selectedParent.BuildType = item.title;
+ console.log('selectedParent.BuildType', selectedParent.BuildType);
page.search({ RoomID: item.value });
}
});
@@ -30,8 +32,8 @@ var bootstrap = function ($, learun) {
});
// 新增
$('#lr_add').on('click', function () {
- if (selectedParent.hasChildren || selectedParent.textName.indexOf("室") == -1) {
- learun.alert.warning('请选择宿舍评分');
+ if (selectedParent.BuildType != '4') {
+ learun.alert.warning('请选择宿舍!');
return;
}
learun.layerForm({
@@ -86,7 +88,12 @@ var bootstrap = function ($, learun) {
headData: [
{ label: "分数", name: "Grade", width: 100, align: "left" },
{ label: "检查者", name: "GradedUser", width: 100, align: "left" },
- { label: "日期框", name: "GradedTime", width: 100, align: "left" },
+ {
+ label: "日期框", name: "GradedTime", width: 100, align: "left",
+ formatter: function(value, row) {
+ return learun.formatDate(value, 'yyyy-MM-dd');
+ }
+ },
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'ID',
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Sanitation/SanitationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Sanitation/SanitationBLL.cs
index 0607c7858..d76ca24eb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Sanitation/SanitationBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Sanitation/SanitationBLL.cs
@@ -86,7 +86,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
showcheck = false,
checkstate = 0,
isexpand = false,
- parentId = item.ParentID == null ? "" : item.ParentID
+ parentId = item.ParentID == null ? "" : item.ParentID,
+ title = item.BuildType,
};
treeList.Add(node);
}