Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/advance_audit.js

@@ -302,17 +302,25 @@ $(document).ready(function () {
     payDate.selectDate(new Date(advance.pay_time));
 
     $('.pay-date-input').datepicker({
+        onShow: function () {
+            $('.pay-date-input').attr('readOnly', true);
+        },
         onHide: function (dp, animationCompleted) {
             if(animationCompleted) {
+                $('.pay-date-input').attr('readOnly', false);
                 const val = $('.pay-date-input').val();
-                if(!val) {
-                    toastr.error('支付时间不能为空');
+                // 日期格式判断
+                if (!(isNaN(val)&&!isNaN(Date.parse(val)))) {
+                    toastr.error('日期格式有误！');
                     $('.pay-date-input').val(moment(advance.pay_time).format('YYYY-MM-DD'));
+                    payDate.selectDate(new Date(advance.pay_time));
                 } else if(val !== moment(advance.pay_time).format('YYYY-MM-DD')) {
                     const data = {
                         pay_time: val
                     };
+                    // console.log(data);
                     update(data);
+                    advance.pay_time = new Date(val);
                 }
             }
         }

app/view/advance/detail.ejs

@@ -42,7 +42,7 @@
                                 <th width="150" class="text-center">支付时间</th>
                                 <td class="text-right" width="405">
                                     <div class="input-group input-group-sm">
-                                        <input data-language="zh" type="text" <%- ctx.session.sessionUser.is_admin ? '' : isEdited ? '' : 'disabled' %> readonly data-date-format="yyyy-MM-dd" placeholder="点击选择时间" class="pay-date-input datepicker-here form-control" value="<%- ctx.helper.dateTran(advance.pay_time, 'YYYY/MM/DD') %>">
+                                        <input data-language="zh" type="text" <%- ctx.session.sessionUser.is_admin ? '' : isEdited ? '' : 'disabled' %> data-date-format="yyyy-MM-dd" placeholder="点击选择时间" class="pay-date-input datepicker-here form-control" value="<%- ctx.helper.dateTran(advance.pay_time, 'YYYY/MM/DD') %>">
                                     </div>
                                 </td>
                             </tr>