From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js | 102 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 83 insertions(+), 19 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
index 220a924..8a1b912 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
@@ -22,7 +22,7 @@
{title: '客服电话', field: 'serviceCalls', visible: true, align: 'center', valign: 'middle'},
{title: '订单数量', field: 'orderSum', visible: true, align: 'center', valign: 'middle'},
{title: '有效订单', field: 'validOrder', visible: true, align: 'center', valign: 'middle'},
- {title: '已发放优惠券', field: 'issuedCoupon', visible: true, align: 'center', valign: 'middle'},
+ // {title: '已发放优惠券', field: 'issuedCoupon', visible: true, align: 'center', valign: 'middle'},
{title: '已使用优惠券', field: 'usedCoupon', visible: true, align: 'center', valign: 'middle'},
{title: '累计优惠券金额', field: 'couponPriceSum', visible: true, align: 'center', valign: 'middle'},
{title: '司机充值', field: 'driverRecharge', visible: true, align: 'center', valign: 'middle'},
@@ -157,10 +157,16 @@
if(this.value==""){
$("#city").empty();//二级联动设为空设为空
$("#city").append('<option value="">请选择</option>');
+ // //region
+ // $("#district").empty();//三级联动设为空设为空
+ // $("#district").append('<option value="">请选择</option>');
}
if(this.value!=""){//第一级下拉菜单选择了值
$("#city").empty();//先行置空，防止上次选择留下的元素影响效果
$("#city").append('<option value="">请选择</option>')//设置初始选项
+ //region
+ // $("#district").empty();//三级联动设为空设为空
+ // $("#district").append('<option value="">请选择</option>');
var province = document.getElementById('province');
var index= province.selectedIndex ;
var id = province.options[index].id;
@@ -174,31 +180,48 @@
ajax.start();
}
});
-
- /*var province = document.getElementById('province');
- var index= province.selectedIndex ;
- var id = province.options[index].id;
- var ajax = new $ax(Feng.ctxPath + "/tAgent/areaCity?parentId="+id, function (data) {
- var opts=document.getElementById('city').options;
- opts.length=0;// 这一句是清空原有列表项
- for(var i=0,n=data.length;i<n;i++){
- var data1=data[i];
- var opt=new Option(data1.name,data1.id,true,true);
- opts.add(opt);
- }
- }, function (data) {
- Feng.error("查询失败!" + data.responseJSON.message + "!");
- });
- ajax.start();*/
}
+
+/**
+ * 查询区
+ */
+TAgent.areaDistrict = function () {
+ //监听第二个下拉菜单的变动操作
+ $("#city").change(function(){
+ if(this.value==""){//第二级菜单为空，则将第三级菜单也置为空
+ $("#district").empty();
+ $("#district").append('<option value="">请选择</option>');
+ }
+ if(this.value!=""){//第二级菜单不为空，则将第三级菜单动态生成
+ $("#district").empty();
+ $("#district").append('<option value="">请选择</option>');
+
+ var city = document.getElementById('city');
+ var cityIndex= city.selectedIndex ;
+ var id = city.options[cityIndex].id;
+ if(id == ""){
+ id = city.options[cityIndex].value;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/tAgent/areaCity?parentId="+id, function (data) {
+ for(var i=0,n=data.length;i<n;i++){//对区数据进行遍历，动态生成
+ $("#district").append('<option value="'+data[i].id+'">'+data[i].name+'</option>');
+ }
+ }, function (data) {
+ Feng.error("查询失败!" + data.responseJSON.message + "!");
+ });
+ ajax.start();
+ }
+ })
+}
+
/**
* 选择省市
*/
TAgent.submitArea = function () {
var province = document.getElementById('province');
var provinceIndex= province.selectedIndex ;
- var provinceName = province.options[provinceIndex].value;
- var provinceId = province.options[provinceIndex].id;
+ var provinceId = province.options[provinceIndex].value;
+ var provinceName = province.options[provinceIndex].innerText;
if(provinceName == null || provinceName == ''){
Feng.error("请选择省份!")
@@ -215,9 +238,50 @@
return;
}
+ console.log(provinceName+'/'+cityName)
+ console.log(provinceId+'/'+cityId)
+
parent.$("#area").val(provinceName+'/'+cityName)
parent.$("#areaId").val(provinceId+'/'+cityId)
TAgentInfoDlg.close();
+ // var province = document.getElementById('province');
+ // var provinceIndex= province.selectedIndex ;
+ // var provinceId = province.options[provinceIndex].value;
+ // var provinceName = province.options[provinceIndex].innerText;
+ // console.log(provinceId)
+ // console.log(provinceName)
+ //
+ // if(provinceName == null || provinceName == ''){
+ // Feng.error("请选择省份!")
+ // return;
+ // }
+ //
+ // var city = document.getElementById('city');
+ // var cityIndex= city.selectedIndex ;
+ // var cityId = city.options[cityIndex].value;
+ // var cityName = city.options[cityIndex].innerText;
+ // console.log(cityId)
+ // console.log(cityName)
+ // if(cityName == null || cityName == '' || cityName =='请选择'){
+ // Feng.error("请选择市区!")
+ // return;
+ // }
+ //
+ // var district = document.getElementById('district');
+ // var districtIndex= district.selectedIndex ;
+ // var districtId = district.options[districtIndex].value;
+ // var districtName = district.options[districtIndex].innerText;
+ // console.log(districtId)
+ // console.log(districtName)
+ //
+ // if(districtName == '' || districtName == null || districtName == '请选择'){
+ // parent.$("#area").val(provinceName+'/'+cityName)
+ // parent.$("#areaId").val(provinceId+'/'+cityId)
+ // }else {
+ // parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName)
+ // parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId)
+ // }
+ // TAgentInfoDlg.close();
}
--
Gitblit v1.7.1