From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
index 047507f..f72e818 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
@@ -17,9 +17,7 @@
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '所在省市', field: 'provinceCity', visible: true, align: 'center', valign: 'middle'},
- {title: '所属运营商', field: 'accountName', visible: true, align: 'center', valign: 'middle'},
{title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
- {title: '闸机id', field: 'ids', visible: true, align: 'center', valign: 'middle'},
];
};
@@ -78,8 +76,8 @@
*/
TStoreProvince.search = function () {
var queryData = {};
- queryData['provinceId'] = $("#pCode").val();
- queryData['cityId'] = $("#cCode").val();
+ queryData['provinceId'] = $("#province").val();
+ queryData['cityId'] = $("#city").val();
queryData['operatorId'] = $("#account").val();
queryData['storeName'] = $("#storeName").val();
TStoreProvince.table.refresh({query: queryData});
@@ -90,9 +88,8 @@
* 重置搜索
*/
TStoreProvince.resetSearch = function () {
- $("#pCode").val('')
- $("#cCode").val('')
- $("#account").val('')
+ $("#province").val('')
+ $("#city").val('')
$("#storeName").val('')
TStoreProvince.search();
};
@@ -105,7 +102,7 @@
var ajax = new $ax(Feng.ctxPath + "/tCouponManage/getProvince", function(data){
data.forEach(province => {
var option = document.createElement("option");
- option.value = province.id; // 根据你的数据结构确定省份的id字段
+ option.value = province.code; // 根据你的数据结构确定省份的id字段
option.text = province.name; // 根据你的数据结构确定省份的name字段
provinceSelect.appendChild(option);
});
@@ -125,12 +122,15 @@
var citySelect = document.getElementById("city");
citySelect.innerHTML = "";
- var ajax = new $ax(Feng.ctxPath + "/tCouponManage/getCity", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/tCouponManage/getCity1", function(data){
+
data.forEach(province => {
- var option = document.createElement("option");
- option.value = province.id; // 根据你的数据结构确定省份的id字段
- option.text = province.name; // 根据你的数据结构确定省份的name字段
- citySelect.appendChild(option);
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#city").empty().append(content);
+
});
},function(data){
console.log('data:',data)
--
Gitblit v1.7.1