From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/basSte/basSte.js | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/basSte/basSte.js b/src/main/webapp/static/js/basSte/basSte.js
index 9b621ed..45397a8 100644
--- a/src/main/webapp/static/js/basSte/basSte.js
+++ b/src/main/webapp/static/js/basSte/basSte.js
@@ -26,7 +26,8 @@
,{field: 'steNo', align: 'center',title: '绌挎杞﹀彿'}
,{field: 'inEnable', align: 'center',title: '鍙叆', templet: '#inEnableTpl'}
,{field: 'outEnable', align: 'center',title: '鍙嚭', templet: '#outEnableTpl'}
- ,{field: 'steSts', align: 'center',title: '浣滀笟鎬�'}
+ ,{field: 'pakMk', align: 'center',title: '浣滀笟鏍囪', hide: false}
+ // ,{field: 'steSts', align: 'center',title: '浣滀笟鎬�'}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row', align: 'center',title: '鎺�'}
@@ -37,7 +38,8 @@
,{field: 'hisLev', align: 'center',title: '鍘嗗彶灞�', hide: true}
,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
,{field: 'steErr', align: 'center',title: '閿欒鐮�'}
- ,{field: 'pakMk', align: 'center',title: '鏍囪', hide: true}
+ ,{field: 'chargeLine', align: 'center',title: '鏈�浣庣數閲�%'}
+ ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數', templet: '#autoChargeTpl'}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -100,6 +102,15 @@
let data = tableData[index];
data[this.name] = obj.elem.checked?'Y':'N';
http.post(baseUrl+"/basSte/update/auth", {steNo: data.steNo, outEnable: data[this.name]}, function (res) {
+ layer.msg(res.msg, {icon: 1});
+ })
+ })
+
+ form.on('switch(autoChargeSwitch)', function (obj) {
+ let index = obj.othis.parents('tr').attr("data-index");
+ let data = tableData[index];
+ data[this.name] = obj.elem.checked?'Y':'N';
+ http.post(baseUrl+"/basSte/update/auth", {steNo: data.steNo, autoCharge: data[this.name]}, function (res) {
layer.msg(res.msg, {icon: 1});
})
})
@@ -185,6 +196,12 @@
layDateRender(mData);
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ if (!isEmpty(data.field.idleLoc)) {
+ if (data.field.idleLoc.length !== 7) {
+ layer.msg("鏆傚瓨搴撳瓨涓嶅悎娉�", {icon: 2});
+ return false;
+ }
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/basSte/"+(mData?'update':'add')+"/auth",
--
Gitblit v1.9.1