From ef04ce57881e6a338b10d596c5eb76b2220598bf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 八月 2023 11:16:49 +0800
Subject: [PATCH] 更新版本

---
 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index eaaeb26..e431fdc 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -66,14 +66,14 @@
                 }
             }},
             {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
-        {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
+        {title: '操作', visible: true, align: 'center', valign: 'middle',width:'160px',fixed:'true',
             formatter: function (value, row) {
                 if (row.status === 1){
-                    return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;' +
-                        '<a href="#" onclick="TDriver.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +'&nbsp;' +
+                    return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;&nbsp;&nbsp;&nbsp;' +
+                        '<a href="#" onclick="TDriver.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +'&nbsp;&nbsp;&nbsp;&nbsp;' +
                         '<a href="#" onclick="TDriver.updateInfo('+row.id+')" style="color:green">编辑</a>'
                 }else if (row.status === 2 || row.approvalStatus === 2){
-                    return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;' +
+                    return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;&nbsp;&nbsp;&nbsp;' +
                         '<a href="#" onclick="TDriver.start('+row.id+','+row.status+')" style="color:green">解冻</a>'
                 }
             }
@@ -165,7 +165,7 @@
     var index = layer.open({
         type: 2,
         title: '冻结',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -180,7 +180,7 @@
     var index = layer.open({
         type: 2,
         title: '启用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -233,7 +233,7 @@
         var index = layer.open({
             type: 2,
             title: '充值余额',
-            area: ['45%', '20%'], //宽高
+            area: ['800px', '220px'], //宽高
             fix: false, //不固定
             maxmin: true,
             content: Feng.ctxPath + '/tDriver/rechargeBalancePage?id=' + id
@@ -472,9 +472,10 @@
 TDriver.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("请选择省份!")
         return;
@@ -484,7 +485,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;
@@ -494,14 +496,15 @@
     var districtIndex= district.selectedIndex ;
     var districtId = district.options[districtIndex].value;
     var districtName = district.options[districtIndex].innerText;
-
-    if(districtName == null || districtName == '' || districtName =='请选择'){
-        Feng.error("请选择区县!")
-        return;
+    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)
     }
-
-    parent.$("#area").val(provinceName+'/'+cityName+'/'+districtName)
-    parent.$("#areaId").val(provinceId+'/'+cityId+'/'+districtId)
     TDriverInfoDlg.close();
 }
 

--
Gitblit v1.7.1