From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
index dfeb8aa..ba3b551 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
@@ -128,7 +128,7 @@
     var index = layer.open({
         type: 2,
         title: '停用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
@@ -143,7 +143,7 @@
     var index = layer.open({
         type: 2,
         title: '启用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
@@ -155,6 +155,17 @@
  * 提交启用冻结
  */
 TDriverException.updateStatus = function () {
+
+    var status = $("#status").val();
+    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.closeException();

--
Gitblit v1.7.1