jiaweiqi 3 年之前
父節點
當前提交
0f1ca3be0a

+ 28 - 2
apps/api/admin/department/views.py

@@ -1,16 +1,42 @@
 # coding=utf-8
 
+from django.db import transaction
+
 from utils.permission import IsAdministrator
+from utils import response_error, response_ok
 from utils.custom_modelviewset import CustomModelViewSet
 from apps.staff.models import Department
 from apps.staff.serializers import DepartmentSerializer
 from apps.staff.filters import DepartmentFilter
+from apps.system.models import SysLog
+
 
 class DepartmentViewSet(CustomModelViewSet):
     permission_classes = [IsAdministrator, ]
-    queryset = Department.objects.filter(delete=False)
+    # queryset = Department.objects.filter(delete=False)
+    queryset = Department.objects.filter()
     serializer_class = DepartmentSerializer
 
     def filter_queryset(self, queryset):
         f = DepartmentFilter(self.request.GET, queryset=queryset)
-        return f.qs
+        return f.qs
+
+    def perform_create(self, serializer):
+        super(DepartmentViewSet, self).perform_create(serializer)
+        instance = serializer.instance
+        validated_data = serializer.validated_data
+        SysLog.objects.addnew(self.request.user, SysLog.INSERT, u'添加部门[%s],id=%d' % (instance.name, instance.id), validated_data)
+
+    def destroy(self, request, *args, **kwargs):
+        with transaction.atomic():
+            instance = self.get_object()
+            instance.delete = True
+            instance.save()
+            SysLog.objects.addnew(self.request.user, SysLog.DELETE, u'删除部门[%s],id=%d' % (instance.name, instance.id))
+        return response_ok()
+
+    def perform_update(self, serializer):
+        super(DepartmentViewSet, self).perform_update(serializer)
+        instance = serializer.instance
+        validated_data = serializer.validated_data
+        SysLog.objects.addnew(self.request.user, SysLog.UPDATE, u'修改部门[%s],id=%d' % (instance.name, instance.id), validated_data)

+ 2 - 0
apps/api/admin/urls.py

@@ -9,4 +9,6 @@ urlpatterns = [
     url(r'^token/obtain/$', AdminUserLoginView.as_view()),
     url(r'^token_refresh/$', AdminUserRefreshTokenView.as_view()),
     url(r'^token_verify/$', AdminUserVerifyTokenView.as_view()),
+
+    url(r'^department/', include('apps.api.admin.department.urls')),
 ]

+ 12 - 1
apps/foundation/models.py

@@ -2,16 +2,27 @@
 
 from django.db import models
 
+
 class Subject(models.Model):
+    name = models.CharField(max_length=100, verbose_name=u"名称")
+    notes = models.CharField(max_length=500, verbose_name=u"备注", blank=True, null=True)
+    delete = models.BooleanField(verbose_name=u'删除', default=False)
+
     class Meta:
         db_table = "base_subject"
         ordering = ['-id']
         verbose_name = u"科目章节设置"
         default_permissions = ()
 
+
 class Chapter(models.Model):
+    subject = models.ForeignKey(Subject, verbose_name=u"科目", on_delete=models.PROTECT)
+    name = models.CharField(max_length=100, verbose_name=u"名称")
+    notes = models.CharField(max_length=500, verbose_name=u"备注", blank=True, null=True)
+    delete = models.BooleanField(verbose_name=u'删除', default=False)
+
     class Meta:
         db_table = "base_chapter"
         ordering = ['-id']
         verbose_name = u"章节"
-        default_permissions = ()
+        default_permissions = ()

+ 9 - 1
apps/staff/serializers.py

@@ -94,4 +94,12 @@ class DepartmentSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Department
-        fields = '__all__'
+        fields = '__all__'
+
+    def create(self, validated_data):
+        instance = super(DepartmentSerializer, self).create(validated_data)
+        return instance
+
+    def update(self, instance, validated_data):
+        instance = super(DepartmentSerializer, self).update(instance, validated_data)
+        return instance

