Merge remote-tracking branch 'origin/develop' into develop

@@ -53,7 +53,7 @@
             <div class="panel-body">
             <div class="panel-body">
                 <div class="row cl">
                 <div class="row cl">
                     <div class="form-group col-sm-4 col-md-2">
                     <div class="form-group col-sm-4 col-md-2">
-                        <input type="text" name="loanDate" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
+                        <input type="text" name="loanDate" class="form-control input-text Wdate" value="" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -91,9 +91,10 @@
     <script>
     <script>
         function pass() {
         function pass() {
             var orderId = "<?=$id?>";
             var orderId = "<?=$id?>";
+            var loanDate = $('[name=loanDate]').val();
             $.ajax({
             $.ajax({
                 type: 'put',
                 type: 'put',
-                url: apiBaseUrl + 'flow/confirm/loan/' + orderId + '?loanDate=' + $('[name=loanDate]').val(),
+                url: apiBaseUrl + 'flow/confirm/loan/' + orderId + '?loanDate=' + loanDate,
                 cache: false,
                 cache: false,
                 dataType: 'json',
                 dataType: 'json',
                 contentType: "application/json; charset=UTF-8",
                 contentType: "application/json; charset=UTF-8",