refactor(api):分离部分模板页面

applications/view/department/__init__.py

@@ -30,9 +30,9 @@ def data():
 
 @dept_api.resource('/add')
 class AddDepartment(Resource):
-    @authorize("admin:dept:add", log=True)
-    def get(self):
-        return make_response(render_template('department/add.html'))
+    # @authorize("admin:dept:add", log=True)
+    # def get(self):
+    #     return make_response(render_template('department/add.html'))
 
     @authorize("admin:dept:add", log=True)
     def post(self):
@@ -98,7 +98,18 @@ class DeptURD(Resource):
     @authorize("admin:dept:edit", log=True)
     def get(self, dept_id):
         dept = Dept.query.filter_by(id=dept_id).first()
-        return make_response(render_template('department/edit.html', dept=dept))
+        dept_data = {
+            'id': dept.id,
+            'dept_name': dept.dept_name,
+            'leader': dept.leader,
+            'email': dept.email,
+            'phone': dept.phone,
+            'status': dept.status,
+            'sort': dept.sort,
+            'address': dept.address,
+        }
+        # return make_response(render_template('department/edit.html', dept=dept))
+        return jsonify(success=True, msg='ok', dept=dept_data)
 
     @authorize("admin:dept:edit", log=True)
     def put(self, dept_id):

applications/view/rights/right.py

@@ -76,10 +76,10 @@ def batch_remove_view():
 
 @rights_api.resource('/power')
 class AddRight(Resource):
-    @authorize("admin:power:add", log=True)
-    def get(self):
-        """获取增加视图"""
-        return make_response(render_template('rights/add.html'))
+    # @authorize("admin:power:add", log=True)
+    # def get(self):
+    #     """获取增加视图"""
+    #     return make_response(render_template('rights/add.html'))
 
     @authorize("admin:power:add", log=True)
     def post(self):

applications/view/roles/role.py

@@ -53,9 +53,9 @@ def table():
 
 @role_api.resource('/add')
 class AddRole(Resource):
-    @authorize("admin:role:add", log=True)
-    def get(self):
-        return make_response(render_template('roles/add.html'))
+    # @authorize("admin:role:add", log=True)
+    # def get(self):
+    #     return make_response(render_template('roles/add.html'))
 
     @authorize("admin:role:add", log=True)
     def post(self):

applications/view/users/user_view.py

@@ -68,7 +68,7 @@ class CURDUser(Resource):
         return make_response(
             render_template('users/edit_users.html', user=user, roles=roles, checked_roles=checked_roles))
 
-    @authorize("admin:users:remove", log=True)
+    @authorize("admin:user:remove", log=True)
     def delete(self, user_id):
         # 删除用户
         res = _utils.delete_by_id(user_id)
@@ -76,7 +76,7 @@ class CURDUser(Resource):
             return fail_api(msg="删除失败")
         return success_api(msg="删除成功")
 
-    @authorize("admin:users:edit", log=True)
+    @authorize("admin:user:edit", log=True)
     def put(self, user_id):
 
         parser = reqparse.RequestParser()
@@ -157,7 +157,7 @@ def data():
                                                     per_page=res.limit,
                                                     error_out=False)
 
-    dept_name = lambda dept_id: Dept.query.filter_by(id=dept_id).first().dept_name
+    dept_name = lambda dept_id: Dept.query.filter_by(id=dept_id).first().dept_name if dept_id else ""
     user_data = [{
         'id': item.id,
         'username': item.username,