From 813363f0d43eba315999d64c22f6703343ef735e Mon Sep 17 00:00:00 2001
From: wojiaoyishang <lovepikachu@foxmail.com>
Date: Mon, 20 Jan 2025 21:38:08 +0800
Subject: [PATCH] =?UTF-8?q?Update:=20=EF=BC=88=E6=AD=A5=E9=AA=A4=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD=EF=BC=89=E6=9B=B4=E6=96=B0=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/common/script/admin.py |  2 +-
 applications/view/system/dept.py    | 29 ++++++++++++++-----
 templates/system/dept/add.html      | 18 ++++++------
 templates/system/dept/edit.html     | 27 ++++++++++--------
 templates/system/dept/main.html     | 44 +++++++++++++----------------
 templates/system/power/main.html    | 13 ++++-----
 6 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/applications/common/script/admin.py b/applications/common/script/admin.py
index 35c9cff..83ece0c 100644
--- a/applications/common/script/admin.py
+++ b/applications/common/script/admin.py
@@ -301,7 +301,7 @@ powerdata = [
 
     ), Power(
         id=26,
-        name='用户删除',
+        name='权限删除',
         type='2',
         code='system:power:remove',
         url='',
diff --git a/applications/view/system/dept.py b/applications/view/system/dept.py
index 20e4a09..68a324c 100644
--- a/applications/view/system/dept.py
+++ b/applications/view/system/dept.py
@@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, jsonify
 
 from applications.common import curd
 from applications.common.utils import validate
-from applications.common.utils.http import success_api, fail_api
+from applications.common.utils.http import success_api, fail_api, table_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import str_escape
 from applications.extensions import db
@@ -21,11 +21,26 @@ def main():
 @bp.post('/data')
 @authorize("system:dept:main", log=True)
 def data():
-    data = Dept.query.order_by(Dept.sort).all()
-    res = {
-        "data": DeptSchema(many=True).dump(data)
-    }
-    return jsonify(res)
+    dept = Dept.query.order_by(Dept.sort).all()
+    data = DeptSchema(many=True).dump(dept)
+
+    # 创建一个字典，用于存储每个节点的子节点
+    tree = {}
+    for item in data:
+        item["children"] = []
+        tree[item["id"]] = item
+
+    # 构建树形结构
+    root_nodes = []
+    for item in data:
+        parent_id = item["parent_id"] if item["parent_id"] != 0 else None
+        if parent_id is None:
+            root_nodes.append(item)
+        else:
+            if parent_id in tree:
+                tree[parent_id]["children"].append(item)
+
+    return table_api(msg="请求成功", data=root_nodes)
 
 
 @bp.get('/add')
@@ -108,7 +123,7 @@ def dis_enable():
 @authorize("system:dept:edit", log=True)
 def update():
     json = request.get_json(force=True)
-    #id = json.get("deptId"),
+    # id = json.get("deptId"),
     id = str_escape(json.get("deptId"))
     data = {
         "dept_name": validate.str_escape(json.get("deptName")),
diff --git a/templates/system/dept/add.html b/templates/system/dept/add.html
index 6935c35..cdc8e3a 100644
--- a/templates/system/dept/add.html
+++ b/templates/system/dept/add.html
@@ -18,28 +18,28 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="deptName" lay-verify="title" autocomplete="off" placeholder="请输入标题"
+                        <input type="text" name="deptName" lay-verify="required" autocomplete="off" placeholder="请输入公司名称"
                                class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">负责人</label>
                     <div class="layui-input-block">
-                        <input type="text" name="leader" lay-verify="title" autocomplete="off" placeholder="请输入标题"
+                        <input type="text" name="leader" lay-verify="required" autocomplete="off" placeholder="请输入负责人姓名"
                                class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">邮箱</label>
                     <div class="layui-input-block">
-                        <input type="text" name="email" lay-verify="title" autocomplete="off" placeholder="请输入标题"
+                        <input type="text" name="email" lay-verify="required" autocomplete="off" placeholder="请输入邮箱"
                                class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">联系方式</label>
                     <div class="layui-input-block">
-                        <input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入标题"
+                        <input type="text" name="phone" lay-verify="required" autocomplete="off" placeholder="请输入联系方式"
                                class="layui-input">
                     </div>
                 </div>
@@ -52,9 +52,9 @@
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">排序</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="sort" lay-verify="title" autocomplete="off" placeholder="请输入标题"
-                               class="layui-input">
+                    <div class="layui-input-inline" style="width: 100px !important;">
+                        <input type="text" name="sort" value="0" lay-verify="required" autocomplete="off"
+                               placeholder="排序" min="0" step="1" lay-affix="number" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item layui-form-text">
@@ -68,11 +68,11 @@
     </div>
     <div class="bottom">
         <div class="button-container">
-            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="dept-save">
+            <button type="submit" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="dept-save">
                 <i class="layui-icon layui-icon-ok"></i>
                 提交
             </button>
-            <button type="reset" class="pear-btn pear-btn-sm">
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">
                 <i class="layui-icon layui-icon-refresh"></i>
                 重置
             </button>
diff --git a/templates/system/dept/edit.html b/templates/system/dept/edit.html
index d219c21..4bfd682 100644
--- a/templates/system/dept/edit.html
+++ b/templates/system/dept/edit.html
@@ -12,21 +12,21 @@
                 <div class="layui-form-item layui-hide">
                     <label class="layui-form-label">编号</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ dept.id }}" name="deptId" lay-verify="title"
