From c4a098e3f88bc5071e36b92b9e5dcceb51129957 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:25:07 +0800
Subject: [PATCH] 同步后台代码
---
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 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 092cc58..603bcfe 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,7 +66,7 @@
}
}},
{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>' +' ' +
@@ -164,8 +164,8 @@
TDriver.stop = function (id) {
var index = layer.open({
type: 2,
- title: '停用',
- area: ['45%', '50%'], //宽高
+ title: '冻结',
+ 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
@@ -192,6 +192,18 @@
* 提交启用冻结
*/
TDriver.updateStatus = function () {
+
+ var status = $("#status").val();
+ console.log(status)
+ if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+ Feng.info("请输入冻结理由!")
+ return;
+ }
+ if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+ Feng.info("请输入解冻理由!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
@@ -221,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
@@ -234,6 +246,18 @@
* 提交充值
*/
TDriver.rechargeBalance = function () {
+ var balance = $('#backgroundBalance').val().trim();
+ var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ if(reg.test(balance)){
+ if(parseInt(balance) <= 0){
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
+ }else{
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
var ajax = new $ax(Feng.ctxPath + "/tDriver/recharge-balance", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
@@ -288,6 +312,12 @@
* 提交审核
*/
TDriver.auditSubmit = function () {
+
+ if($("#approvalStatus").val() == 3 && ($("#approvalNotes").val() == '' || $("#approvalNotes").val() == null)){
+ Feng.info("请输入驳回原因!");
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tDriver/auditSubmit", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
@@ -442,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;
@@ -454,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;
@@ -464,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