+ 104 - 0
uis/admin/department/edit.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>部门信息</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body" pad15>
+        <div class="layui-row layui-col-space15">
+          <div class="layui-col-md12">
+             <form class="layui-form" action="" lay-filter="component-form-element">
+                  <div class="layui-row layui-col-space10 layui-form-item">
+
+                      <div class="layui-col-md12">
+                          <label class="layui-form-label"><font color='red' size="4">*</font>名称:</label>
+                          <div class="layui-input-block">
+                              <input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input">
+                          </div>
+                      </div>
+                      <div class="layui-col-md12">
+                          <label class="layui-form-label">备注:</label>
+                          <div class="layui-input-block">
+                              <input type="text" name="notes" placeholder="" autocomplete="off" class="layui-input">
+                          </div>
+                      </div>
+                      <button id="submit_btn" style="display: none;" class="layui-btn" lay-submit lay-filter="component-form-element"></button>
+
+                  </div>
+              </form>
+          </div>
+        </div>
+        </div>
+    </div>
+</div>
+
+
+  <script src="../../layuiadmin/layui/layui.js"></script>
+  <script>
+  layui.config({
+    base: '../../../layuiadmin/' //静态资源所在路径
+  }).extend({
+    index: 'lib/index' //主入口模块
+  }).use(['index', 'laydate', 'form'], function(){
+    var $ = layui.$
+    ,admin = layui.admin
+    ,element = layui.element
+    ,form = layui.form
+    ,laydate  = layui.laydate;
+    var id = layui.view.getParameterByName('id');
+    var parent_id = layui.view.getParameterByName('parent_id');
+    var is_company = layui.view.getParameterByName('is_company');
+
+    form.render(null, 'component-form-element');
+    element.render('breadcrumb', 'breadcrumb');
+    var url = '';
+    if(is_company && is_company !== '0'){
+        $("#company_no").hide();
+    }
+    if(parent_id){
+        $("#company_no").hide();
+    }
+    if (id){
+        var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
+        form.val("component-form-element", editdata);
+        url = '/account/department/save/?id='+id;
+    }else{
+      url = '/account/department/save/?parent_id='+ parent_id;
+    }
+
+    form.on('submit(component-form-element)', function(data){
+        var submitData = data.field;
+        if((id && is_company === '0') || (!id && !parent_id )){
+            if(!submitData['company_no']){
+                 layer.msg('请输入公司编号!');
+                return false;
+            }
+
+        }
+      admin.req({
+        url: url
+        ,data: JSON.stringify(submitData)
+        ,type: 'post'
+        ,done: function(res){
+            parent.layui.onSubmitChild(res.data);
+        }
+      });
+
+      return false;
+    });
+    parent.layui.submitChild = function () {
+      $("#submit_btn").click();
+    };
+  });
+  </script>
+</body>
+</html>

+ 146 - 82
uis/admin/department/index.html

@@ -2,117 +2,181 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>修改密码</title>
+  <title>部门管理</title>
   <meta name="renderer" content="webkit">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
   <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
   <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-   <style type="text/css">
-        .input {
-            width: 70%;
-            border-radius: 2px;
-            height: 30px;
-            border-width: 1px;
-            border-color: lightgray;
-            border-style: solid;
-            background-color: white;
-            padding-left: 3px;
-            margin-top: 20px;
-        }
-    </style>
 </head>