+                        <input type="text" value="{{ dept.id }}" name="deptId" lay-verify="required"
                                autocomplete="off" placeholder="请输入标题" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">名称</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ dept.dept_name }}" name="deptName" lay-verify="title"
+                        <input type="text" value="{{ dept.dept_name }}" name="deptName" lay-verify="required"
                                autocomplete="off" placeholder="请输入标题" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">负责人</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ dept.leader }}" name="leader" lay-verify="title" autocomplete="off"
+                        <input type="text" value="{{ dept.leader }}" name="leader" lay-verify="required" autocomplete="off"
                                placeholder="请输入负责人"
                                class="layui-input">
                     </div>
@@ -34,7 +34,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">邮箱</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ dept.email }}" name="email" lay-verify="title" autocomplete="off"
+                        <input type="text" value="{{ dept.email }}" name="email" lay-verify="required" autocomplete="off"
                                placeholder="请输入邮箱"
                                class="layui-input">
                     </div>
@@ -42,7 +42,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">联系方式</label>
                     <div class="layui-input-block">
-                        <input type="text" value="{{ dept.phone }}" name="phone" lay-verify="title" autocomplete="off"
+                        <input type="text" value="{{ dept.phone }}" name="phone" lay-verify="required" autocomplete="off"
                                placeholder="请输入联系方式"
                                class="layui-input">
                     </div>
@@ -61,17 +61,20 @@
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">排序</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="sort" value="{{ dept.sort }}" lay-verify="title" autocomplete="off"
-                               placeholder="请输入排序"
-                               class="layui-input">
+                    <div class="layui-input-inline" style="width: 100px !important;">
+                        <input type="text" name="sort" value="{{ dept.sort }}" lay-verify="required" autocomplete="off"
+                               placeholder="排序" min="0" step="1" lay-affix="number" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item layui-form-text">
                     <label class="layui-form-label">地址</label>
                     <div class="layui-input-block">
                         <textarea placeholder="请输入详细地址" name="address"
-                                  class="layui-textarea">{{ dept.address }}</textarea>
+                                  class="layui-textarea">
+                            {% if dept.address %}
+                                {{ dept.address }}
+                            {% endif %}
+                        </textarea>
                     </div>
                 </div>
             </div>
@@ -79,12 +82,12 @@
     </div>
     <div class="bottom">
         <div class="button-container">
-            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit=""
+            <button type="submit" class="layui-btn layui-btn-sm" lay-submit=""
                     lay-filter="dept-update">
                 <i class="layui-icon layui-icon-ok"></i>
                 提交
             </button>
-            <button type="reset" class="pear-btn pear-btn-sm">
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">
                 <i class="layui-icon layui-icon-refresh"></i>
                 重置
             </button>
diff --git a/templates/system/dept/main.html b/templates/system/dept/main.html
index 651d856..1c1f164 100644
--- a/templates/system/dept/main.html
+++ b/templates/system/dept/main.html
@@ -7,8 +7,8 @@
 <body class="pear-container">
 <div class="layui-card">
     <div class="layui-card-body">
-        <div class="layui-form-item" style="margin-bottom: unset;">
-            <div class="layui-form-item">
+        <form class="layui-form" action="">
+            <div class="layui-form-item" style="margin-bottom: unset;">
                 <label class="layui-form-label">部门名称</label>
                 <div class="layui-input-inline">
                     <input type="text" name="deptName" placeholder="" class="layui-input">
@@ -34,13 +34,13 @@
 
 <script type="text/html" id="dept-toolbar">
     {% if authorize("system:dept:edit") %}
-        <button class="layui-btn layui-btn-primary layui-btn-md" lay-event="add">
+        <button class="layui-btn layui-btn-primary layui-btn-sm" lay-event="add">
             <i class="layui-icon layui-icon-add-1"></i>
             新增
         </button>
     {% endif %}
     {% if authorize("system:dept:remove") %}
-        <button class="layui-btn layui-btn-md" lay-event="batchRemove">
+        <button class="layui-btn layui-btn-sm" lay-event="batchRemove">
             <i class="layui-icon layui-icon-delete"></i>
             删除
         </button>
@@ -49,13 +49,12 @@
 
 <script type="text/html" id="dept-bar">
     {% if authorize("system:dept:edit") %}
