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/wrkCharge/wrkCharge.js | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/wrkCharge/wrkCharge.js b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
index b1a7613..a0538f1 100644
--- a/src/main/webapp/static/js/wrkCharge/wrkCharge.js
+++ b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
@@ -27,8 +27,8 @@
// ,{field: 'mk', align: 'center',title: '鏍囪'}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
// ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
- ,{field: 'steNo$', align: 'center',title: '绌挎杞�'}
+ ,{field: 'shuttleNo', align: 'center',title: '绌挎杞�'}
+ ,{field: 'charge', align: 'center',title: '鍏呯數妗�'}
// ,{field: 'outMost', align: 'center',title: '宸烽亾鍙�'}
// ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
@@ -139,6 +139,31 @@
})
});
break;
+ case 'clearReset':
+ layer.confirm('纭畾閲嶇疆澶嶄綅浠诲姟鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkCharge/truncate/reset/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ break;
case 'addData':
showEditModel();
break;
@@ -148,7 +173,7 @@
return;
}
del(checkStatus.map(function (d) {
- return d.id;
+ return d.wrkNo;
}));
break;
case 'exportData':
@@ -200,7 +225,7 @@
showEditModel(data);
break;
case "del":
- del([data.id]);
+ del([data.wrkNo]);
break;
}
});
@@ -251,6 +276,7 @@
}, function (i) {
layer.close(i);
var loadIndex = layer.load(2);
+ console.log({ids: ids})
$.ajax({
url: baseUrl+"/wrkCharge/delete/auth",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1