From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 17:39:29 +0800
Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
index 169bc31..8e4fb55 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
@@ -251,7 +251,7 @@
var myForm = MForm.initForm({
invokeUrl : basePath+"/admin/moneyCardUse/bj",
beforeSubmit : function() {
-
+
//校验业绩
var ifAchieveOk=true;
$("#tbody2").children("tr").each(function(){
@@ -270,13 +270,19 @@
layer.msg("业绩金额不能大于支付金额",{icon:2})
return false;
}
-
-
+
+
var money = parseFloat($("#money").val());
var total = parseFloat($("#zkTotal").html());
},
afterSubmit : function() {
- parent.myGrid.serchData();
+ if(parent.myGrid) {
+ parent.myGrid.serchData();
+ }
+
+ if (parent.app) {
+ parent.app.orderQuery();
+ }
},
});
@@ -286,9 +292,9 @@
itemIndex=0;
}
var id=MTools.randomStr();
-
+
var table=$("#"+trId).find("td").eq(3).find("table")
-
+
var achieveIndex=$("#"+trId).find("td").eq(3).find("table").find("tr").length;
var html= '<tr> <td><select class="autoFull select2 input-sm" id="'+id+'" name="items['+itemIndex+'].achaeveList['+achieveIndex+'].beaultId" '
+'data-url="'+basePath+'/admin/getShopStaffByRoleName?roleName=美疗师" data-value="suId" data-filed="suName" data-def=""'
--
Gitblit v1.9.1