commona model

client/.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://121.36.23.77:8000'
 

client/src/views/system/dict.vue

@@ -58,6 +58,9 @@
           stripe
           highlight-current-row
           max-height="600"
+          row-key="id"
+          default-expand-all
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         >
           <el-table-column type="index" width="50" />
           <el-table-column align="center" label="代号/编号">
@@ -138,6 +141,12 @@
         <el-form-item label="描述" prop="description">
           <el-input type="textarea" v-model="dict.description" placeholder="描述" />
         </el-form-item>
+        <el-form-item label="父级" prop="parent">
+          <treeselect v-model="dict.parent" :multiple="false" :options="dictList" placeholder="父级"/>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dict.sort" :min="1" :max="999"></el-input-number>
+        </el-form-item>
         <el-form-item label="状态" prop="is_deleted">
           <el-radio-group v-model="dict.is_deleted">
     <el-radio :label="false">有效</el-radio>
@@ -182,7 +191,8 @@ const defaultDict = {
   description: '',
   sort: 1,
   type: null,
-  is_deleted: false
+  is_deleted: false,
+  parent:null
 }
 export default {
   components: { Pagination, Treeselect },
@@ -190,6 +200,7 @@ export default {
     return {
       dicttype: Object.assign({}, defaultDictType),
       dict: Object.assign({}, defaultDict),
+      search:'',
       dictList: [],
       listLoading: true,
       listQuery: {
@@ -209,7 +220,7 @@ export default {
       },
       filterDictTypeText: '',
       treeLoding: false,
-      dictTypeData: []
+      dictTypeData: [],
     }
   },
   computed: {},
@@ -236,7 +247,7 @@ export default {
       this.listLoading = true
       getDictList(this.listQuery).then(response => {
           if (response.data) {
-            this.dictList = response.data
+            this.dictList = genTree(response.data)
           this.listLoading = false
           }
       }).catch(error=>{this.listLoading = false})

server/apps/certset/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

server/apps/certset/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CertsetConfig(AppConfig):
+    name = 'certset'

server/apps/certset/models.py

@@ -0,0 +1,21 @@
+from django.db import models
+from apps.system.models import CommonAModel
+# Create your models here.
+
+class Standard(CommonAModel):
+    status_choices = (
+        ('现行', '现行'),
+        ('即将实施', '即将实施'),
+        ('作废', '作废'),
+        ('废止', '废止')
+    )
+    name = models.CharField('标准名称', max_length=1000)
+    code = models.CharField('编号', max_length=30, null=True, blank=True)
+    publish_date = models.DateField('发布日期')
+    implement_date = models.DateField('实施日期')
+    status = models.CharField('状态', max_length=50,
+                             choices=status_choices, default='状态')
+
+    pass
+class ImplementRule(CommonAModel):
+    pass

server/apps/certset/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

server/apps/certset/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

server/apps/system/migrations/0019_auto_20200612_1448.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2020-06-12 06:48
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0018_auto_20200610_1457'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='create_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+    ]

server/apps/system/models.py

@@ -172,9 +172,9 @@ class CommonAModel(SoftModel):
     业务用基本表A,包含create_by, update_by字段
     """
     create_by = models.ForeignKey(
-        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name='create_by')
+        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name= '%(class)s_create_by')
     update_by = models.ForeignKey(
-        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name='update_by')
+        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name= '%(class)s_update_by')
 
     class Meta:
         abstract = True
@@ -184,11 +184,11 @@ class CommonBModel(SoftModel):
     业务用基本表B,包含create_by, update_by, belong_dept字段
     """
     create_by = models.ForeignKey(
-        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name='create_by')
+        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name = '%(class)s_create_by')
     update_by = models.ForeignKey(
-        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name='update_by')
+        User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name = '%(class)s_update_by')
     belong_dept = models.ForeignKey(
-        Organization, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='所属部门', related_name='belong_dept')
+        Organization, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='所属部门', related_name= '%(class)s_belong_dept')
 
     class Meta:
         abstract = True

server/server/settings.py

@@ -43,9 +43,10 @@ INSTALLED_APPS = [
     'rest_framework',
     'corsheaders',
     "django_filters",
+    'simple_history',
     'apps.system',
     'apps.crm',
-    'simple_history'
+    'apps.certset'
 ]
 
 MIDDLEWARE = [