From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js | 350 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 327 insertions(+), 23 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
index 5914920..f60cf1a 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
@@ -14,19 +14,56 @@
TBranchOffice.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '代理商id', field: 'agentId', visible: true, align: 'center', valign: 'middle'},
- {title: '负责人姓名', field: 'principal', visible: true, align: 'center', valign: 'middle'},
- {title: '负责人电话', field: 'principalPhone', visible: true, align: 'center', valign: 'middle'},
- {title: '邮箱', field: 'email', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域省编号', field: 'provinceCode', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域省名称', field: 'provinceName', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域市编号', field: 'cityCode', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域市名称', field: 'cityName', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域区编号', field: 'districtCode', visible: true, align: 'center', valign: 'middle'},
- {title: '代理区域区名称', field: 'districtName', visible: true, align: 'center', valign: 'middle'},
- {title: '状态（1=正常，2=冻结，3=删除）', field: 'status', visible: true, align: 'center', valign: 'middle'},
- {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'}
+ {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理商id', field: 'agentId', visible: false, align: 'center', valign: 'middle'},
+ {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '分公司名称', field: 'branchOfficeName', visible: true, align: 'center', valign: 'middle'},
+ {title: '负责人姓名', field: 'principal', visible: true, align: 'center', valign: 'middle'},
+ {title: '负责人电话', field: 'principalPhone', visible: true, align: 'center', valign: 'middle'},
+ {title: '邮箱', field: 'email', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域省编号', field: 'provinceCode', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域省名称', field: 'provinceName', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域市编号', field: 'cityCode', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域市名称', field: 'cityName', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域区编号', field: 'districtCode', visible: false, align: 'center', valign: 'middle'},
+ {title: '代理区域区名称', field: 'districtName', visible: false, align: 'center', valign: 'middle'},
+
+ {title: '订单数量', field: 'orderCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '有效订单', field: 'effectiveOrderCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '已发放优惠券', field: 'totalCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '已使用优惠券', field: 'usedCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '累计优惠券金额', field: 'orderPriceCount', visible: true, align: 'center', valign: 'middle'},
+
+ {title: '经营业务', field: 'operatingBusiness', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.operatingBusiness === 1){
+ return '<span>司机代驾</span>'
+ }
+ }
+ },
+
+ {title: '司机数', field: 'driverCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.status === 1){
+ return '<span>正常</span>'
+ }else if(row.status === 2){
+ return '<span>冻结</span>'
+ }else if (row.status === 3){
+ return '<span>已删除</span>'
+ }
+ }
+ },
+ {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
+ formatter: function (value, row) {
+ if(row.userType !== 1){
+ return '<a href="#" onclick="TBranchOffice.searchTBranchOfficeDetail('+row.id+')" style="color:blue">详情</a>'
+ }else {
+ return '<a href="#" onclick="TBranchOffice.searchTBranchOfficeDetail('+row.id+')" style="color:blue">详情</a>' +' ' +
+ '<a href="#" onclick="TBranchOffice.delete('+row.id+')" style="color:red">删除</a>'
+ }
+ }
+ }
];
};
@@ -51,7 +88,7 @@
var index = layer.open({
type: 2,
title: '添加',
- area: ['800px', '420px'], //宽高
+ area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tBranchOffice/tBranchOffice_add'
@@ -67,7 +104,7 @@
var index = layer.open({
type: 2,
title: '详情',
- area: ['800px', '420px'], //宽高
+ area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tBranchOffice/tBranchOffice_update/' + TBranchOffice.seItem.id
@@ -75,32 +112,299 @@
this.layerIndex = index;
}
};
+/**
+ * 打开查看详情(使用中)
+ */
+TBranchOffice.searchTBranchOfficeDetail = function (id) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tBranchOffice/tBranchOfficeDetail?tBranchOfficeId=' + id
+ });
+ this.layerIndex = index;
+};
/**
* 删除
*/
-TBranchOffice.delete = function () {
- if (this.check()) {
- var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/delete", function (data) {
- Feng.success("删除成功!");
- TBranchOffice.table.refresh();
+TBranchOffice.delete = function (id) {
+
+ var userType = $('#userType').val()
+ if(userType == 2){
+ Feng.error("无权删除分公司!")
+ return;
+ }
+
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/delete", function (data) {
+ Feng.success("删除成功!");
+ TBranchOffice.table.refresh();
+ }, function (data) {
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("tBranchOfficeId",id);
+ ajax.start();
+};
+
+/**
+ * 提交冻结
+ */
+TBranchOffice.stop = function () {
+ if(this.check()){
+ if(2 == this.seItem.status){
+ Feng.error("该条数据已冻结!");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/stop?id="+this.seItem.id, function (data) {
+ if(500 == data.code){
+ Feng.error(data.message);
+ return;
+ }else {
+ Feng.success("冻结成功!");
+ TBranchOffice.table.refresh();
+ }
}, function (data) {
- Feng.error("删除失败!" + data.responseJSON.message + "!");
+ Feng.error("冻结失败!" + data.message + "!");
});
- ajax.set("tBranchOfficeId",this.seItem.id);
ajax.start();
}
};
+
+/**
+ * 提交启用
+ */
+TBranchOffice.start = function () {
+ if(this.check()){
+ if(1 == this.seItem.status){
+ Feng.error("该条数据已启用!");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/start?id="+this.seItem.id, function (data) {
+ if(500 == data.code){
+ Feng.error(data.message);
+ return;
+ }else {
+ Feng.success("启用成功!");
+ TBranchOffice.table.refresh();
+ }
+ }, function (data) {
+ Feng.error("启用失败!" + data.message + "!");
+ });
+ ajax.start();
+ }
+};
+
+/**
+ * 打开区域选择页面新增
+ */
+TBranchOffice.areaAdd = function () {
+
+ var area = $("#area").val();
+ var areaId = $("#areaId").val();
+
+ var index = layer.open({
+ type: 2,
+ title: '区域选择',
+ area: ['1000px', '270px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tBranchOffice/areaPageAdd?area='+area+'&areaId='+areaId
+ });
+ this.layerIndex = index;
+}
+
+/**
+ * 打开区域选择页面编辑
+ */
+TBranchOffice.areaUpdate = function () {
+
+ var area = $("#area").val();
+ var areaId = $("#areaId").val();
+
+ var index = layer.open({
+ type: 2,
+ title: '区域选择',
+ area: ['1000px', '270px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tBranchOffice/areaPageUpdate?area='+area+'&areaId='+areaId
+ });
+ this.layerIndex = index;
+}
+
+/**
+ * 查询市
+ */
+TBranchOffice.areaCity = function () {
+
+ //监听第一个下拉菜单的变动操作
+ $("#province").change(function(){
+ //当第一级下拉列表没选择值时，将二级下拉列表和三级同时设置为空
+ 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>')//设置初始选项
+ $("#district").empty();//三级联动设为空设为空
+ $("#district").append('<option value="">请选择</option>');
+ var province = document.getElementById('province');
+ var index= province.selectedIndex ;
+ var id = province.options[index].id;
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/areaCity?parentId="+id, function (data) {
+ for(var i=0,n=data.length;i<n;i++){//遍历
+ $("#city").append('<option value="'+data[i].id+'">'+data[i].name+'</option>');//创造元素
+ }
+ }, function (data) {
+ Feng.error("查询失败!" + data.responseJSON.message + "!");
+ });
+ ajax.start();
+ }
+ });
+
+ /*var province = document.getElementById('province');
+ var index= province.selectedIndex ;
+ var id = province.options[index].id;
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/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();*/
+}
+
+/**
+ * 查询区
+ */
+TBranchOffice.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 + "/tBranchOffice/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();
+ }
+ })
+
+ /*var city = document.getElementById('city');
+ var cityIndex= city.selectedIndex ;
+ var id = city.options[cityIndex].value;
+ var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/areaCity?parentId="+id, function (data) {
+ var opts=document.getElementById('district').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();*/
+}
+
+/**
+ * 选择省市
+ */
+TBranchOffice.submitArea = function () {
+ 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)
+ }
+ console.log($("#area").val())
+ console.log($("#areaId").val())
+ TBranchOfficeInfoDlg.close();
+}
/**
* 查询列表
*/
TBranchOffice.search = function () {
var queryData = {};
- queryData['condition'] = $("#condition").val();
+ queryData['branchOfficeName'] = $("#branchOfficeName").val();
+ queryData['principal'] = $("#principal").val();
+ queryData['principalPhone'] = $("#principalPhone").val();
+ queryData['operatingBusiness'] = $("#operatingBusiness").val();
+ queryData['status'] = $("#status").val();
TBranchOffice.table.refresh({query: queryData});
};
+/**
+ * 重置
+ */
+TBranchOffice.resetSearch = function (){
+ $("#branchOfficeName").val('');
+ $("#principal").val('');
+ $("#principalPhone").val('');
+ $("#operatingBusiness").val('');
+ $("#status").val('');
+ TBranchOffice.search();
+}
+
$(function () {
var defaultColunms = TBranchOffice.initColumn();
var table = new BSTable(TBranchOffice.id, "/tBranchOffice/list", defaultColunms);
--
Gitblit v1.7.1