From 0a2fcdb4b8fa4fe7242c9557bb13cfc111207c3f Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Thu, 24 Nov 2022 11:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=9A=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81=EF=BC=9B=E5=9B=BE=E4=B9=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=E3=80=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=A0=87=E5=BF=97=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/BookInfo/Form.cshtml                   |  2 +-
 .../Views/BookInfo/Form.js                       |  2 ++
 .../Views/BookInfo/Index.js                      | 16 ++++++++++++++--
 .../Views/TrainEquipmentManage/Form.cshtml       | 10 +++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml
index f0de48bfc..cffdfbf60 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml	
@@ -53,7 +53,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Book_info">
         <div class="lr-form-item-title">审核标志</div>
-        <input id="CheckMark" type="text" class="form-control" />
+        <div id="CheckMark"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_info">
         <div class="lr-form-item-title">备注</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js
index d1f954b1a..4670ce37f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js	
@@ -17,6 +17,8 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $("#BookType").lrDataSourceSelect({ code: 'BookClass', value: 'id', text: 'typename' });
             $("#BookLocation").lrDataSourceSelect({ code: 'BookLocation', value: 'id', text: 'booklocation' });
+            $('#CheckMark').lrDataItemSelect({ code: 'BookStatus' });
+
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js
index ca6d77fbc..6642b2723 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js	
@@ -91,8 +91,20 @@ var bootstrap = function ($, learun) {
                     { label: "书籍作者", name: "Author", width: 100, align: "left" },
                     { label: "书籍出版社", name: "Publisher", width: 100, align: "left" },
                     { label: "书籍编号", name: "BookCode", width: 100, align: "left" },
-                    { label: "出版时间", name: "PublishTime", width: 100, align: "left" },
-                    { label: "入库时间", name: "AddTime", width: 100, align: "left" },
+                    {
+                        label: "出版时间", name: "PublishTime", width: 100, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue!=undefined && cellvalue!="") {
+                                return cellvalue.slice(0, 10);
+                            }
+                        }
+                    },
+                    {
+                        label: "入库时间", name: "AddTime", width: 100, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue != undefined && cellvalue != "") {
+                                return cellvalue.slice(0, 10);
+                            }
+                        }
+                    },
                     { label: "书籍价格", name: "Price", width: 100, align: "left" },
                     { label: "数量", name: "Amount", width: 100, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml
index 7e8bdcf76..a41c6d9fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml	
@@ -21,19 +21,19 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">新增</div>
-        <input id="AddNum" type="text" class="form-control"  />
+        <input id="AddNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">损耗</div>
-        <input id="LossNum" type="text" class="form-control"  />
+        <input id="LossNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">现存</div>
-        <input id="ExistNum" type="text" class="form-control"  />
+        <input id="ExistNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
-        <div class="lr-form-item-title">设备金额</div>
-        <input id="EquipmentMoney" type="text" class="form-control"  />
+        <div class="lr-form-item-title">设备金额<font face="宋体">*</font></div>
+        <input id="EquipmentMoney" type="number" class="form-control"  isvalid="yes" checkexpession="PositiveFloatintZero"  />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js")