diff --git a/client/src/api/ability.js b/client/src/api/ability.js
new file mode 100644
index 0000000..13becc6
--- /dev/null
+++ b/client/src/api/ability.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getUserDetailList(query) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createUserDetail(data) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateUserDetail(id, data) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteUserDetail(id) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/client/src/api/education.js b/client/src/api/education.js
new file mode 100644
index 0000000..13becc6
--- /dev/null
+++ b/client/src/api/education.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getUserDetailList(query) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createUserDetail(data) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateUserDetail(id, data) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteUserDetail(id) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/client/src/api/qualification.js b/client/src/api/qualification.js
new file mode 100644
index 0000000..13becc6
--- /dev/null
+++ b/client/src/api/qualification.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getUserDetailList(query) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createUserDetail(data) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateUserDetail(id, data) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteUserDetail(id) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/client/src/api/train.js b/client/src/api/train.js
new file mode 100644
index 0000000..13becc6
--- /dev/null
+++ b/client/src/api/train.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getUserDetailList(query) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createUserDetail(data) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateUserDetail(id, data) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteUserDetail(id) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/client/src/api/userdetail.js b/client/src/api/userdetail.js
new file mode 100644
index 0000000..13becc6
--- /dev/null
+++ b/client/src/api/userdetail.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getUserDetailList(query) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createUserDetail(data) {
+  return request({
+    url: '/employee/userdetail/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateUserDetail(id, data) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteUserDetail(id) {
+  return request({
+    url: `/employee/userdetail/${id}/`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/client/src/main.js b/client/src/main.js
index c404257..1565358 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -14,6 +14,8 @@ import router from './router'
 
 import '@/icons' // icon
 import '@/permission' // permission control
+// import Treeselect from '@riophae/vue-treeselect'
+
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 3d29026..f67e1c5 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -127,6 +127,27 @@ export const asyncRoutes = [
       },
     ]
   },
+  {
+    path: '/employee',
+    component: Layout,
+    redirect: '/employee/userdetail',
+    name: 'Employee',
+    meta: { title: '人员管理', icon: 'example'},
+    children: [
+      {
+        path: 'userdetail',
+        name: 'UserDetail',
+        component: () => import('@/views/employee/userdetail'),
+        meta: { title: '人员信息', icon: 'example', perms: ['userdetail_manage'] }
+      },
+      {
+        path: 'qualification',
+        name: 'Qualification',
+        component: () => import('@/views/employee/qualification'),
+        meta: { title: '注册资格', icon: 'example', perms: ['qualification_manage'] }
+      },
+    ]
+  },
   {
     path: '/system',
     component: Layout,
diff --git a/client/src/views/employee/qualification.vue b/client/src/views/employee/qualification.vue
new file mode 100644
index 0000000..cf5e3a0
--- /dev/null
+++ b/client/src/views/employee/qualification.vue
@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+        <div style="display:flex">
+          <treeselect v-model="listQuery.cert_field" :multiple="false" :options="typeOptions" placeholder="认证类型" @input="handleFilter" style="width: 260px" clearable/>
+          <!-- <el-select
+            v-model="listQuery.cert_field"
+            placeholder="认证类型"
+            clearable
+            style="width: 200px"
+            class="filter-item"
+            @change="handleFilter"
+          >
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.key"
+              :label="item.display_name"
+              :value="item.key"
+            />
+          </el-select> -->
+          <el-input
+            v-model="listQuery.search"
+            placeholder="规则名称/编号"
+            style="width: 300px;"
+            class="filter-item"
+            @keyup.enter.native="handleFilter"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter"
+          >搜索</el-button>
+          <el-button
+            class="filter-item"
+            style="margin-left: 10px;"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter"
+          >刷新重置</el-button>
+        </div>
+        <div style="margin-top:6px">
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+        </div>
+        <el-table
+          v-loading="listLoading"
+          :data="ruleList.results"
+          style="width: 100%;margin-top:10px;"
+          border
+          fit
+          stripe
+          highlight-current-row
+          max-height="600"
+        >
+          <el-table-column type="index" width="50" />
+          <el-table-column align="header-center" label="编号">
+            <template slot-scope="scope">{{ scope.row.code }}</template>
+          </el-table-column>
+          <el-table-column align="center" label="名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <el-table-column align="center" label="所属认证类型">
+            <template slot-scope="scope">{{ scope.row.cert_field.fullname }}</template>
+          </el-table-column>
+          <el-table-column align="header-center" label="产品领域">
+            <template slot-scope="scope">{{ scope.row.pv_scope.fullname }}</template>
+          </el-table-column>
+          <el-table-column align="header-center" label="产品分类">
+            <template slot-scope="scope">{{ scope.row.pv_class.fullname }}</template>
+          </el-table-column>
+          <el-table-column label="上传日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.create_time }}</span>
+            </template>
+          </el-table-column>
+                <el-table-column align="center" label="操作" width="260px">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="!checkPermission(['implementrule_update'])"
+            @click="handleUpdate(scope)"
+          >编辑</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            :disabled="!checkPermission(['implementrule_delete'])"
+            @click="handleDelete(scope)"
+          >删除</el-button>
+        </template>
+                </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="ruleList.count>0"
+          :total="ruleList.count"
+          :page.sync="listQuery.page"
+          :limit.sync="listQuery.page_size"
+          @pagination="getList"
+        />
+  </div>
+</template>
+<script>
+import { getImplementRuleList, deleteImplementRule } from "@/api/implementrule"
+import { getDictList } from "@/api/dict"
+import Pagination from "@/components/Pagination"
+import checkPermission from '@/utils/permission'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { genTree } from '../../utils'
+export default {
+  components: { Pagination, Treeselect },
+  data() {
+    return {
+      ruleList: {count:0},
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        page_size: 20
+      },
+      typeOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTypeOptions()
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getImplementRuleList(this.listQuery).then(response => {
+        if (response.data) {
+          this.ruleList = response.data
+        }
+        this.listLoading = false
+      });
+    },
+    getTypeOptions() {
+      getDictList({type__code:'cert_field'}).then(res=>{
+        this.typeOptions = genTree(res.data)
+      })
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20
+      }
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleCreate() {
+      this.$router.push({path:"/certset/implementrule/create"})
+    },
+    handleUpdate(scope) {
+      this.$router.push({path:"/certset/implementrule/update",query:{id:scope.row.id}})
+    },
+    handleDelete(scope) {
+      deleteImplementRule(scope.row.id).then(res=>{
+        this.$message.success('成功')
+        this.getList()
+      })
+    }
+  }
+};
+</script>
diff --git a/client/src/views/employee/userdetail.vue b/client/src/views/employee/userdetail.vue
new file mode 100644
index 0000000..95b1821
--- /dev/null
+++ b/client/src/views/employee/userdetail.vue
@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+        <div style="display:flex">
+          <treeselect v-model="listQuery.cert_field" :multiple="false" :options="typeOptions" placeholder="认证类型" @input="handleFilter" style="width: 260px" clearable/>
+          <!-- <el-select
+            v-model="listQuery.cert_field"
+            placeholder="认证类型"
+            clearable
+            style="width: 200px"
+            class="filter-item"
+            @change="handleFilter"
+          >
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.key"
+              :label="item.display_name"
+              :value="item.key"
+            />
+          </el-select> -->
+          <el-input
+            v-model="listQuery.search"
+            placeholder="规则名称/编号"
+            style="width: 300px;"
+            class="filter-item"
+            @keyup.enter.native="handleFilter"
+          />
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter"
+          >搜索</el-button>
+          <el-button
+            class="filter-item"
+            style="margin-left: 10px;"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter"
+          >刷新重置</el-button>
+        </div>
+        <!-- <div style="margin-top:6px">
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+        </div> -->
+        <el-table
+          v-loading="listLoading"
+          :data="tableData.results"
+          style="width: 100%;margin-top:10px;"
+          border
+          fit
+          stripe
+          highlight-current-row
+          max-height="600"
+        >
+          <el-table-column type="index" width="50" />
+          <el-table-column align="header-center" label="编号">
+            <template slot-scope="scope">{{ scope.row.code }}</template>
+          </el-table-column>
+          <el-table-column align="center" label="名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <el-table-column align="center" label="所属认证类型">
+            <template slot-scope="scope">{{ scope.row.cert_field.fullname }}</template>
+          </el-table-column>
+          <el-table-column align="header-center" label="产品领域">
+            <template slot-scope="scope">{{ scope.row.pv_scope.fullname }}</template>
+          </el-table-column>
+          <el-table-column align="header-center" label="产品分类">
+            <template slot-scope="scope">{{ scope.row.pv_class.fullname }}</template>
+          </el-table-column>
+          <el-table-column label="上传日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.create_time }}</span>
+            </template>
+          </el-table-column>
+                <el-table-column align="center" label="操作" width="260px">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="!checkPermission(['implementrule_update'])"
+            @click="handleUpdate(scope)"
+          >编辑</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            :disabled="!checkPermission(['implementrule_delete'])"
+            @click="handleDelete(scope)"
+          >删除</el-button>
+        </template>
+                </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="tableData.count>0"
+          :total="tableData.count"
+          :page.sync="listQuery.page"
+          :limit.sync="listQuery.page_size"
+          @pagination="getList"
+        />
+  </div>
+</template>
+<script>
+import { getUserDetailList, deleteUserDetail } from "@/api/userdetail"
+import { getDictList } from "@/api/dict"
+import Pagination from "@/components/Pagination"
+import checkPermission from '@/utils/permission'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { genTree } from '../../utils'
+export default {
+  components: { Pagination, Treeselect },
+  data() {
+    return {
+      tableData: {count:0},
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        page_size: 20
+      },
+      typeOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTypeOptions()
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getUserDetailList(this.listQuery).then(response => {
+        if (response.data) {
+          this.tableData = response.data
+        }
+        this.listLoading = false
+      });
+    },
+    getTypeOptions() {
+      getDictList({type__code:'cert_field'}).then(res=>{
+        this.typeOptions = genTree(res.data)
+      })
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20
+      }
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleCreate() {
+      this.$router.push({path:"/certset/implementrule/create"})
+    },
+    handleUpdate(scope) {
+      this.$router.push({path:"/certset/implementrule/update",query:{id:scope.row.id}})
+    },
+    handleDelete(scope) {
+      deleteUserDetail(scope.row.id).then(res=>{
+        this.$message.success('成功')
+        this.getList()
+      })
+    }
+  }
+};
+</script>
diff --git a/client/src/views/enterprise/addresstype.vue b/client/src/views/enterprise/addresstype.vue
index b0f001b..58ffa9d 100644
--- a/client/src/views/enterprise/addresstype.vue
+++ b/client/src/views/enterprise/addresstype.vue
@@ -8,7 +8,7 @@
                   style="width: 100%;margin-top:10px;"
                   border
                   fit
-                  stripe
+                  stripe="true"
                   highlight-current-row
                   max-height="600">
           <el-table-column type="index" width="50" />
@@ -65,7 +65,7 @@
                                :value="item.value" :disabled="item.disabled"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="级联选择" prop="county_code">
+                <el-form-item label="所属国家" prop="country_code">
                   <el-select filterable v-model="addressData.country_code" @change='getValue'
                              placeholder="请选择国家"
                              clearable
@@ -78,12 +78,13 @@
 
                     </el-option>
                   </el-select>
-
-                  <el-cascader v-model="addressData.county_code" :options="countyOptions" :props="county_prosecode"
-                               :style="{width: '60%'}" filterable placeholder="请选择地区"></el-cascader>
                 </el-form-item>
+                  <el-form-item label="地域选择" prop="county_code">
+                    <el-cascader v-model="addressData.county_code" :options="countyOptions" :props="county_prosecode"
+                                 :style="{width: '60%'}" clearable placeholder="请选择地区"></el-cascader>
+                  </el-form-item>
 
-              </el-form>
+</el-form>
       <div style="text-align:right;">
         <el-button type="danger" @click="dialogVisible=false">取消</el-button>
         <el-button type="primary" @click="confirm('Form')">确认</el-button>
@@ -106,18 +107,20 @@ export default {
   props:['enterprise'],
   data() {
     return {
-      addressData: {
+     addressData: {
          id: null,
          address: null,
          eaddress: null,
          code: null,
          type: null,
          county_code: null,
-         enterprise:this.enterprise
+        enterprise: this.enterprise,
+         country_code:null,
       },
       addressList: [],
       listLoading: true,
-     
+     dialogVisible:false,
+      dialogType:'create',
       rule1: {
        
       },
@@ -144,14 +147,13 @@ export default {
           value: "注册地址"
         }
       ],
-      dialogVisible:false,
-      dialogType:'create',
+     
     };
   },
   
   created() {
     this.getList(),
-     this. getcountrytype()
+      this.getcountrytype()
   },
   methods: {
     checkPermission,
@@ -160,8 +162,9 @@ export default {
       this.listLoading = true;
       getAddressList({ enterprise: this.enterprise }).then(response => {
         if (response.data) {
-          this.addressList = response.data
-          console.log(response.data)
+          this.addressList = response.data;
+         
+          
         }
         this.listLoading = false
       });
@@ -170,22 +173,40 @@ export default {
         getDictList({ type__code: "world_regions" }).then(response => {
           this.country_Options = genTree(response.data);
         });
-        this.getValue()
-        
-      },
-
-    getValue() {
-      
-        if (this.addressData.country_code == 69) {
-          getDictList({ type__code: "china_regions" }).then(response => {
+       getDictList({ type__code: "china_regions" }).then(response => {
             this.countyOptions = genTree(response.data);
           });
-        }
-        else
-          this.countyOptions = '';
+    },
+   
+
+    getValue() {
+
+      if (this.addressData.country_code == 69) {
+        getDictList({ type__code: "china_regions" }).then(response => {
+          this.countyOptions = genTree(response.data);
+        });
+      }
+      else {
+        this.countyOptions = "";
+      }
+       
+      
+         
+       
       },
     handleCreate() {
-     
+      this.addressData= {
+         id: null,
+         address: null,
+         eaddress: null,
+         code: null,
+         type: null,
+         county_code: null,
+        enterprise: this.enterprise,
+        country_code: null
+        
+
+      },
       this.dialogType = 'create'
       this.dialogVisible = true
       this.$nextTick(() => {
@@ -232,7 +253,7 @@ handleDelete(scope){
         if (valid) {
           const isEdit = this.dialogType === 'update'
           if (isEdit) {
-             this.addressData.county_code=this.addressData.county_code[2]
+             this.addressData.county_code=this.addressData.countyarry[2]
             updateAddress(this.addressData.id, this.addressData).then(() => {
               this.getList()
               this.dialogVisible = false
@@ -243,8 +264,9 @@ handleDelete(scope){
               })
             })
           } else {
-            this.addressData.county_code=this.addressData.county_code[2]
-            console.log(this.addressData)
+
+            this.addressData.county_code=this.addressData.countyarry[2]
+   
             createAddress(this.addressData).then(res => {
               this.getList()
               this.dialogVisible = false
diff --git a/client/src/views/implementrule/implementrule.vue b/client/src/views/implementrule/implementrule.vue
index e12b7e0..687531f 100644
--- a/client/src/views/implementrule/implementrule.vue
+++ b/client/src/views/implementrule/implementrule.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
-        <div>
-          <el-select
-            v-model="listQuery.cert_type"
+        <div style="display:flex">
+          <treeselect v-model="listQuery.cert_field" :multiple="false" :options="typeOptions" placeholder="认证类型" @input="handleFilter" style="width: 260px" clearable/>
+          <!-- <el-select
+            v-model="listQuery.cert_field"
             placeholder="认证类型"
             clearable
             style="width: 200px"
@@ -10,12 +11,12 @@
             @change="handleFilter"
           >
             <el-option
-              v-for="item in enabledOptions"
+              v-for="item in typeOptions"
               :key="item.key"
               :label="item.display_name"
               :value="item.key"
             />
-          </el-select>
+          </el-select> -->
           <el-input
             v-model="listQuery.search"
             placeholder="规则名称/编号"
@@ -58,7 +59,7 @@
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
           <el-table-column align="center" label="所属认证类型">
-            <template slot-scope="scope">{{ scope.row.cert_type }}</template>
+            <template slot-scope="scope">{{ scope.row.cert_field.fullname }}</template>
           </el-table-column>
           <el-table-column align="header-center" label="产品领域">
             <template slot-scope="scope">{{ scope.row.pv_scope.fullname }}</template>
@@ -105,11 +106,15 @@
   </div>
 </template>
 <script>
-import { getImplementRuleList } from "@/api/implementrule"
+import { getImplementRuleList, deleteImplementRule } from "@/api/implementrule"
+import { getDictList } from "@/api/dict"
 import Pagination from "@/components/Pagination"
 import checkPermission from '@/utils/permission'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { genTree } from '../../utils'
 export default {
-  components: { Pagination },
+  components: { Pagination, Treeselect },
   data() {
     return {
       ruleList: {count:0},
@@ -118,15 +123,12 @@ export default {
         page: 1,
         page_size: 20
       },
-      enabledOptions: [
-        { key: "pv", display_name: "自愿性产品认证" },
-        { key: "ccc", display_name: "强制性产品认证" },
-        { key: "sys", display_name: "管理体系认证" },
-      ],
+      typeOptions: [],
     };
   },
   created() {
     this.getList();
+    this.getTypeOptions()
   },
   methods: {
     checkPermission,
@@ -139,6 +141,11 @@ export default {
         this.listLoading = false
       });
     },
+    getTypeOptions() {
+      getDictList({type__code:'cert_field'}).then(res=>{
+        this.typeOptions = genTree(res.data)
+      })
+    },
     resetFilter() {
       this.listQuery = {
         page: 1,
@@ -156,6 +163,12 @@ export default {
     handleUpdate(scope) {
       this.$router.push({path:"/certset/implementrule/update",query:{id:scope.row.id}})
     },
+    handleDelete(scope) {
+      deleteImplementRule(scope.row.id).then(res=>{
+        this.$message.success('成功')
+        this.getList()
+      })
+    }
   }
 };
 </script>
diff --git a/client/src/views/implementrule/implementrulecreate.vue b/client/src/views/implementrule/implementrulecreate.vue
index e99a117..19452a4 100644
--- a/client/src/views/implementrule/implementrulecreate.vue
+++ b/client/src/views/implementrule/implementrulecreate.vue
@@ -5,21 +5,10 @@
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="认证类型" prop="cert_type">
-                <el-select
-                  v-model="formData.cert_type"
-                  placeholder="请选择认证类型"
-                  clearable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in cert_typeOptions"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                    :disabled="item.disabled"
-                  ></el-option>
-                </el-select>
+              <el-form-item label="认证类型" prop="cert_field">
+                <treeselect v-model="formData.cert_field" :multiple="false" :options="cert_fieldOptions" placeholder="请选择认证类型" :style="{width: '100%'}" @select="typeChange"
+                :clearable="false" :defaultExpandLevel='1' :disable-branch-nodes="true"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -63,7 +52,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="formData.cert_type =='pv'">
+          <el-col :span="24" v-if="cert_field_code =='pv'">
             <el-form-item label="产品领域" prop="pv_scope">
               <el-select
                 v-model="formData.pv_scope"
@@ -81,7 +70,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="formData.cert_type =='pv'">
+          <el-col :span="24" v-if="cert_field_code =='pv'">
             <el-form-item label="产品分类" prop="pv_class">
               <treeselect
                 v-model="formData.pv_class"
@@ -93,7 +82,7 @@
               ></treeselect>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="formData.cert_type =='ccc'">
+          <el-col :span="24" v-if="cert_field_code =='ccc'">
             <el-form-item label="产品分类" prop="ccc_list">
               <treeselect
                 v-model="formData.ccc_list"
@@ -127,7 +116,7 @@
           </el-col>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane label="单元类型划分" v-if="(formData.cert_type =='ccc'|| formData.cert_type == 'pv')&&(formData.id)">
+      <el-tab-pane label="单元类型划分" v-if="(cert_field_code =='ccc'|| cert_field_code == 'pv')&&(formData.id)">
         <Unittype :implementrule="formData.id"></Unittype>
       </el-tab-pane>
     </el-tabs>
@@ -151,7 +140,8 @@ export default {
       upHeaders: upHeaders(),
       upUrl: upUrl(),
       formData: {
-        cert_type: undefined,
+        id:null,
+        cert_field: undefined,
         code: undefined,
         name: undefined,
         pv_scope: undefined,
@@ -159,7 +149,7 @@ export default {
         ccc_list: undefined
       },
       rules: {
-        cert_type: [
+        cert_field: [
           {
             required: true,
             message: "请选择认证类型",
@@ -191,20 +181,8 @@ export default {
         pv_class: [],
         ccc_list: []
       },
-      cert_typeOptions: [
-        {
-          label: "自愿性产品认证",
-          value: "pv"
-        },
-        {
-          label: "强制性产品认证",
-          value: "ccc"
-        },
-        {
-          label: "管理体系认证",
-          value: "sys"
-        }
-      ],
+      cert_fieldOptions: [],
+      cert_field_code:null,
       pv_scopeOptions: [],
       pv_classOptions: [],
       ccc_listOptions: [],
@@ -213,16 +191,21 @@ export default {
   },
   computed: {},
   watch: {
-    "formData.cert_type": "changeRules"
+    // "formData.cert_field": "changeRules"
   },
   created() {
     this.getPvscope();
     this.getPvclass();
     this.getCccList();
     this.getCertpattern();
+    this.getCerttype();
   },
   mounted() {},
   methods: {
+    typeChange(node,id){
+      this.cert_field_code = node.code
+      this.changeRules(node.code)
+    },
     handlePreview(file) {
       if ("url" in file) {
         window.open(file.url);
@@ -233,8 +216,8 @@ export default {
     handleSuccess(response, file, fileList) {
       this.formData.path = response.data.path;
     },
-    changeRules() {
-      if (this.formData.cert_type == "pv") {
+    changeRules(val) {
+      if (val == "pv") {
         this.rules.pv_scope = [
           {
             required: true,
@@ -250,7 +233,7 @@ export default {
           }
         ];
         this.rules.ccc_list = [];
-      } else if (this.formData.cert_type == "ccc") {
+      } else if (val == "ccc") {
         this.rules.ccc_list = [
           {
             required: true,
@@ -271,6 +254,13 @@ export default {
         this.formData = response.data;
       });
     },
+    getCerttype() {
+      getDictList({ type__code: "cert_field" }).then(response => {
+        if (response.data) {
+          this.cert_fieldOptions = genTree(response.data);
+        }
+      });
+    },
     getPvscope() {
       getDictList({ type__code: "pv_scope" }).then(response => {
         if (response.data) {
@@ -304,10 +294,8 @@ export default {
         if (!valid) return;
         // TODO 提交表单
         createImplementRule(this.formData).then(response => {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
+          this.$message.success('成功')
+          this.formData.id = response.data.id
         });
       });
     },
diff --git a/client/src/views/implementrule/implementruleupdate.vue b/client/src/views/implementrule/implementruleupdate.vue
index 1cc8eb5..48ad3ea 100644
--- a/client/src/views/implementrule/implementruleupdate.vue
+++ b/client/src/views/implementrule/implementruleupdate.vue
@@ -1,133 +1,129 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
-      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
-        <el-col :span="18">
-          <el-form-item label="认证类型" prop="cert_type">
-            <el-select
-              v-model="formData.cert_type"
-              placeholder="请选择认证类型"
-              clearable
-              :style="{width: '100%'}"
-            >
-              <el-option
-                v-for="(item, index) in cert_typeOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18">
-          <el-form-item label="规则编号" prop="code">
-            <el-input
-              v-model="formData.code"
-              placeholder="请输入规则编号"
-              clearable
-              :style="{width: '100%'}"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18">
-          <el-form-item label="规则名称" prop="name">
-            <el-input
-              v-model="formData.name"
-              placeholder="请输入规则名称"
-              clearable
-              :style="{width: '100%'}"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18">
-          <el-form-item label="认证模式" prop="cert_pattern">
-            <el-select
-              v-model="formData.cert_pattern"
-              placeholder="请选择认证模式"
-              clearable
-              :style="{width: '100%'}"
-              :multiple="true"
-            >
-              <el-option
-                v-for="(item, index) in cert_patternOptions"
-                :key="index"
-                :label="item.fullname"
-                :value="item.value"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18" v-if="formData.cert_type =='pv'">
-          <el-form-item label="产品领域" prop="pv_scope">
-            <el-select
-              v-model="formData.pv_scope"
-              placeholder="请选择产品领域"
-              clearable
-              :style="{width: '100%'}"
-            >
-              <el-option
-                v-for="(item, index) in pv_scopeOptions"
-                :key="index"
-                :label="item.fullname"
-                :value="item.value"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18" v-if="formData.cert_type =='pv'">
-          <el-form-item label="产品分类" prop="pv_class">
-            <treeselect
-              v-model="formData.pv_class"
-              placeholder="请选择产品分类"
-              clearable
-              :style="{width: '100%'}"
-              :options="pv_classOptions"
-              :multiple="false"
-            ></treeselect>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18" v-if="formData.cert_type =='ccc'">
-          <el-form-item label="产品分类" prop="ccc_list">
-            <treeselect
-              v-model="formData.ccc_list"
-              placeholder="请选择产品分类"
-              clearable
-              :style="{width: '100%'}"
-              :options="ccc_listOptions"
-              :multiple="true"
-            ></treeselect>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18">
-          <el-form-item label="文件" prop="path">
-            <el-upload
-              :on-preview="handlePreview"
-              :on-success="handleSuccess"
-              :action="upUrl"
-              :headers="upHeaders"
-              :limit="1"
-              :file-list="fileList"
-            >
-              <el-button size="small" type="primary">点击上传</el-button>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item size="large">
-            <el-button type="primary" @click="submitForm">保存</el-button>
-            <el-button
-              type="primary"
-              @click="submitForm2"
-              v-if="formData.cert_type =='ccc'|| formData.cert_type == 'pv'"
-            >保存并继续单元划分</el-button>
-            <el-button @click="resetForm">重置</el-button>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+
+
+
+    <el-tabs type="border-card">
+      <el-tab-pane label="规则信息">
+        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="认证类型" prop="cert_field">
+                <treeselect v-model="formData.cert_field" :multiple="false" :options="cert_fieldOptions" placeholder="请选择认证类型" :style="{width: '100%'}" @select="typeChange"
+                :clearable="false" :defaultExpandLevel='1' :disable-branch-nodes="true"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="规则编号" prop="code">
+                <el-input
+                  v-model="formData.code"
+                  placeholder="请输入规则编号"
+                  clearable
+                  :style="{width: '100%'}"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="规则名称" prop="name">
+                <el-input
+                  v-model="formData.name"
+                  placeholder="请输入规则名称"
+                  clearable
+                  :style="{width: '100%'}"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-col :span="24">
+            <el-form-item label="认证模式" prop="cert_pattern">
+              <el-select
+                v-model="formData.cert_pattern"
+                placeholder="请选择认证模式"
+                clearable
+                :style="{width: '100%'}"
+                :multiple="true"
+              >
+                <el-option
+                  v-for="(item, index) in cert_patternOptions"
+                  :key="index"
+                  :label="item.fullname"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="cert_field_code =='pv'">
+            <el-form-item label="产品领域" prop="pv_scope">
+              <el-select
+                v-model="formData.pv_scope"
+                placeholder="请选择产品领域"
+                clearable
+                :style="{width: '100%'}"
+              >
+                <el-option
+                  v-for="(item, index) in pv_scopeOptions"
+                  :key="index"
+                  :label="item.fullname"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="cert_field_code =='pv'">
+            <el-form-item label="产品分类" prop="pv_class">
+              <treeselect
+                v-model="formData.pv_class"
+                placeholder="请选择产品分类"
+                clearable
+                :style="{width: '100%'}"
+                :options="pv_classOptions"
+                :multiple="false"
+              ></treeselect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="cert_field_code =='ccc'">
+            <el-form-item label="产品分类" prop="ccc_list">
+              <treeselect
+                v-model="formData.ccc_list"
+                placeholder="请选择产品分类"
+                clearable
+                :style="{width: '100%'}"
+                :options="ccc_listOptions"
+                :multiple="true"
+              ></treeselect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文件" prop="path">
+              <el-upload
+                :on-preview="handlePreview"
+                :on-success="handleSuccess"
+                :action="upUrl"
+                :headers="upHeaders"
+                :limit="1"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="margin-top:4px">
+            <el-form-item size="large">
+              <el-button type="primary" @click="submitForm">保存</el-button>
+              <el-button @click="resetForm">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="单元类型划分" v-if="(cert_field_code =='ccc'|| cert_field_code == 'pv')&&(formData.id)">
+        <Unittype :implementrule="formData.id"></Unittype>
+      </el-tab-pane>
+    </el-tabs>
+
   </div>
 </template>
 <script>
@@ -146,7 +142,7 @@ export default {
       upHeaders: upHeaders(),
       upUrl: upUrl(),
       formData: {
-        cert_type: undefined,
+        cert_field: undefined,
         code: undefined,
         name: undefined,
         pv_scope: undefined,
@@ -154,7 +150,7 @@ export default {
         ccc_list: undefined
       },
       rules: {
-        cert_type: [
+        cert_field: [
           {
             required: true,
             message: "请选择认证类型",
@@ -186,48 +182,35 @@ export default {
         pv_class: [],
         ccc_list: []
       },
-      cert_typeOptions: [
-        {
-          label: "自愿性产品认证",
-          value: "pv"
-        },
-        {
-          label: "强制性产品认证",
-          value: "ccc"
-        },
-        {
-          label: "管理体系认证",
-          value: "sys"
-        }
-      ],
-      pv_scopeOptions: [
-        
-      ],
-      pv_classOptions: [
-       
-      ],
-      ccc_listOptions: [
-        
-      ],
-      cert_patternOptions: [
-        
-      ]
+      cert_fieldOptions: [],
+      cert_field_code:null,
+      pv_scopeOptions: [],
+      pv_classOptions: [],
+      ccc_listOptions: [],
+      cert_patternOptions: []
     };
   },
   computed: {},
   watch: {
-    "formData.cert_type": "changeRules"
+    // "formData.cert_field": "changeRules"
   },
   created() {
     this.formData.id = this.$route.query.id  //接收参数
     this.getRule();
-    this.getPvscope()
-    this.getPvclass()
-    this.getCccList()
-    this.getCertpattern()
+
+    this.getPvscope();
+    this.getPvclass();
+    this.getCccList();
+    this.getCertpattern();
+    this.getCerttype();
+
   },
   mounted() {},
   methods: {
+    typeChange(node,id){
+      this.cert_field_code = node.code
+      this.changeRules(node.code)
+    },
     handlePreview(file) {
       if ("url" in file) {
         window.open(file.url);
@@ -238,8 +221,8 @@ export default {
     handleSuccess(response, file, fileList) {
       this.formData.path = response.data.path;
     },
-    changeRules() {
-      if (this.formData.cert_type == "pv") {
+    changeRules(val) {
+      if (val == "pv") {
         this.rules.pv_scope = [
           {
             required: true,
@@ -255,7 +238,7 @@ export default {
           }
         ];
         this.rules.ccc_list = [];
-      } else if (this.formData.cert_type == "ccc") {
+      } else if (val == "ccc") {
         this.rules.ccc_list = [
           {
             required: true,
@@ -273,8 +256,10 @@ export default {
     },
     getRule() {
       getImplementRule(this.formData.id).then(response => {
-        this.formData = response.data
-      })
+        this.formData = response.data;
+        this.cert_field_code = response.data.cert_field_.code
+      });
+
     },
     getPvscope() {
       getDictList({ type__code: "pv_scope" }).then(response => {
@@ -290,6 +275,13 @@ export default {
         }
       });
     },
+    getCerttype() {
+      getDictList({ type__code: "cert_field" }).then(response => {
+        if (response.data) {
+          this.cert_fieldOptions = genTree(response.data);
+        }
+      });
+    },
     getCccList() {
       getDictList({ type__code: "ccc_list" }).then(response => {
         if (response.data) {
diff --git a/client/src/views/implementrule/unittype.vue b/client/src/views/implementrule/unittype.vue
index 14b2de7..d1e4838 100644
--- a/client/src/views/implementrule/unittype.vue
+++ b/client/src/views/implementrule/unittype.vue
@@ -140,11 +140,7 @@ export default {
     },
 handleDelete(scope){
     deleteUnitType(scope.row.id).then(res=>{
-        this.$notify({
-                title: '成功',
-                type: 'success',
-                duration: 2000
-              })
+        this.$message.success('成功')
               this.getList()
     })
 },
@@ -163,21 +159,13 @@ handleDelete(scope){
             updateUnitType(this.unittype.id, this.unittype).then(() => {
               this.getList()
               this.dialogVisible = false
-              this.$notify({
-                title: '成功',
-                type: 'success',
-                duration: 2000
-              })
+              this.$message.success('成功')
             })
           } else {
             createUnitType(this.unittype).then(res => {
               this.getList()
               this.dialogVisible = false
-              this.$notify({
-                title: '成功',
-                type: 'success',
-                duration: 2000
-              })
+              this.$message.success('成功')
             })
           }
         } else {
diff --git a/client/src/views/standard/standard.vue b/client/src/views/standard/standard.vue
index 8f602d4..306c0b0 100644
--- a/client/src/views/standard/standard.vue
+++ b/client/src/views/standard/standard.vue
@@ -273,22 +273,14 @@ export default {
               if (res.code >= 200) {
                 this.getList();
                 this.dialogVisible = false
-                this.$notify({
-                  title: "成功",
-                  message: "编辑成功",
-                  type: "success",
-                  duration: 2000
-                });
+                this.$message.success('成功')
               }
             });
           } else {
             createStandard(this.standard).then(res => {
                 this.getList();
                 this.dialogVisible = false
-                this.$notify({
-                  title: "成功",
-                  type: "success",
-                })
+                this.$message.success('成功')
               
             }).catch(error=>{})
           }
diff --git a/client/src/views/system/dict.vue b/client/src/views/system/dict.vue
index bc92719..c9610ba 100644
--- a/client/src/views/system/dict.vue
+++ b/client/src/views/system/dict.vue
@@ -63,23 +63,23 @@
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         >
           <el-table-column type="index" width="50" />
-          <el-table-column align="center" label="代号/编号">
+          <el-table-column label="代号/编号">
             <template slot-scope="scope">{{ scope.row.code }}</template>
           </el-table-column>
-          <el-table-column align="center" label="名称">
+          <el-table-column label="名称">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
-          <el-table-column align="header-center" label="描述">
+          <el-table-column label="描述">
             <template slot-scope="scope">{{ scope.row.description }}</template>
           </el-table-column>
-          <el-table-column align="header-center" label="是否有效">
+          <el-table-column label="是否有效">
             <template slot-scope="scope">
               
               <el-tag type="danger" v-if="scope.row.is_deleted">无效</el-tag>
               <el-tag type="success" v-else>有效</el-tag>
               </template>
           </el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 v-if="!scope.row.is_superuser"
diff --git a/server/apps/certset/migrations/0005_implementrule_cert_type.py b/server/apps/certset/migrations/0005_implementrule_cert_field.py
similarity index 94%
rename from server/apps/certset/migrations/0005_implementrule_cert_type.py
rename to server/apps/certset/migrations/0005_implementrule_cert_field.py
index 08ac4ca..9281ba1 100644
--- a/server/apps/certset/migrations/0005_implementrule_cert_type.py
+++ b/server/apps/certset/migrations/0005_implementrule_cert_field.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='implementrule',
-            name='cert_type',
+            name='cert_field',
             field=models.CharField(choices=[('ccc', '强制性产品认证'), ('pv', '自愿性产品认证'), ('sys', '管理体系认证')], default='pv', max_length=50, verbose_name='所属认证类型'),
         ),
     ]
diff --git a/server/apps/certset/migrations/0006_implementrule_path.py b/server/apps/certset/migrations/0006_implementrule_path.py
index ce59c53..1a1c637 100644
--- a/server/apps/certset/migrations/0006_implementrule_path.py
+++ b/server/apps/certset/migrations/0006_implementrule_path.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('certset', '0005_implementrule_cert_type'),
+        ('certset', '0005_implementrule_cert_field'),
     ]
 
     operations = [
diff --git a/server/apps/certset/migrations/0008_auto_20200707_1044.py b/server/apps/certset/migrations/0008_auto_20200707_1044.py
new file mode 100644
index 0000000..1c16251
--- /dev/null
+++ b/server/apps/certset/migrations/0008_auto_20200707_1044.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-07-07 02:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0021_auto_20200616_1722'),
+        ('certset', '0007_auto_20200629_1646'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='implementrule',
+            name='cert_field',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='implementrule_cert_field', to='system.Dict', verbose_name='所属认证类型'),
+        ),
+    ]
diff --git a/server/apps/certset/migrations/0009_auto_20200709_1522.py b/server/apps/certset/migrations/0009_auto_20200709_1522.py
new file mode 100644
index 0000000..e1fa208
--- /dev/null
+++ b/server/apps/certset/migrations/0009_auto_20200709_1522.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.7 on 2020-07-09 07:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0021_auto_20200616_1722'),
+        ('certset', '0008_auto_20200707_1044'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='implementrule',
+            name='cert_field',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='implementrule_cert_field', to='system.Dict', verbose_name='所属认证领域'),
+        ),
+        migrations.AlterField(
+            model_name='implementrule',
+            name='pv_class',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='implementrule_pv_class', to='system.Dict', verbose_name='自愿性产品认证产品分类'),
+        ),
+        migrations.AlterField(
+            model_name='implementrule',
+            name='pv_scope',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='implementrule_pv_scope', to='system.Dict', verbose_name='自愿性产品认证范围'),
+        ),
+    ]
diff --git a/server/apps/certset/models.py b/server/apps/certset/models.py
index 24efe97..d1cc06c 100644
--- a/server/apps/certset/models.py
+++ b/server/apps/certset/models.py
@@ -27,20 +27,13 @@ class Standard(CommonAModel):
 
 class ImplementRule(CommonAModel):
 
-    cert_type_choices = (
-        ('ccc', '强制性产品认证'),
-        ('pv', '自愿性产品认证'),
-        ('sys', '管理体系认证')
-    )
-
     name = models.CharField('规则名称', max_length=1000)
     code = models.CharField('编号', max_length=30, unique=True)
-    cert_type = models.CharField('所属认证类型', max_length=50,
-                             choices=cert_type_choices, default='pv')
+    cert_field = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='所属认证领域', related_name= 'implementrule_cert_field')
     standards = models.ManyToManyField(Standard, blank=True, verbose_name='依据标准', related_name='implementrules_standards')
     ccc_list = models.ManyToManyField(Dict, blank=True, verbose_name='CCC产品认证目录', related_name= 'implementrule_ccc_list')
-    pv_scope = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证领域', related_name= 'implementrule_pv_scope')
-    pv_class = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证产品', related_name= 'implementrule_pv_class')
+    pv_scope = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证范围', related_name= 'implementrule_pv_scope')
+    pv_class = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证产品分类', related_name= 'implementrule_pv_class')
     cnas_scope = models.ManyToManyField(Dict, blank=True, verbose_name='CNAS业务范围', related_name= 'implementrule_cnas_scope')
     economy_class = models.ManyToManyField(Dict, blank=True, verbose_name='国民经济分类', related_name= 'implementrule_economy_class')
     cert_pattern = models.ManyToManyField(Dict, blank=True, verbose_name='认证模式', related_name= 'implementrule_cert_pattern')
diff --git a/server/apps/certset/serializers.py b/server/apps/certset/serializers.py
index 6eb887b..be20938 100644
--- a/server/apps/certset/serializers.py
+++ b/server/apps/certset/serializers.py
@@ -11,6 +11,7 @@ class StandardSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 class ImplementRuleSerializer(serializers.ModelSerializer):
+    cert_field_ = DictSerializer(source='cert_field', read_only=True)
     class Meta:
         model = ImplementRule
         fields = '__all__'
@@ -18,18 +19,18 @@ class ImplementRuleSerializer(serializers.ModelSerializer):
 class ImplementRuleListSerializer(serializers.ModelSerializer):
     pv_scope = DictSerializer()
     pv_class = DictSerializer()
-    cert_type = serializers.SerializerMethodField()
+    cert_field = DictSerializer()
     class Meta:
         model = ImplementRule
-        fields = ['id', 'code', 'name', 'cert_type', 'pv_scope', 'pv_class', 'create_time']
+        fields = ['id', 'code', 'name', 'cert_field', 'pv_scope', 'pv_class', 'create_time']
     @staticmethod
     def setup_eager_loading(queryset):
         """ Perform necessary eager loading of data. """
-        queryset = queryset.select_related('pv_scope','pv_class')
+        queryset = queryset.select_related('pv_scope','pv_class', 'cert_field')
         return queryset
     
-    def get_cert_type(self, obj):
-        return obj.get_cert_type_display()
+    # def get_cert_field(self, obj):
+    #     return obj.get_cert_field_display()
 
 class UnitTypeSerializer(serializers.ModelSerializer):
     standard_ = StandardSerializer(source='standard', read_only=True)
diff --git a/server/apps/certset/views.py b/server/apps/certset/views.py
index facdfe4..10f2d3d 100644
--- a/server/apps/certset/views.py
+++ b/server/apps/certset/views.py
@@ -9,7 +9,7 @@ from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
 class StandardViewSet(CreateUpdateCustomMixin, ModelViewSet):
     perms_map = {'get': '*', 'post': 'standard_create',
                  'put': 'standard_update', 'delete': 'standard_delete'}
-    queryset = Standard.objects
+    queryset = Standard.objects.all()
     serializer_class = StandardSerializer
     search_fields = ['name', 'code', 'status', 'implement_date']
     filterset_fields = ['status']
@@ -18,10 +18,10 @@ class StandardViewSet(CreateUpdateCustomMixin, ModelViewSet):
 class ImplementRuleViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
     perms_map = {'get': '*', 'post': 'implementrule_create',
                  'put': 'implementrule_update', 'delete': 'implementrule_delete'}
-    queryset = ImplementRule.objects
+    queryset = ImplementRule.objects.all()
     serializer_class = ImplementRuleSerializer
-    search_fields = ['name', 'code', 'cert_type']
-    filterset_fields = ['pv_scope', 'cert_type']
+    search_fields = ['name', 'code', 'cert_field']
+    filterset_fields = ['pv_scope', 'cert_field']
     ordering = ['-create_time']
 
     def get_serializer_class(self):
@@ -33,7 +33,7 @@ class ImplementRuleViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelView
 class UnitTypedViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
     perms_map = {'get': '*', 'post': 'unittype_create',
                  'put': 'unittype_update', 'delete': 'unittype_delete'}
-    queryset = UnitType.objects
+    queryset = UnitType.objects.all()
     serializer_class = UnitTypeSerializer
     search_fields = ['name']
     filterset_fields = ['name','implementrule']
diff --git a/server/apps/crm/migrations/0007_auto_20200710_0912.py b/server/apps/crm/migrations/0007_auto_20200710_0912.py
new file mode 100644
index 0000000..2ac59a4
--- /dev/null
+++ b/server/apps/crm/migrations/0007_auto_20200710_0912.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.0.5 on 2020-07-10 01:12
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0006_auto_20200706_1048'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='enterpriseaddress',
+            options={'verbose_name': '组织地址', 'verbose_name_plural': '组织地址'},
+        ),
+        migrations.AlterField(
+            model_name='enterpriseaddress',
+            name='code',
+            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='地址邮编'),
+        ),
+        migrations.AlterField(
+            model_name='enterpriseaddress',
+            name='type',
+            field=models.CharField(choices=[('注册地址', '注册地址'), ('通信地址', '通信地址'), ('生产地址', '生产地址')], default='生产地址', max_length=50, verbose_name='地址类型'),
+        ),
+    ]
diff --git a/server/apps/crm/migrations/0008_auto_20200710_0919.py b/server/apps/crm/migrations/0008_auto_20200710_0919.py
new file mode 100644
index 0000000..1d0b0aa
--- /dev/null
+++ b/server/apps/crm/migrations/0008_auto_20200710_0919.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-07-10 01:19
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0021_auto_20200616_1722'),
+        ('crm', '0007_auto_20200710_0912'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriseaddress',
+            name='countyarry',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None),
+        ),
+       
+    ]
diff --git a/server/apps/crm/migrations/0009_remove_enterpriseaddress_provincecode.py b/server/apps/crm/migrations/0009_remove_enterpriseaddress_provincecode.py
new file mode 100644
index 0000000..5e47cd9
--- /dev/null
+++ b/server/apps/crm/migrations/0009_remove_enterpriseaddress_provincecode.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.5 on 2020-07-10 01:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0008_auto_20200710_0919'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='enterpriseaddress',
+            name='provinceCode',
+        ),
+    ]
diff --git a/server/apps/crm/models.py b/server/apps/crm/models.py
index 204cfc1..9181946 100644
--- a/server/apps/crm/models.py
+++ b/server/apps/crm/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from apps.system.models import CommonBModel,CommonAModel,Dict
 from simple_history.models import HistoricalRecords
+from django.contrib.postgres.fields import ArrayField
 import uuid
 # Create your models here.
 class Enterprise(CommonBModel):
@@ -68,7 +69,7 @@ class EnterpriseAddress(CommonAModel):
     type = models.CharField('地址类型', max_length=50,choices=type_choices, default='生产地址')
     county_code =  models.ForeignKey(Dict, on_delete=models.SET_NULL,verbose_name='县/区代码',null=True, blank=True, related_name= 'enterpriseaddress_county_code')
     country_code =  models.ForeignKey(Dict, on_delete=models.SET_NULL,verbose_name='国家代码',null=True, blank=True, related_name= 'enterpriseaddress_country_code')
-    provinceCode =  models.ForeignKey(Dict, on_delete=models.SET_NULL,verbose_name='省代码',null=True, blank=True, related_name= 'enterpriseaddress_provinceCode')
+    countyarry = ArrayField(models.IntegerField(),null=True, blank=True)
     class Meta:
         verbose_name = '组织地址'
         verbose_name_plural = verbose_name
diff --git a/server/apps/employee/__init__.py b/server/apps/employee/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/apps/employee/admin.py b/server/apps/employee/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/server/apps/employee/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/server/apps/employee/apps.py b/server/apps/employee/apps.py
new file mode 100644
index 0000000..791ec1d
--- /dev/null
+++ b/server/apps/employee/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class EmployeeConfig(AppConfig):
+    name = 'employee'
diff --git a/server/apps/employee/migrations/0001_initial.py b/server/apps/employee/migrations/0001_initial.py
new file mode 100644
index 0000000..cb1493b
--- /dev/null
+++ b/server/apps/employee/migrations/0001_initial.py
@@ -0,0 +1,220 @@
+# Generated by Django 3.0.7 on 2020-07-09 07:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import simple_history.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('system', '0021_auto_20200616_1722'),
+        ('certset', '0009_auto_20200709_1522'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Ability',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('access_date', models.DateField(verbose_name='评定时间')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('is_paused', models.BooleanField(default=False, verbose_name='是否暂停')),
+                ('afrom', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_afrom', to='system.Dict', verbose_name='能力来源')),
+                ('auditor_abilitys', models.ManyToManyField(related_name='ability_auditor_abilitys', to='system.Dict', verbose_name='能力项')),
+                ('cert_field', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_cert_field', to='system.Dict', verbose_name='认证领域')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ability_employee', to=settings.AUTH_USER_MODEL)),
+                ('major', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_major', to='system.Dict', verbose_name='专业代码')),
+                ('major_rule', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_major_rule', to='certset.ImplementRule', verbose_name='专业(ccc)')),
+            ],
+            options={
+                'verbose_name': '专业能力',
+                'verbose_name_plural': '专业能力',
+            },
+        ),
+        migrations.CreateModel(
+            name='UserDetail',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('code', models.CharField(blank=True, max_length=30, null=True, verbose_name='编号')),
+                ('remember_code', models.CharField(blank=True, max_length=30, null=True, verbose_name='易记码')),
+                ('gengder', models.CharField(choices=[('男', '男'), ('女', '女')], default='男', max_length=50, verbose_name='性别')),
+                ('landline', models.CharField(blank=True, max_length=100, null=True, verbose_name='座机')),
+                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='邮箱')),
+                ('birth', models.DateField(blank=True, null=True, verbose_name='出生日期')),
+                ('ID_number', models.CharField(blank=True, max_length=100, null=True, verbose_name='身份证号')),
+                ('is_onjob', models.BooleanField(default=True, verbose_name='是否在职')),
+                ('is_fulltime', models.BooleanField(default=True, verbose_name='是否专职')),
+                ('is_payinsurance', models.BooleanField(default=True, verbose_name='是否缴纳保险')),
+                ('finance_number', models.CharField(blank=True, max_length=30, null=True, verbose_name='财务编号')),
+                ('address', models.TextField(blank=True, null=True, verbose_name='详细地址')),
+                ('signature', models.CharField(blank=True, max_length=200, null=True, verbose_name='签名图片')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='userdetail_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('fee_level', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='userdetail_fee_level', to='system.Dict', verbose_name='劳务费级别')),
+                ('pro_title', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='userdetail_pro_title', to='system.Dict', verbose_name='职称')),
+                ('region', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='userdetail_region', to='system.Dict', verbose_name='省市区')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='userdetail_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': '人员详细信息',
+                'verbose_name_plural': '人员详细信息',
+            },
+        ),
+        migrations.CreateModel(
+            name='Train',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('name', models.CharField(max_length=200, verbose_name='培训主题')),
+                ('start_time', models.DateTimeField(verbose_name='开始时间')),
+                ('end_time', models.DateTimeField(verbose_name='结束时间')),
+                ('hours', models.IntegerField(default=1, verbose_name='学时')),
+                ('train_org', models.CharField(max_length=200, verbose_name='培训机构')),
+                ('teacher', models.CharField(max_length=200, verbose_name='主讲人')),
+                ('content', models.TextField(verbose_name='培训内容')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='train_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employees', models.ManyToManyField(related_name='train_employees', to=settings.AUTH_USER_MODEL, verbose_name='参加人员')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='train_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': '培训记录',
+                'verbose_name_plural': '培训记录',
+            },
+        ),
+        migrations.CreateModel(
+            name='Qualification',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('cert_number', models.CharField(max_length=200, unique=True, verbose_name='证书号')),
+                ('registration_date', models.DateField(verbose_name='注册日期')),
+                ('expiration_date', models.DateField(verbose_name='到期日期')),
+                ('publish_number', models.CharField(max_length=200, unique=True, verbose_name='文号')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('is_paused', models.BooleanField(default=False, verbose_name='是否暂停')),
+                ('auditor_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='qualification_auditor_type', to='system.Dict', verbose_name='资格类型')),
+                ('cert_field', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='qualification_cert_field', to='system.Dict', verbose_name='认证领域')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='qualification_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualification_employee', to=settings.AUTH_USER_MODEL)),
+                ('major_rules', models.ManyToManyField(through='employee.Ability', to='certset.ImplementRule', verbose_name='注册专业(ccc)')),
+                ('majors', models.ManyToManyField(through='employee.Ability', to='system.Dict', verbose_name='注册专业')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='qualification_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': '注册资格',
+                'verbose_name_plural': '注册资格',
+            },
+        ),
+        migrations.CreateModel(
+            name='HistoricalQualification',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(blank=True, editable=False, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('cert_number', models.CharField(db_index=True, max_length=200, verbose_name='证书号')),
+                ('registration_date', models.DateField(verbose_name='注册日期')),
+                ('expiration_date', models.DateField(verbose_name='到期日期')),
+                ('publish_number', models.CharField(db_index=True, max_length=200, verbose_name='文号')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('is_paused', models.BooleanField(default=False, verbose_name='是否暂停')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField()),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('auditor_type', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='system.Dict', verbose_name='资格类型')),
+                ('cert_field', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='system.Dict', verbose_name='认证领域')),
+                ('create_by', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('update_by', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': 'historical 注册资格',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': 'history_date',
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalAbility',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(blank=True, editable=False, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('access_date', models.DateField(verbose_name='评定时间')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('is_paused', models.BooleanField(default=False, verbose_name='是否暂停')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField()),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('afrom', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='system.Dict', verbose_name='能力来源')),
+                ('cert_field', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='system.Dict', verbose_name='认证领域')),
+                ('create_by', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('major', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='system.Dict', verbose_name='专业代码')),
+                ('major_rule', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='certset.ImplementRule', verbose_name='专业(ccc)')),
+                ('qualification', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='employee.Qualification')),
+                ('update_by', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': 'historical 专业能力',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': 'history_date',
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='Education',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('admission_date', models.DateField(verbose_name='入学时间')),
+                ('graduation_date', models.DateField(verbose_name='毕业时间')),
+                ('school', models.CharField(max_length=200, verbose_name='毕业院校')),
+                ('major', models.CharField(max_length=200, verbose_name='所学专业')),
+                ('remark', models.TextField(verbose_name='备注')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='education_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='education_employee', to=settings.AUTH_USER_MODEL)),
+                ('level', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='education_level', to='system.Dict', verbose_name='文化程度')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='education_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'verbose_name': '教育经历',
+                'verbose_name_plural': '教育经历',
+            },
+        ),
+        migrations.AddField(
+            model_name='ability',
+            name='qualification',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_qualification', to='employee.Qualification'),
+        ),
+        migrations.AddField(
+            model_name='ability',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ability_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+    ]
diff --git a/server/apps/employee/migrations/__init__.py b/server/apps/employee/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/apps/employee/models.py b/server/apps/employee/models.py
new file mode 100644
index 0000000..c3fdfe7
--- /dev/null
+++ b/server/apps/employee/models.py
@@ -0,0 +1,153 @@
+from django.db import models
+from apps.system.models import CommonAModel, Dict, User, CommonBModel
+from apps.certset.models import ImplementRule
+from simple_history.models import HistoricalRecords
+
+# Create your models here.
+
+
+class UserDetail(CommonAModel):
+    """
+    详细信息表
+    """
+    gender_choices = (
+        ('男', '男'),
+        ('女', '女'),
+    )
+    employee = models.OneToOneField(User, on_delete=models.CASCADE)
+    code = models.CharField('编号', max_length=30, null=True, blank=True)
+    remember_code = models.CharField(
+        '易记码', max_length=30, null=True, blank=True)
+    gengder = models.CharField('性别', max_length=50,
+                               choices=gender_choices, default='男')
+    landline = models.CharField('座机', max_length=100, null=True, blank=True)
+    email = models.EmailField('邮箱', null=True, blank=True)
+    birth = models.DateField('出生日期', null=True, blank=True)
+    ID_number = models.CharField('身份证号', max_length=100, null=True, blank=True)
+    pro_title = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True,
+                                  blank=True, verbose_name='职称', related_name='userdetail_pro_title')
+    is_onjob = models.BooleanField('是否在职', default=True)
+    is_fulltime = models.BooleanField('是否专职', default=True)
+    is_payinsurance = models.BooleanField('是否缴纳保险', default=True)
+    finance_number = models.CharField(
+        '财务编号', max_length=30, null=True, blank=True)
+    fee_level = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True,
+                                  blank=True, verbose_name='劳务费级别', related_name='userdetail_fee_level')
+    region = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True,
+                               blank=True, verbose_name='省市区', related_name='userdetail_region')
+    address = models.TextField('详细地址', null=True, blank=True)
+    signature = models.CharField('签名图片', max_length=200, null=True, blank=True)
+
+    class Meta:
+        verbose_name = '人员详细信息'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.user.name
+
+
+class Qualification(CommonAModel):
+    """
+    注册资格表
+    """
+    employee = models.ForeignKey(User, on_delete=models.CASCADE, related_name='qualification_employee')
+    cert_field = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='认证领域', related_name='qualification_cert_field')
+    cert_number = models.CharField('证书号', max_length=200, unique=True)
+    registration_date = models.DateField('注册日期')
+    expiration_date = models.DateField('到期日期')
+    auditor_type = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='资格类型',related_name='qualification_auditor_type')
+    publish_number = models.CharField('文号', max_length=200, unique=True)
+    remark = models.TextField('备注')
+    majors = models.ManyToManyField(
+        Dict, verbose_name='注册专业', through='ability', through_fields=('qualification', 'major'))
+    major_rules = models.ManyToManyField(
+        ImplementRule, verbose_name='注册专业(ccc)', through='ability', through_fields=('qualification', 'major_rule'),)
+    is_paused = models.BooleanField('是否暂停', default=False)
+    history = HistoricalRecords()
+
+    class Meta:
+        verbose_name = '注册资格'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.cert_number
+
+
+class Ability(CommonAModel):
+    """
+    能力表
+    """
+    employee = models.ForeignKey(User, on_delete=models.CASCADE, related_name='ability_employee')
+    qualification = models.ForeignKey(
+        Qualification, on_delete=models.SET_NULL, null=True, blank=True, related_name='ability_qualification')
+    cert_field = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='认证领域', related_name='ability_cert_field')
+    afrom = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='能力来源', related_name='ability_afrom')
+    access_date = models.DateField('评定时间')
+    remark = models.TextField('备注')
+    major = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='专业代码', related_name='ability_major')
+    major_rule = models.ForeignKey(
+        ImplementRule, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='专业(ccc)', related_name='ability_major_rule')
+    auditor_abilitys = models.ManyToManyField(
+        Dict, verbose_name='能力项', related_name='ability_auditor_abilitys')
+    is_paused = models.BooleanField('是否暂停', default=False)
+    history = HistoricalRecords()
+
+    class Meta:
+        verbose_name = '专业能力'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        s = ''
+        if self.major:
+            s = s + self.major.code
+        elif self.major_rule:
+            s = s + self.major_rule.code
+        return s
+
+
+class Education(CommonAModel):
+    """
+    教育经历表
+    """
+    employee = models.ForeignKey(User, on_delete=models.CASCADE, related_name='education_employee')
+    admission_date = models.DateField('入学时间')
+    graduation_date = models.DateField('毕业时间')
+    school = models.CharField('毕业院校', max_length=200)
+    major = models.CharField('所学专业', max_length=200)
+    level = models.ForeignKey(
+        Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='文化程度', related_name='education_level')
+    remark = models.TextField('备注')
+
+    class Meta:
+        verbose_name = '教育经历'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.school
+
+
+class Train(CommonAModel):
+    """
+    培训记录表
+    """
+    name = models.CharField('培训主题', max_length=200)
+    start_time = models.DateTimeField('开始时间')
+    end_time = models.DateTimeField('结束时间')
+    hours = models.IntegerField('学时', default=1)
+    train_org = models.CharField('培训机构', max_length=200)
+    teacher = models.CharField('主讲人', max_length=200)
+    content = models.TextField('培训内容')
+    remark = models.TextField('备注')
+    employees = models.ManyToManyField(User, verbose_name='参加人员', related_name='train_employees')
+
+    class Meta:
+        verbose_name = '培训记录'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.name
diff --git a/server/apps/employee/serializers.py b/server/apps/employee/serializers.py
new file mode 100644
index 0000000..cc0c0fe
--- /dev/null
+++ b/server/apps/employee/serializers.py
@@ -0,0 +1,46 @@
+from rest_framework import serializers
+
+from .models import *
+
+from apps.system.serializers import DictSerializer
+
+
+class UserDetailSerializer(serializers.ModelSerializer):
+    """
+    普通序列化
+    """
+    class Meta:
+        model = UserDetail
+        fields = '__all__'
+
+class QualificationSerializer(serializers.ModelSerializer):
+    """
+    普通序列化
+    """
+    class Meta:
+        model = Qualification
+        fields = '__all__'
+
+class AbilitySerializer(serializers.ModelSerializer):
+    """
+    普通序列化
+    """
+    class Meta:
+        model = Ability
+        fields = '__all__'
+
+class EducationSerializer(serializers.ModelSerializer):
+    """
+    普通序列化
+    """
+    class Meta:
+        model = Education
+        fields = '__all__'
+
+class TrainSerializer(serializers.ModelSerializer):
+    """
+    普通序列化
+    """
+    class Meta:
+        model = Train
+        fields = '__all__'
\ No newline at end of file
diff --git a/server/apps/employee/tests.py b/server/apps/employee/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/server/apps/employee/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/server/apps/employee/urls.py b/server/apps/employee/urls.py
new file mode 100644
index 0000000..085f728
--- /dev/null
+++ b/server/apps/employee/urls.py
@@ -0,0 +1,13 @@
+from django.urls import path, include
+from .views import *
+from rest_framework import routers
+
+router = routers.DefaultRouter()
+router.register('userdetail', UserDetailViewSet, basename="userdetail")
+router.register('qualification', QualificationViewSet, basename="qualification")
+router.register('ability', AbilityViewSet, basename="ability")
+router.register('education', EducationViewSet, basename="education")
+router.register('train', TrainViewSet, basename="train")
+urlpatterns = [
+    path('', include(router.urls))
+]
\ No newline at end of file
diff --git a/server/apps/employee/views.py b/server/apps/employee/views.py
new file mode 100644
index 0000000..204a6f5
--- /dev/null
+++ b/server/apps/employee/views.py
@@ -0,0 +1,66 @@
+from django.shortcuts import render
+from rest_framework.viewsets import ModelViewSet
+from .models import *
+from .serializers import *
+from apps.system.permission_data import RbacFilterSet
+from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
+# Create your views here.
+class UserDetailViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
+    """
+    详细信息-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'userdetail_create',
+                 'put': 'userdetail_update', 'delete': 'userdetail_delete'}
+    queryset = UserDetail.objects.all()
+    serializer_class = UserDetailSerializer
+    search_fields = ['code', 'remember_code', 'user__name']
+    filterset_fields = ['is_onjob', 'is_fulltime']
+    ordering = ['-create_time']
+
+class QualificationViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
+    """
+    注册资格-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'qucalification_create',
+                 'put': 'qucalification_update', 'delete': 'qucalification_delete'}
+    queryset = Qualification.objects.all()
+    serializer_class = QualificationSerializer
+    search_fields = ['cert_number']
+    filterset_fields = ['auditor_type']
+    ordering = ['-create_time']
+
+class AbilityViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
+    """
+    专业能力-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'ability_create',
+                 'put': 'ability_update', 'delete': 'ability_delete'}
+    queryset = Ability.objects.all()
+    serializer_class = AbilitySerializer
+    # search_fields = ['name', 'code', 'status', 'implement_date']
+    filterset_fields = ['major', 'major_rule', 'auditor_abilitys']
+    ordering = ['-create_time']
+
+class EducationViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
+    """
+    教育经历-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'education_create',
+                 'put': 'education_update', 'delete': 'education_delete'}
+    queryset = Education.objects.all()
+    serializer_class = EducationSerializer
+    search_fields = ['school', 'major', 'employee__name']
+    filterset_fields = ['level']
+    ordering = ['-create_time']
+
+class TrainViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
+    """
+    培训记录-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'train_create',
+                 'put': 'train_update', 'delete': 'train_delete'}
+    queryset = Train.objects.all()
+    serializer_class = TrainSerializer
+    search_fields = ['name', 'content']
+    # filterset_fields = ['status']
+    ordering = ['-create_time']
\ No newline at end of file
diff --git a/server/apps/system/permission.py b/server/apps/system/permission.py
index ffeefb2..fdc613c 100644
--- a/server/apps/system/permission.py
+++ b/server/apps/system/permission.py
@@ -35,10 +35,11 @@ class RbacPermission(BasePermission):
         :param view:
         :return:
         """
-        perms = cache.get(request.user.username + '__perms')
+        if not request.user:
+            perms = ['visitor'] # 如果没有经过认证,视为游客
+        else:
+            perms = cache.get(request.user.username + '__perms')
         if not perms:
-            if not request.user:
-                perms = ['visitor'] # 如果没有经过认证,视为游客
             perms = get_permission_list(request.user)
         if perms:
             if 'admin' in perms:
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index bac62ae..da5b580 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -36,7 +36,9 @@ class DictSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def get_fullname(self, obj):
-        return obj.code + obj.name
+        if obj.code:
+            return obj.code + obj.name
+        return obj.name
 
 class PositionSerializer(serializers.ModelSerializer):
     """
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index 2133610..767f928 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -46,7 +46,7 @@ class LogoutView(APIView):
         return Response(status=status.HTTP_200_OK)
 
 class TaskViewSet(ModelViewSet):
-    queryset = PeriodicTask.objects
+    queryset = PeriodicTask.objects.all()
     serializer_class = TaskSerializer
     search_fields = ['name']
     filterset_fields = ['enabled']
@@ -60,7 +60,7 @@ class DictTypeViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'dicttype_create',
                  'put': 'dicttype_update', 'delete': 'dicttype_delete'}
-    queryset = DictType.objects
+    queryset = DictType.objects.all()
     serializer_class = DictTypeSerializer
     pagination_class = None
     search_fields = ['name']
@@ -99,7 +99,7 @@ class PositionViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'position_create',
                  'put': 'position_update', 'delete': 'position_delete'}
-    queryset = Position.objects
+    queryset = Position.objects.all()
     serializer_class = PositionSerializer
     pagination_class = None
     search_fields = ['name','description']
@@ -118,7 +118,7 @@ class PermissionViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'perm_create',
                  'put': 'perm_update', 'delete': 'perm_delete'}
-    queryset = Permission.objects
+    queryset = Permission.objects.all()
     serializer_class = PermissionSerializer
     pagination_class = None
     search_fields = ['name']
@@ -132,7 +132,7 @@ class OrganizationViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'org_create',
                  'put': 'org_update', 'delete': 'org_delete'}
-    queryset = Organization.objects
+    queryset = Organization.objects.all()
     serializer_class = OrganizationSerializer
     pagination_class = None
     search_fields = ['name', 'method']
@@ -146,7 +146,7 @@ class RoleViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'role_create',
                  'put': 'role_update', 'delete': 'role_delete'}
-    queryset = Role.objects
+    queryset = Role.objects.all()
     serializer_class = RoleSerializer
     pagination_class = None
     search_fields = ['name']
@@ -160,7 +160,7 @@ class UserViewSet(ModelViewSet):
     """
     perms_map = {'get': '*', 'post': 'user_create',
                  'put': 'user_update', 'delete': 'user_delete'}
-    queryset = User.objects
+    queryset = User.objects.all()
     serializer_class = UserListSerializer
     filterset_class = UserFilter
     search_fields = ['username', 'name', 'phone', 'email']
@@ -241,7 +241,7 @@ class FileViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """
     perms_map = None
     parser_classes = [MultiPartParser, JSONParser]
-    queryset = File.objects
+    queryset = File.objects.all()
     serializer_class = FileSerializer
     filterset_fields = ['type']
     search_fields = ['name']
diff --git a/server/server/settings.py b/server/server/settings.py
index 9a3dd6d..19d91a1 100644
--- a/server/server/settings.py
+++ b/server/server/settings.py
@@ -46,7 +46,8 @@ INSTALLED_APPS = [
     'simple_history',
     'apps.system',
     'apps.crm',
-    'apps.certset'
+    'apps.certset',
+    'apps.employee'
 ]
 
 MIDDLEWARE = [
@@ -123,7 +124,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = '/static/'
-
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
diff --git a/server/server/urls.py b/server/server/urls.py
index 40d5a68..82524b0 100644
--- a/server/server/urls.py
+++ b/server/server/urls.py
@@ -34,8 +34,9 @@ urlpatterns = [
     path('system/', include('apps.system.urls')),
     path('certset/', include('apps.certset.urls')),
     path('crm/', include('apps.crm.urls')),
+    path('employee/', include('apps.employee.urls')),
     path('docs/', include_docs_urls(title="接口文档",
                                     authentication_classes=[], permission_classes=[])),
     path('', include(router.urls)),
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
diff --git a/server/utils/model.py b/server/utils/model.py
index ac0501c..05d04ab 100644
--- a/server/utils/model.py
+++ b/server/utils/model.py
@@ -50,6 +50,9 @@ class SoftDeletableManager(SoftDeletableManagerMixin, models.Manager):
 
 
 class BaseModel(models.Model):
+    """
+    基本表
+    """
     create_time = models.DateTimeField(
         default=timezone.now, verbose_name='创建时间', help_text='创建时间')
     update_time = models.DateTimeField(
@@ -61,6 +64,9 @@ class BaseModel(models.Model):
         abstract = True
 
 class SoftModel(BaseModel):
+    """
+    软删除基本表
+    """
     class Meta:
         abstract = True