From 16cee07f274c039bf0dcb5da347859053b7c2586 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
index d777a1b..53d9e8b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
@@ -214,6 +214,7 @@
queryData['userName'] = $("#userName").val();
queryData['orderNum'] = $("#orderNum").val();
queryData['driverId'] = $("#driverId").val();
+ queryData['activityId'] = $("#activityId").val();
TAbnormalOrder.table.refresh({query: queryData});
};
@@ -225,6 +226,7 @@
let userName = $('#userName').val();
let orderNum = $('#orderNum').val();
let driverId = $('#driverId').val();
+ let activityId = $('#activityId').val();
if(null != insertTime && '' != insertTime){
p += "insertTime=" + insertTime + "&";
}
@@ -242,6 +244,9 @@
}
if(null != driverId && '' != driverId){
p += "driverId=" + driverId + "&" ;
+ }
+ if(null != activityId && '' != activityId){
+ p += "activityId=" + activityId + "&" ;
}
if('' != p){
p = "?" + p.substring(0, p.length - 1);
@@ -265,7 +270,7 @@
$(function () {
var defaultColunms = TAbnormalOrder.initColumn();
- var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val(), defaultColunms);
+ var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val()+"&activityId="+$('#activityId').val(), defaultColunms);
table.setPaginationType("server");
TAbnormalOrder.table = table.init();
});
--
Gitblit v1.7.1