From c5cb162b5cbdb589e97290fba3ac3e9241ec48d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 15:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
index d3005f7..1757922 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
@@ -52,12 +52,17 @@
*/
TStoreProvince.search = function () {
var queryData = {};
- queryData['name'] = $("#name").val();
- queryData['type'] = $("#type").val();
- queryData['distributionMethod'] = $("#distributionMethod").val();
- queryData['userPopulation'] = $("#userPopulation").val();
- queryData['status'] = $("#status").val();
- queryData['state'] = $("#state").val();
+
+ var provinceElement = document.getElementById("province");
+ var provinceId = provinceElement.value;
+
+ var cityElement = document.getElementById("city");
+ var cityElementId = cityElement.value;
+
+ queryData['provinceId'] = provinceId;
+ queryData['cityId'] = cityElementId;
+ queryData['cityManagerId'] = $("#userPopulation").val();
+ queryData['storeName'] = $("#storeName").val();
TStoreProvince.table.refresh({query: queryData});
};
@@ -66,12 +71,16 @@
* 重置搜索
*/
TStoreProvince.resetSearch = function () {
- $("#name").val('');
- $("#type").val('');
- $("#distributionMethod").val('');
+ var provinceSelect = document.getElementById("province");
+ provinceSelect.innerHTML = '<option value="">全部</option>';
+
+ var citySelect = document.getElementById("city");
+ citySelect.innerHTML = '<option value="">全部</option>';
+
+ queryProvince();
+
$("#userPopulation").val('');
- $("#status").val('');
- $("#state").val('');
+ $("#storeName").val('');
TStoreProvince.search();
};
@@ -120,7 +129,7 @@
$(function () {
var defaultColunms = TStoreProvince.initColumn();
- var table = new BSTable(TStoreProvince.id, "/tCouponManage/storeList", defaultColunms);
+ var table = new BSTable(TStoreProvince.id, "/tCouponManage/storeDetailsOfSearch", defaultColunms);
table.setPaginationType("client");
TStoreProvince.table = table.init();
--
Gitblit v1.7.1