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/role/role.js | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
index c595da2..35bd98e 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
@@ -22,12 +22,15 @@
return "";
}*/
},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: 'ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
{title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
- {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: '包含账户数', field: 'userCount', align: 'center', valign: 'middle', sortable: true},
- {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
+ {title: '所属部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人', field: 'headName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人电话', field: 'headPhone', align: 'center', valign: 'middle', sortable: true},
+ {title: '包含账户数', field: 'userCount',visible: false, align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '别名', field: 'tips', visible: false,align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -122,9 +125,21 @@
Role.search = function () {
var queryData = {};
queryData['roleName'] = $("#roleName").val();
+ queryData['headName'] = $("#headName").val();
+ queryData['headPhone'] = $("#headPhone").val();
Role.table.refresh({query: queryData});
}
+/**
+ * 重置
+ */
+Role.resetSearch = function (){
+ $("#roleName").val('');
+ $("#headName").val('');
+ $("#headPhone").val('');
+ Role.search();
+}
+
$(function () {
var defaultColunms = Role.initColumn();
var table = new BSTable(Role.id, "/role/list", defaultColunms);
--
Gitblit v1.7.1