From 74951023b54f1789d1244fe923219d467487d771 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 26 一月 2026 09:03:42 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/webapp/static/js/user/user.js | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 3de1c43..440901c 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -23,14 +23,15 @@
height: 'full-100',
cols: [[
{type: 'checkbox'}
- ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
+ // ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
// ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
- ,{field: 'username', align: 'center',title: '鐢ㄦ埛鍚�'}
+ ,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
- // ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
+ ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
,{field: 'roleName', align: 'center',title: '瑙掕壊'}
,{field: 'email', align: 'center',title: '閭'}
// ,{field: 'sex$', align: 'center',title: '鎬у埆'}
+ ,{field: 'adLogin$', align: 'center',title: 'AD鐧诲綍', templet: '#adLoginTpl', width: 100, unresize: true}
,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿', hide: true}
,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 120, unresize: true}
@@ -68,18 +69,17 @@
/* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
table.on('toolbar(userTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
if (obj.event === 'add') { // 娣诲姞
showEditModel()
} else if (obj.event === 'del') { // 鍒犻櫎
- var checkRows = table.checkStatus('userTable');
- if (checkRows.data.length === 0) {
+ if (checkStatus.length === 0) {
layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
return;
}
- var ids = checkRows.data.map(function (d) {
+ del(checkStatus.map(function (d) {
return d.id;
- });
- doDelUser({ids: ids});
+ }));
}
});
@@ -89,6 +89,16 @@
var data = tableData[index];
data[this.name] = obj.elem.checked?1:0;
http.post(baseUrl+"/user/edit/auth", {id: data.id, status: data[this.name]}, function (res) {
+ layer.msg(res.msg, {icon: 1});
+ })
+ })
+
+ // 淇敼AD鐧诲綍鐘舵��
+ form.on('switch(adLoginSwitch)', function (obj) {
+ var index = obj.othis.parents('tr').attr("data-index");
+ var data = tableData[index];
+ data[this.name] = obj.elem.checked?1:0;
+ http.post(baseUrl+"/user/edit/auth", {id: data.id, adLogin: data[this.name]}, function (res) {
layer.msg(res.msg, {icon: 1});
})
})
@@ -103,8 +113,7 @@
break;
// 鍒犻櫎
case 'del':
- var ids = [obj.id];
- doDelUser({ids: ids});
+ del([data.id]);
break;
// 閲嶇疆瀵嗙爜
case 'resetPwd':
@@ -134,12 +143,46 @@
content: $('#editDialog').html(),
success: function (layero, dIndex) {
// 鍥炴樉琛ㄥ崟鏁版嵁
- form.val('detail', mData);
+ if (mData) {
+ form.val('detail', mData);
+ // 澶勭悊AD鐧诲綍澶嶉�夋鐨勫洖鏄撅紙缂栬緫鐢ㄦ埛鏃讹級
+ if (mData.adLogin === 1 || mData.adLogin === '1') {
+ $('input[name="adLogin"]').prop('checked', true);
+ } else {
+ $('input[name="adLogin"]').prop('checked', false);
+ }
+ } else {
+ // 鏂板鐢ㄦ埛鏃讹紝纭繚AD鐧诲綍榛樿涓烘湭閫変腑
+ $('input[name="adLogin"]').prop('checked', false);
+ // 娓呯┖琛ㄥ崟
+ form.val('detail', {
+ username: '',
+ mobile: '',
+ email: '',
+ roleId: '',
+ roleName: '',
+ deptId: '',
+ deptName: '',
+ adLogin: 0
+ });
+ }
+ // 閲嶆柊娓叉煋琛ㄥ崟锛岀‘淇濆紑鍏虫帶浠舵纭樉绀�
+ form.render('checkbox');
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(editSubmit)', function (data) {
if (isEmpty(data.field.roleId)) {
layer.msg('璇烽�夋嫨瑙掕壊', {icon: 2});
return false;
+ }
+ if (isEmpty(data.field.deptId)) {
+ layer.msg('璇烽�夋嫨閮ㄩ棬', {icon: 2});
+ return false;
+ }
+ // 澶勭悊AD鐧诲綍澶嶉�夋鐨勫��
+ if (data.field.adLogin === '1' || data.field.adLogin === true) {
+ data.field.adLogin = 1;
+ } else {
+ data.field.adLogin = 0;
}
var loadIndex = layer.load(2);
$.ajax({
@@ -171,7 +214,7 @@
/* 鍒犻櫎璁㈠崟 */
- function doDelUser(obj) {
+ function del(ids) {
layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
skin: 'layui-layer-admin',
shade: .1
@@ -181,7 +224,7 @@
$.ajax({
url: baseUrl+"/user/delete/auth",
headers: {'token': localStorage.getItem('token')},
- data: {ids: obj.ids},
+ data: {ids: ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
--
Gitblit v1.9.1