优化宿舍卫生管理

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Form.cshtml

@@ -3,21 +3,21 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div style="visibility:hidden" class="col-xs-12 lr-form-item" data-table="Acc_Sanitation">
+    <div style="display: none;" class="col-xs-12 lr-form-item" data-table="Acc_Sanitation">
         <div class="lr-form-item-title">宿舍</div>
-        <input id="RoomID" value="@ViewBag.RoomID" type="hidden" class="form-control" />
+        <input id="RoomID" value="@ViewBag.RoomID" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Sanitation">
         <div class="lr-form-item-title">分数<font face="宋体">*</font></div>
         @*<div id="Grade" isvalid="yes" checkexpession="NotNull"></div>*@
-        <input id="Grade" type="text" class="from-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Sanitation">
         <div class="lr-form-item-title">检查者</div>
         <input id="GradedUser" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Acc_Sanitation">
-        <div class="lr-form-item-title">日期框<font face="宋体">*</font></div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Sanitation">
+        <div class="lr-form-item-title">日期<font face="宋体">*</font></div>
         <input id="GradedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GradedTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_Sanitation">

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',

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);
                 }