From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
index e1c132d..976e611 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
+++ b/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();
+ }
},
});
--
Gitblit v1.9.1