From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码
---
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 c4054ab..5b0d8b6 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
@@ -56,12 +56,7 @@
},
{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>'
- }
+ return '<a href="#" onclick="TBranchOffice.searchTBranchOfficeDetail('+row.id+')" style="color:blue">详情</a>'
}
}
];
@@ -340,8 +335,10 @@
TBranchOffice.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;
+ console.log(provinceId)
+ console.log(provinceName)
if(provinceName == null || provinceName == ''){
Feng.error("请选择省份!")
@@ -352,7 +349,8 @@
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;
@@ -362,6 +360,8 @@
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)
@@ -370,6 +370,8 @@
parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName)
parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId)
}
+ console.log($("#area").val())
+ console.log($("#areaId").val())
TBranchOfficeInfoDlg.close();
}
--
Gitblit v1.7.1