-        <button class="layui-btn layui-btn-primary layui-btn-sm" lay-event="edit"><i
-                class="layui-icon layui-icon-edit"></i>
+        <button class="layui-btn layui-btn-xs" lay-event="edit"><i class="pear-icon pear-icon-edit"> 编辑</i>
         </button>
     {% endif %}
     {% if authorize("system:dept:remove") %}
-        <button class="layui-btn layui-btn-danger layui-btn-sm" lay-event="remove"><i
-                class="layui-icon layui-icon-delete"></i>
+        <button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove"><i
+                class="pear-icon pear-icon-ashbin"> 删除</i>
         </button>
     {% endif %}
 </script>
@@ -71,8 +70,7 @@
 {% include 'system/common/footer.html' %}
 
 <script>
-    layui.use(['table', 'form', 'jquery', 'popup'], function () {
-        let table = layui.table
+    layui.use(['form', 'jquery', 'popup', 'treeTable'], function () {
         let form = layui.form
         let $ = layui.jquery
         let treeTable = layui.treeTable
@@ -82,28 +80,27 @@
 
         window.render = function () {
             treeTable.render({
-                treeColIndex: 1,
-                treeSpid: 0,
-                treeIdName: 'id',
-                treePidName: 'parent_id',
                 skin: 'line',
                 method: 'post',
-                treeDefaultClose: false,
                 toolbar: '#dept-toolbar',
                 elem: '#dept-table',
-                url: '/system/dept/data',
+                url: MODULE_PATH + 'data',
                 page: false,
+                tree: {
+                    customName: {name: 'dept_name'}
+                },
                 cols: [
                     [
-                        {field: 'id', title: 'id'},
-                        {field: 'dept_name', minWidth: 200, title: '部门名称'},
-                        {field: 'leader', title: '负责人'},
+                        {type: 'checkbox', fixed: 'left'},
+                        {field: 'id', width: 100, title: '编号'},
+                        {field: 'dept_name', title: '部门名称', width: 200},
+                        {field: 'leader', title: '负责人', width: 100},
                         {field: 'phone', title: '联系方式'},
                         {field: 'email', title: '邮箱'},
                         {field: 'address', title: '详细地址'},
                         {field: 'status', title: '状态', templet: '#dept-status'},
-                        {field: 'sort', title: '排序', width: 100},
-                        {title: '操作', templet: '#dept-bar', width: 120, align: 'center'}
+                        {field: 'sort', title: '排序', width: 50},
+                        {title: '操作', templet: '#dept-bar', width: 150, align: 'center'}
                     ]
                 ]
             })
@@ -139,7 +136,7 @@
 
         render()
 
-        table.on('tool(dept-table)', function (obj) {
+        treeTable.on('tool(dept-table)', function (obj) {
             if (obj.event === 'remove') {
                 window.remove(obj)
             } else if (obj.event === 'edit') {
@@ -147,7 +144,7 @@
             }
         })
 
-        table.on('toolbar(dept-table)', function (obj) {
+        treeTable.on('toolbar(dept-table)', function (obj) {
             if (obj.event === 'add') {
                 window.add()
             } else if (obj.event === 'refresh') {
@@ -199,7 +196,6 @@
                 title: '修改',
                 shade: 0.1,
                 area: ['450px', '500px'],
-                //content: MODULE_PATH + 'edit?deptId=' + obj.data['deptId']
                 content: MODULE_PATH + 'edit?deptId=' + obj.data['id']
             })
         }
diff --git a/templates/system/power/main.html b/templates/system/power/main.html
index 7d84baa..b8acda3 100644
--- a/templates/system/power/main.html
+++ b/templates/system/power/main.html
@@ -47,11 +47,11 @@
 </script>
 
 <script type="text/html" id="power-bar">
-    {% if authorize("system:role:edit") %}
+    {% if authorize("system:power:edit") %}
         <button class="layui-btn layui-btn-xs" lay-event="edit"><i class="pear-icon pear-icon-edit"> 编辑</i>
         </button>
     {% endif %}
-    {% if authorize("system:role:remove") %}
+    {% if authorize("system:power:remove") %}
         <button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove"><i
                 class="pear-icon pear-icon-ashbin"> 删除</i>
         </button>
@@ -94,19 +94,16 @@
 
         window.render = function () {
             treeTable.render({
-                treeColIndex: 1,
-                treeSpid: 0,
-                treeIdName: 'id',
-                treePidName: 'parent_id',
                 skin: 'line',
                 method: 'post',
                 treeDefaultClose: true,
                 toolbar: '#power-toolbar',
                 elem: '#power-table',
-                url: '/system/power/data',
+                url: MODULE_PATH + 'data',
                 page: false,
                 cols: [
-                    [{type: 'checkbox', fixed: 'left'},
+                    [
+                        {type: 'checkbox', fixed: 'left'},
                         {field: 'id', width: 100, title: '编号'},
                         {field: 'name', title: '权限名称'},
                         {field: 'icon', title: '图标', templet: '#icon'},