+<style type="text/css">
+    .LAY-btns .layui-nav {padding-left:0;padding-right:10px;top:-4px;border: 0;background-color: #009688;}
+    .LAY-btns .layui-nav .layui-nav-item{line-height: 30px;}
+    .LAY-btns .layui-nav .layui-nav-child{top:34px;}
+    .LAY-btns .layui-nav .layui-nav-bar{display: none;}
+    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a{color:#333;background-color:#fff;}
+    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {background-color: #f2f2f2;color: #000;}
+  </style>
 <body>
 
   <div class="layui-fluid">
     <div class="layui-card">
         <div class="layui-card-body" pad15>
-            <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-                <div>
-                  <label><font color='red' size="4">*</font>商品提成比例:</label>
-                  <input type="text" name="package_percentage" lay-verify="required|numberGtZ" autocomplete="off" class="input">
-                  <label><font color='red' size="4" style="font-size: small;">佣金=商品优惠价*提成比例</font></label>
-                </div>
-                <div>
-                    <label ><font color='red' size="4">*</font>整车提成比例:</label>
-                    <input type="text" name="vehicle_percentage" lay-verify="required|numberGtZ" autocomplete="off" class="input">
-                    <label><font color='red' style="font-size: small;">佣金=车型定金*提成比例</font></label>
-                </div>
-              <div class="layui-form-item">
-                <div class="layui-input-block">
-                  <button class="layui-btn" lay-submit lay-filter="component-form-element">保存</button>
+        <div class="layui-row layui-col-space15">
+          <div class="layui-col-md12">
+
+            <div class="LAY-btns" style="margin-bottom: 10px;">
+              <button class="layui-nav">
+                <div class="layui-nav-item">
+                  <a href="javascript:;" style="color:#fff;" >添加</a>
+                  <dl class="layui-nav-child"> <!-- 二级菜单 -->
+                    <dd><a href="#" id="btn_add">部门</a></dd>
+                    <dd><a href="#" id="btn_add_child">子部门</a></dd>
+                  </dl>
                 </div>
+              </button>
+            </div>
+
+            <table  id="datagrid" lay-filter="datagrid-operate"></table>
+            <script type="text/html" id="datagrid-operate-bar">
+              <div class="layui-btn-group">
+                <a class="layui-btn layui-btn-xs" lay-event="edit">修改</a>
+                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
               </div>
-              </div>
-            </form>
+            </script>
           </div>
         </div>
-      </div>
-
+        </div>
+    </div>
+  </div>
 
-  <script src="../../layuiadmin/layui/layui.js"></script>
+  <script src="../../layuiadmin/layui/layui.js?t=1"></script>
   <script>
   layui.config({
     base: '../../../layuiadmin/' //静态资源所在路径
   }).extend({
     index: 'lib/index' //主入口模块
-  }).use(['index', 'form', 'utils'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,element = layui.element
-    ,form = layui.form;
-    form.render(null, 'component-form-element');
-    element.render('breadcrumb', 'breadcrumb');
+  }).use(['index', 'table', 'treetable', 'utils'], function(){
+    var $ = layui.$;
+    var layer  = layui.layer ;
+    var table  = layui.table ;
+    var utils  = layui.utils ;
+    var treetable   = layui.treetable  ;
 
-    admin.req({
-        url: '/tenant/config/',
-        done: function (res) {
-            var data = res.data;
-            var edit_data = {};
-            for(var i in data) {
-                if (data[i].property === 'package_percentage'){
-                    edit_data['package_percentage'] = data[i].value;
-                }else if (data[i].property === 'vehicle_percentage') {
-                    edit_data['vehicle_percentage'] = data[i].value;
-                }
+    var renderTable = function () {
+        layer.load(2);
+        treetable.render({
+            treeColIndex: 1,
+            treeSpid: "0",
+            treeIdName: 'id',
+            treePidName: 'parent_id',
+            treeDefaultClose: false,
+            treeLinkage: false,
+            elem: '#datagrid',
+            url: '/admin/department/',
+            page: false,
+            cols: [[
+                {type:'checkbox',width:50},
+                {field: 'name', title: '名称',width:170},
+                {field: 'notes', title: '备注', minWidth:150},
+                {width:100,align:'left', fixed: 'right',templet: '#datagrid-operate-bar'}
+            ]],
+            done: function () {
+               //layui.index.removeNoPermButtons();
+                layer.closeAll('loading');
             }
-            form.val("component-form-element", edit_data);
-            form.render();
-        }
-    });
+        });
+    };
+
+
+    renderTable();
+
+    //监听工具条
+    table.on('tool(datagrid-operate)', function(obj){
+      var data = obj.data;
+        if(obj.event === 'edit'){
+          table.editdata = data;
 
-    form.on('submit(component-form-element)', function(data){
-      var save_data = [];
-      if (data.field['package_percentage']){
-          save_data.push({key: 'package_percentage', value: data.field['package_percentage']})
-      }
-      if (data.field['vehicle_percentage']){
-          save_data.push({key: 'vehicle_percentage', value: data.field['vehicle_percentage']})
-      }
-      admin.req({
-        url: '/tenant/config/'
-        ,data: {data: JSON.stringify(save_data)}
-        ,type: 'post'
-        ,done: function(res){
-            layer.open({
-                 type: 1
-                ,content: '<div style="padding: 20px 100px;">保存成功</div>'
-                ,btn: '关闭'
-                ,btnAlign: 'c' //按钮居中
-                ,shade: 0 //不显示遮罩
-                ,yes: function(){
-                  layer.closeAll();
-                  //admin.exit();
-                }
+          layer.open({
+            type: 2,
+            title: '修改',
+            shadeClose: false,
+            area: ['500px', '300px'],
+            btn: ['保存', '取消'],
+            yes: function(index, dom){
+               layui.onSubmitChild = function (data) {
+              layer.close(index);
+              renderTable();
+            };
+            layui.submitChild();
+            },
+            btn2: function(index, layero){
+              layer.close(index);//关闭当前按钮
+            },
+            content: 'edit.html?id='+data.id + '&is_company=' + data.parent_id
+          });
+        }else if(obj.event === 'del'){
+          layer.confirm('确定要删除吗?', function(index){
+              layer.close(index);
+            layui.admin.req({
+              url: '/account/department/delete/?id='+data.id
+              ,done: function(res){
+                renderTable();
+              }
             });
+          });
         }
-      });
+    });
 
-      return false;
+    $('#btn_add').on('click', function(){
+        layer.open({
+          type: 2,
+          title: '添加',
+          shadeClose: false,
+          area: ['500px', '300px'],
+          btn: ['保存', '取消'],
+          yes: function(index, dom){
+             layui.onSubmitChild = function (data) {
+              layer.close(index);
+              renderTable();
+            };
+            layui.submitChild();
+          },
+          btn2: function(index, layero){
+            layer.close(index);//关闭当前按钮
+          },
+          content: 'edit.html'
+        });
     });
 
+    $('#btn_add_child').on('click', function(){
+        var data = utils.getSelectedRow('datagrid');
+         if(data == false){
+             return;
+         }
+         var parent_id = data.id;
+
+        layer.open({
+          type: 2,
+          title: '添加',
+          shadeClose: false,
+          area: ['500px', '270px'],
+          btn: ['保存', '取消'],
+          yes: function(index, dom){
+              layui.onSubmitChild = function (data) {
+              layer.close(index);
+              renderTable();
+            };
+            layui.submitChild();
+          },
+          btn2: function(index, layero){
+            layer.close(index);//关闭当前按钮
+          },
+          content: 'edit.html?parent_id='+parent_id
+        });
+    });
   });
   </script>
 </body>
-</html>
+</html>
+

+ 7 - 4
uis/admin/index.html

@@ -127,17 +127,20 @@
                 <cite>系统管理</cite>
               </a>
               <dl class="layui-nav-child">
+               <dd data-name="nav">
+                  <a lay-href="department/index.html">科目章节设置</a>
+                </dd>
                 <dd data-name="nav">
-                  <a lay-href="user/index.html">用户管理</a>
+                  <a lay-href="department/index.html">部门管理</a>
                 </dd>
                 <dd data-name="nav">
-                  <a lay-href="tenant/index.html">户管理</a>
+                  <a lay-href="tenant/index.html">户管理</a>
                 </dd>
                 <dd data-name="nav">
-                  <a lay-href="applet/index.html">小程序管理</a>
+                  <a lay-href="applet/index.html">权限管理</a>
                 </dd>
                 <dd data-name="nav">
-                  <a lay-href="third_party/index.html">第三方设置</a>
+                  <a lay-href="third_party/index.html">系统日志</a>
                 </dd>
               </dl>
             </li>