Merge branch 'api_score_meger'

935090232@qq.com

2022-02-20 c253b555c7905c5136d47cd615ef545fa50cc6ad

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html

@@ -55,11 +55,11 @@
   
   <div class="form-group">
       
         <label class="col-sm-2 control-label">订单时间</label>
         <label class="col-sm-2 control-label">收款时间</label>
         <div class="col-sm-4">
            <input autocomplete="off"   name="orderTime" type="text"
            <input autocomplete="off"   name="payTime" type="text"
               class="form-control  datetimepicker"
                  th:value="${#dates.format(order.orderTime, 'yyyy-MM-dd hh:mm')}" />
                  th:value="${#dates.format(order.payTime, 'yyyy-MM-dd hh:mm')}" />
         </div>
   </div>
<br>
@@ -83,7 +83,13 @@
   var myForm = MForm.initForm({
      invokeUrl : basePath+"/admin/order/updateOrderTime",
      afterSubmit : function(loj) {
         _p.myGrid.serchData();
         if(_p.myGrid) {
            _p.myGrid.serchData();
         }

         if (_p.app) {
            _p.app.orderQuery();
         }

      },
   });