From 0f5bc5442b61b65ec701db2c6f450ec26459630e Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Thu, 10 Mar 2022 17:45:35 +0800
Subject: [PATCH] =?UTF-8?q?lr=5Fform=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=BB=A1?=
 =?UTF-8?q?=E8=B6=B3=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/BookBorrow/Form.cshtml    | 4 ++--
 .../Learun.Application.Web/Views/LR_Content/script/lr-form.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml
index 3e29bd32d..aa8883f02 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml	
@@ -5,11 +5,11 @@
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="Book_borrowinfo">
         <div class="lr-form-item-title">借书时间</div>
-        <input id="BorrowTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#BorrowTime').trigger('change'); } })" />
+        <input id="BorrowTime" type="text" class="form-control lr-input-wdatepicker" data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#BorrowTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Book_borrowinfo">
         <div class="lr-form-item-title">还书时间</div>
-        <input id="ReturnTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ReturnTime').trigger('change'); } })" />
+        <input id="ReturnTime" type="text" class="form-control lr-input-wdatepicker" data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ReturnTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="Book_borrowinfo" >
         <div class="lr-form-item-title">借书证</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js
index 992c57d25..8a5b5bb55 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js	
@@ -130,7 +130,7 @@
                         break;
                     case "datepicker":
                         var _dateFmt = $obj.attr('data-dateFmt') || 'yyyy-MM-dd';
-                        $obj.val(learun.formatDate(value, _dateFmt));
+                        $obj.val(learun.formatDate(value, _dateFmt.replace('HH','hh')));
                         break;
                     case "lr-Uploader":
                         $obj.lrUploaderSet(value);