From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 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 df2ae54..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
@@ -56,8 +56,12 @@
         },
         {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
             formatter: function (value, row) {
-                return '<a href="#" onclick="TBranchOffice.searchTBranchOfficeDetail('+row.id+')" style="color:blue">详情</a>' +'&nbsp;' +
-                    '<a href="#" onclick="TBranchOffice.delete('+row.id+')" style="color:red">删除</a>'
+                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>' +'&nbsp;' +
+                        '<a href="#" onclick="TBranchOffice.delete('+row.id+')" style="color:red">删除</a>'
+                }
             }
         }
     ];
@@ -127,6 +131,13 @@
  * 删除
  */
 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();
@@ -189,13 +200,17 @@
  * 打开区域选择页面新增
  */
 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'
+        content: Feng.ctxPath + '/tBranchOffice/areaPageAdd?area='+area+'&areaId='+areaId
     });
     this.layerIndex = index;
 }
@@ -287,7 +302,10 @@
 
             var city = document.getElementById('city');
             var cityIndex= city.selectedIndex ;
-            var id = city.options[cityIndex].value;
+            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>');
@@ -322,8 +340,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("请选择省份!")
@@ -334,7 +354,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;
@@ -344,6 +365,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)
@@ -352,7 +375,8 @@
         parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName)
         parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId)
     }
-    console.log()
+    console.log($("#area").val())
+    console.log($("#areaId").val())
     TBranchOfficeInfoDlg.close();
 }
 

--
Gitblit v1.7.1