From e1583e24d38b49d8e668e7756c5fca772fd6cbc3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 09:33:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 1 +
src/main/webapp/views/user/user.html | 12 +++---------
src/main/webapp/static/js/user/user.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/controller/UserController.java b/src/main/java/com/zy/crm/system/controller/UserController.java
index f1bc4f9..66f3003 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -109,6 +109,7 @@
if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile()))>0) {
return R.error("鎵嬫満鍙峰凡瀛樺湪");
}
+ user.setHostId(getHostId());
user.setStatus(1);
user.setCreateTime(new Date());
userService.insert(user);
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index f58f6ae..dd8e33c 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -3,7 +3,7 @@
var insTb2;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'util', 'admin'], function(){
+}).use(['table','laydate', 'form', 'util', 'admin', 'treeTable', 'xmSelect'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -11,6 +11,26 @@
var form = layui.form;
var admin = layui.admin;
var util = layui.util;
+ var treeTable = layui.treeTable;
+ var xmSelect = layui.xmSelect;
+
+ // 鍟嗗搧鍒嗙被鏁版嵁
+ var insTb = treeTable.render({
+ elem: '#dept',
+ url: baseUrl+'/dept/list/auth',
+ headers: {token: localStorage.getItem('token')},
+ tree: {
+ iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
+ isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
+ idName: 'id', // id瀛楁鍚嶇О
+ pidName: 'parentId' // pid瀛楁鍚嶇О
+ },
+ cols: [],
+ done: function (data) {
+ $('.ew-tree-table-box').css('height', '100%');
+ insTb.expandAll();
+ }
+ });
insTb2 = table.render({
elem: '#userTable',
@@ -137,6 +157,11 @@
form.val('detail', mData);
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(editSubmit)', function (data) {
+ data.field.deptId = insXmSel.getValue('valueStr');
+ if (isEmpty(data.field.deptId)) {
+ layer.msg('閮ㄩ棬涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
if (isEmpty(data.field.roleId)) {
layer.msg('璇烽�夋嫨瑙掕壊', {icon: 2});
return false;
@@ -162,6 +187,26 @@
})
return false;
});
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#deptSel',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData ? [mData.detpId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: true
+ }
+ });
// 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index aab7ffb..e63c849 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -129,15 +129,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鎵�灞炲晢鎴�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input name="hostId" class="layui-input" style="display: none">
- <input id="hostName" name="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨鎵�灞炲晢鎴�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <div id="deptSel" class="ew-xmselect-tree"></div>
</div>
</div>
--
Gitblit v1.9.1