From e62643b4e98909f58f0d4add28b5797195d7e57a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 30 Sep 2020 14:16:57 +0800
Subject: [PATCH 1/2] cert

---
 client/src/api/certappunit.js               |   8 +
 client/src/router/index.js                  |  13 ++
 client/src/views/accessment/access.vue      |  76 ++++++---
 client/src/views/certapp/certapphandle.vue  |  10 +-
 client/src/views/certificate/access.vue     |  49 ------
 client/src/views/certificate/issue.vue      | 136 +++++++++++++++
 client/src/views/certificate/issueindex.vue | 180 ++++++++++++++++++++
 server/apps/crm/serializers.py              |   7 +-
 server/apps/project/serializers.py          |  12 +-
 server/apps/project/views.py                |   5 +-
 server/apps/system/serializers.py           |   5 +
 11 files changed, 424 insertions(+), 77 deletions(-)
 delete mode 100644 client/src/views/certificate/access.vue
 create mode 100644 client/src/views/certificate/issue.vue
 create mode 100644 client/src/views/certificate/issueindex.vue

diff --git a/client/src/api/certappunit.js b/client/src/api/certappunit.js
index 27d943d..934c329 100644
--- a/client/src/api/certappunit.js
+++ b/client/src/api/certappunit.js
@@ -8,6 +8,14 @@ export function getCertappunitList(query) {
   })
 }
 
+export function accessCertappunit(id,data) {
+  return request({
+    url: `/project/certappunit/${id}/access/`,
+    method: 'put',
+    data
+  })
+}
+
 // export function createAccess(data) {
 //   return request({
 //     url: '/accessment/certass/',
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 1411268..41d9a82 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -244,12 +244,25 @@ export const asyncRoutes = [
     name: 'CertificateManage',
     meta: { title: '证书管理', icon: 'example'},
     children: [
+      {
+        path: 'issueindex',
+        name: 'issueindex',
+        component: () => import('@/views/certificate/issueindex'),
+        meta: { title: '证书颁发', icon: 'example', perms: ['certificate_issue'] }
+      },
       {
         path: 'index',
         name: 'Certificate',
         component: () => import('@/views/certificate/index'),
         meta: { title: '证书管理', icon: 'example', perms: ['certificate_view'] }
       },
+      {
+        path: 'certapp/:id/:action/',
+        name: 'Certissue',
+        component: () => import('@/views/certapp/certapphandle'),
+        meta: { title: '证书颁发', icon: 'example', perms: ['certificate_issue'] },
+        hidden: true
+      },
     ]
   },
   {
diff --git a/client/src/views/accessment/access.vue b/client/src/views/accessment/access.vue
index e243248..779a3c3 100644
--- a/client/src/views/accessment/access.vue
+++ b/client/src/views/accessment/access.vue
@@ -69,7 +69,7 @@
     >
       <el-table-column type="index" width="50" />
       <el-table-column label="单元名称">
-        <template slot-scope="scope" >{{ scope.row.name }}</template>
+        <template slot-scope="scope" v-if="scope.row.certunit_">{{ scope.row.certunit_.name }}</template>
       </el-table-column>
       <el-table-column label="证书信息">
         <template slot-scope="scope">
@@ -83,38 +83,59 @@
       </el-table-column>
       <el-table-column label="认证决定">
         <template slot-scope="scope">
-          <!-- <el-button
-            type="danger"
-            size="small"
-            :disabled="!checkPermission(['certapps_update'])"
-            @click="handleDelete(scope)"
-          >删除</el-button> -->
+          <el-select
+            v-model="scope.row.decision"
+            clearable
+            collapse-tags
+            :style="{width: '100%'}"
+            @change="((val)=>{handleAcessunit(val, scope.row.id)})"
+          >
+            <el-option
+              v-for="(item, index) in decisionOptions"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="操作">
+      <!-- <el-table-column label="操作">
         <template slot-scope="scope">
-          <!-- <el-button
-            type="danger"
+          <el-button
+            type="primary"
             size="small"
-            :disabled="!checkPermission(['certapps_update'])"
-            @click="handleDelete(scope)"
-          >删除</el-button> -->
+            :disabled="!checkPermission(['certapp_access'])"
+            @click="handleAcessunit(scope)"
+          >决定</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     </el-card>
+    <!-- <el-dialog title="决定" :visible.sync="dialogVisible">
+      <el-select>
+
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+  </el-dialog> -->
   </div>
+  
 </template>
 <script>
 import { getDictList } from "@/api/dict"
 import { accessCertapp, getCertapp } from "@/api/certapp"
-import { getCertappunitList } from "@/api/certappunit"
+import { getCertappunitList, accessCertappunit } from "@/api/certappunit"
 import { getCertunitList } from "@/api/certunit";
+import checkPermission from "@/utils/permission";
 export default {
   name: "access",
   props:['certapp'],
   data() {
     return {
+      dialogVisible:false,
       listLoading: false,
       tableData: [],
       formData:{},
@@ -143,6 +164,7 @@ export default {
       },
       conclusionOptions:[],
       nonOptions:[],
+      decisionOptions:[],
       tableUnitData: [],
       listQuery:{
         pageoff:true,
@@ -154,9 +176,16 @@ export default {
      this.getConclusion()
       this.getOptions1()
       this.getOptions2()
-      this.getUnitList();
+      this.getUnitList()
+      this.getDecisionOptions()
   },
   methods:{
+    checkPermission,
+    getDecisionOptions() {
+getDictList({type__code:'cert_decision', pageoff:true}).then(res=>{
+          this.decisionOptions = res.data
+        })
+    },
       getConclusion() {
         getCertapp(this.certapp).then(res=>{
           if(res.data){
@@ -176,12 +205,9 @@ export default {
       },
       getUnitList() {
       this.listLoading = true;
-      getCertappunitList(this.listQuery).then((response) => {
-
-        if (response.data) {
-          
-          this.tableUnitData = response.data;
-          
+      getCertappunitList(this.listQuery).then(res => {
+        if (res.data) {
+          this.tableUnitData = res.data;
         }
         this.listLoading = false;
       });
@@ -193,6 +219,12 @@ export default {
             this.$message.success('成功')
         });
       });
+      },
+      handleAcessunit(val,id){
+        accessCertappunit(id, {'decision':val}).then(res=>{
+          this.$message.success('成功')
+        })
+        
       }
   }
 };
diff --git a/client/src/views/certapp/certapphandle.vue b/client/src/views/certapp/certapphandle.vue
index d7d1a2d..db5ed45 100644
--- a/client/src/views/certapp/certapphandle.vue
+++ b/client/src/views/certapp/certapphandle.vue
@@ -43,11 +43,14 @@
           <el-tab-pane label="现场审核反馈" name="Certappfeedback" v-if="certapp" lazy>
             <Conclusion :certapp="certapp"></Conclusion>
           </el-tab-pane>
+          <el-tab-pane label="安排检测任务" name="Certapptask" v-if="certapp" lazy>
+            <Detectiontask :certapp="certapp"></Detectiontask>
+          </el-tab-pane>
           <el-tab-pane label="认证评定" name="Certappaccess" v-if="certapp" lazy>
             <access :certapp="certapp"></access>
           </el-tab-pane>
-          <el-tab-pane label="安排检测任务" name="Certapptask" v-if="certapp" lazy>
-            <Detectiontask :certapp="certapp"></Detectiontask>
+          <el-tab-pane label="证书颁发" name="Certissue" v-if="certapp" lazy>
+            <issue :certapp="certapp"></issue>
           </el-tab-pane>
         </el-tabs>
       </el-col>
@@ -81,10 +84,11 @@ import QMSform from "@/views/certapp/qmsform"
 import Conclusion from "@/views/audit/conclusion"
 import Member from "@/views/audit/member"
 import access from "@/views/accessment/access"
+import issue from "@/views/certificate/issue"
 import REVIEW from "@/views/certapp/review"
 export default {
 
-  components: { CCCform, Certunit, QMSform, Conclusion, Member, access, CHARGE, REVIEW},
+  components: { CCCform, Certunit, QMSform, Conclusion, Member, access, CHARGE, REVIEW, issue},
 
   props: [],
   data() {
diff --git a/client/src/views/certificate/access.vue b/client/src/views/certificate/access.vue
deleted file mode 100644
index 947a513..0000000
--- a/client/src/views/certificate/access.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-    <div>
-        <el-card >
-          <div slot="header" class="clearfix">
-            <span>认证结果评价</span>
-            <el-button type="primary" >创建</el-button>
-          </div>
-                <el-table
-      ref="elTable"
-      v-loading="listLoading"
-      :data="tableData"
-      style="width: 100%;"
-      border
-      fit
-      stripe
-      highlight-current-row
-    >
-      <el-table-column label="评定表编号">
-        <template slot-scope="scope">{{ scope.row.number }}</template>
-      </el-table-column>
-      <el-table-column label="工厂检查结论">
-        <template slot-scope="scope">
-          {{ scope.row.conclusion }}
-        </template>
-      </el-table-column>
-      <el-table-column label="不符合项分类">
-        <template slot-scope="scope" >{{ scope.row.create_time }}</template>
-      </el-table-column>
-      <el-table-column label="创建时间">
-        <template slot-scope="scope">
-          {{ scope.row.create_time }}
-        </template>
-      </el-table-column>
-    </el-table>
-        </el-card>
-        </div>
-</template>
-<script>
-export default {
-    name:'access',
-    data() {
-        return {
-            listLoading:false,
-            tableData:[]
-        }
-    }
-    
-}
-</script>
\ No newline at end of file
diff --git a/client/src/views/certificate/issue.vue b/client/src/views/certificate/issue.vue
new file mode 100644
index 0000000..ec8b5f9
--- /dev/null
+++ b/client/src/views/certificate/issue.vue
@@ -0,0 +1,136 @@
+<template>
+  <div>
+        <el-table
+      v-loading="listLoading"
+      :data="tableUnitData"
+      style="width: 100%;"
+      border
+      fit
+      stripe
+      highlight-current-row
+      height="380"
+    >
+      <el-table-column type="index" width="50" />
+      <el-table-column label="单元名称">
+        <template slot-scope="scope" v-if="scope.row.certunit_">{{ scope.row.certunit_.name }}</template>
+      </el-table-column>
+      <el-table-column label="证书信息">
+        <template slot-scope="scope">
+          <!-- <el-button
+            type="danger"
+            size="small"
+            :disabled="!checkPermission(['certapps_update'])"
+            @click="handleDelete(scope)"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="认证决定">
+        <template slot-scope="scope" v-if="scope.row.decision_">
+          {{ scope.row.decision_.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="!checkPermission(['certificate_issue'])"
+            @click="handleIssue(scope)"
+          >发证</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+  <el-drawer
+  title="发证"
+  :visible.sync="drawerVisible"
+  direction="rtl"
+  :close-on-click-modal="false">
+  <span>我来啦!</span>
+</el-drawer>
+
+  </div>
+  
+</template>
+<script>
+import { getDictList } from "@/api/dict"
+import { accessCertapp, getCertapp } from "@/api/certapp"
+import { getCertappunitList, accessCertappunit } from "@/api/certappunit"
+import { getCertunitList } from "@/api/certunit";
+import checkPermission from "@/utils/permission";
+export default {
+  name: "issue",
+  props:['certapp'],
+  data() {
+    return {
+      drawerVisible:false,
+      listLoading: false,
+      tableData: [],
+      formData:{},
+      rules:{
+        conclusion: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "blur",
+          },
+        ],
+        nonitems: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "blur",
+          },
+        ],
+        score: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+      },
+      conclusionOptions:[],
+      nonOptions:[],
+      decisionOptions:[],
+      tableUnitData: [],
+      listQuery:{
+        pageoff:true,
+        certapp:this.certapp
+      }
+    };
+  },
+  created() {
+      this.getUnitList()
+      this.getDecisionOptions()
+  },
+  methods:{
+    checkPermission,
+    getDecisionOptions() {
+getDictList({type__code:'cert_decision', pageoff:true}).then(res=>{
+          this.decisionOptions = res.data
+        })
+    },
+      getConclusion() {
+        getCertapp(this.certapp).then(res=>{
+          if(res.data){
+            this.formData = res.data
+          }
+        })
+      },
+      getUnitList() {
+      this.listLoading = true;
+      getCertappunitList(this.listQuery).then(res => {
+        if (res.data) {
+          this.tableUnitData = res.data;
+        }
+        this.listLoading = false;
+      });
+    },
+      handleIssue(scope){
+        this.drawerVisible = true
+        
+      }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/client/src/views/certificate/issueindex.vue b/client/src/views/certificate/issueindex.vue
new file mode 100644
index 0000000..a0bd9a8
--- /dev/null
+++ b/client/src/views/certificate/issueindex.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="app-container">
+        <div style="display:flex">
+          <treeselect 
+          v-model="listQuery.user__dept" 
+          :multiple="false" 
+          :options="deptOptions" 
+          placeholder="所属组织" 
+          :disable-branch-nodes="true" 
+          @input="handleFilter" 
+          style="width: 280px" clearable/>
+          
+          <el-input
+            v-model="listQuery.search"
+            placeholder="姓名/易记码/编号/注册领域"
+            style="width: 300px;margin-left:10px"
+            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"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter"
+          >刷新重置</el-button>
+        </div>
+        <el-table
+          v-loading="listLoading"
+          :data="tableData.results"
+          style="width: 100%;margin-top:10px;"
+          border
+          fit
+          stripe
+          highlight-current-row
+          
+        >
+          <el-table-column type="index" width="50" />
+          <el-table-column label="申请单号">
+            <template slot-scope="scope" v-if="scope.row.number">{{ scope.row.number }}</template>
+          </el-table-column>
+          <el-table-column label="认证领域/分类">
+            <template slot-scope="scope">
+            <el-tag >{{scope.row.cert_field_.name}}</el-tag>
+            <el-tag v-if="scope.row.cccpv_class_" type="warning" style="margin:2px">{{scope.row.cccpv_class_.name}}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请信息" width="300px">
+            <template slot-scope="scope">
+              <div><span style="color:darkblue;font-weight:bold">申请方</span>:{{ scope.row.applicant_v.name }}</div>
+              <div v-if="scope.row.manufacture"><span style="color:darkblue;font-weight:bold">制造商</span>:{{ scope.row.manufacture_v.name }}</div>
+              <div v-if="scope.row.factory"><span style="color:darkblue;font-weight:bold">生产厂</span>:{{ scope.row.factory_v.name }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="当前状态">
+            <template slot-scope="scope">
+              {{ scope.row.status}}
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人">
+            <template slot-scope="scope">{{ scope.row.create_by_.name}}</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 label="操作" fixed="right">
+        <template slot-scope="scope" >
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="!checkPermission(['certapp_accessment'])"
+            @click="handleIssue(scope)"
+          >颁发</el-button>
+          <el-button
+            size="small"
+            :disabled="!checkPermission(['certapp_detail'])"
+            @click="handleCertappDetail(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 { getCertappList, deleteCertapp } from "@/api/certapp"
+import { getOrgList } from "@/api/org"
+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
+      },
+      deptOptions: [],
+      field_list:[]
+    };
+  },
+  created() {
+    this.getList()
+    this.getdeptOptions()
+    this.getfields()
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getCertappList(this.listQuery).then(response => {
+        if (response.data) {
+          this.tableData = response.data
+        }
+        this.listLoading = false
+      });
+    },
+    getdeptOptions() {
+      getOrgList().then(res=>{
+        this.deptOptions = genTree(res.data)
+      })
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20
+      }
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    getfields(){
+      getDictList({type__code:'cert_field'}).then(res=>{
+        let fields = []
+        for(var i=0;i<res.data.length;i++){
+          if(res.data[i].parent!=null){
+            fields.push({id:res.data[i].id, name:res.data[i].name, code:res.data[i].code})
+          }
+        }
+        this.field_list = fields
+      })
+
+    },
+    handleCertappDetail(scope) {
+this.$router.push({
+        name: "Certappdetail",
+        params: { id: scope.row.id },
+      });
+    },
+    handleIssue(scope) {
+this.$router.push({
+        name: "Certissue",
+        params: { id: scope.row.id, action:'issue' },
+      });
+    }
+  }
+};
+</script>
diff --git a/server/apps/crm/serializers.py b/server/apps/crm/serializers.py
index 80906a3..1437c18 100644
--- a/server/apps/crm/serializers.py
+++ b/server/apps/crm/serializers.py
@@ -34,4 +34,9 @@ class CertunitSerializer(serializers.ModelSerializer):
     enterprise = serializers.CharField(read_only=True)
     class Meta:
         model = Certunit
-        fields = '__all__'
\ No newline at end of file
+        fields = '__all__'
+
+class CertunitSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Certunit
+        fields = ['id', 'name']
\ No newline at end of file
diff --git a/server/apps/project/serializers.py b/server/apps/project/serializers.py
index cb19adf..95b9fd6 100644
--- a/server/apps/project/serializers.py
+++ b/server/apps/project/serializers.py
@@ -3,7 +3,7 @@ from rest_framework import serializers
 
 from .models import *
 
-from apps.system.serializers import DictSerializer, UserSimpleSerializer
+from apps.system.serializers import DictSerializer, UserSimpleSerializer, DictSimpleSerializer
 from apps.certset.serializers import StandardSerializer
 from apps.plan.serializers import PlanSerializer
 
@@ -55,11 +55,21 @@ class CertappSerializer(serializers.ModelSerializer):
         queryset = queryset.prefetch_related('cnas_scopes',)
         return queryset
 
+from apps.crm.serializers import CertunitSimpleSerializer
 class CertappunitSerializer(serializers.ModelSerializer):
+    certunit_ = CertunitSimpleSerializer(source = 'certunit', read_only=True)
+    decision_ = DictSimpleSerializer(source = 'decision', read_only=True)
+
     class Meta:
         model = Certappunit
         fields = '__all__'
 
+    @staticmethod
+    def setup_eager_loading(queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.select_related('certunit','decision')
+        return queryset
+
 class EvaluationDetailSerializer(serializers.ModelSerializer):
     class Meta:
         model = EvaluationDetail
diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index f527a4d..ea4b4a8 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -168,7 +168,10 @@ class CertappunitViewset(PageOrNot, ListModelMixin, GenericViewSet):
         单元评定
         """
         obj = self.get_object()
-        obj.decision = Dict.objects.get(pk=request.data['decision'])
+        if request.data['decision']:
+            obj.decision = Dict.objects.get(pk=request.data['decision'])
+        else:
+            obj.decision = None
         obj.save()
         return Response(status=status.HTTP_200_OK)
 
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index 6e3c37a..694ec68 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -39,6 +39,11 @@ class DictSerializer(serializers.ModelSerializer):
     #         return obj.code + obj.name
     #     return obj.name
 
+class DictSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Dict
+        fields = ['pk', 'name', 'code']
+
 class PositionSerializer(serializers.ModelSerializer):
     """
     岗位序列化

From 90b20cc1aa30f1838c304be7fd29f6951231986e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 9 Oct 2020 15:57:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/certificate.js                 | 19 ++++++++++
 client/src/views/accessment/index.vue         |  2 +-
 client/src/views/audit/fee.vue                | 10 ++---
 client/src/views/audit/task.vue               |  4 +-
 client/src/views/certapp/certapp.vue          |  2 +-
 client/src/views/certapp/certapphandle.vue    |  1 +
 client/src/views/certificate/index.vue        |  2 +-
 client/src/views/certificate/issue.vue        | 22 +++++------
 client/src/views/certificate/issueindex.vue   |  2 +-
 client/src/views/plan/handle.vue              |  4 +-
 client/src/views/plan/paichai.vue             | 10 ++---
 client/src/views/plan/plan.vue                | 10 ++---
 client/src/views/project/handle.vue           |  4 +-
 client/src/views/project/project copy.vue     |  8 ++--
 client/src/views/project/project.vue          | 10 ++---
 .../migrations/0002_auto_20201009_1106.py     | 35 ++++++++++++++++++
 .../migrations/0003_auto_20201009_1142.py     | 18 +++++++++
 .../migrations/0004_auto_20201009_1550.py     | 20 ++++++++++
 server/apps/certificate/models.py             | 12 +++++-
 server/apps/certificate/serializers.py        | 22 +++++++++++
 server/apps/certificate/urls.py               | 10 +++++
 server/apps/certificate/views.py              | 37 ++++++++++++++++++-
 server/apps/crm/views.py                      |  1 +
 server/apps/laboratory/models.py              |  3 --
 server/apps/project/filters.py                |  4 +-
 .../migrations/0040_merge_20201009_1104.py    | 14 +++++++
 .../migrations/0041_auto_20201009_1518.py     | 23 ++++++++++++
 .../migrations/0042_auto_20201009_1550.py     | 23 ++++++++++++
 server/apps/project/models.py                 | 25 +++++++------
 server/apps/project/serializers.py            | 11 +++++-
 server/apps/project/views.py                  | 19 +++++-----
 server/server/urls.py                         |  1 +
 32 files changed, 314 insertions(+), 74 deletions(-)
 create mode 100644 client/src/api/certificate.js
 create mode 100644 server/apps/certificate/migrations/0002_auto_20201009_1106.py
 create mode 100644 server/apps/certificate/migrations/0003_auto_20201009_1142.py
 create mode 100644 server/apps/certificate/migrations/0004_auto_20201009_1550.py
 create mode 100644 server/apps/certificate/serializers.py
 create mode 100644 server/apps/certificate/urls.py
 create mode 100644 server/apps/project/migrations/0040_merge_20201009_1104.py
 create mode 100644 server/apps/project/migrations/0041_auto_20201009_1518.py
 create mode 100644 server/apps/project/migrations/0042_auto_20201009_1550.py

diff --git a/client/src/api/certificate.js b/client/src/api/certificate.js
new file mode 100644
index 0000000..4f77876
--- /dev/null
+++ b/client/src/api/certificate.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+export function getCertificateList(query) {
+  return request({
+    url: '/certificate/certificate/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createCertificate(data) {
+  return request({
+    url: '/certificate/certificate/',
+    method: 'post',
+    data
+  })
+}
+
+
diff --git a/client/src/views/accessment/index.vue b/client/src/views/accessment/index.vue
index 3798699..59e6444 100644
--- a/client/src/views/accessment/index.vue
+++ b/client/src/views/accessment/index.vue
@@ -64,7 +64,7 @@
           </el-table-column>
           <el-table-column label="当前状态">
             <template slot-scope="scope">
-              {{ scope.row.status}}
+              {{ scope.row.state}}
             </template>
           </el-table-column>
           <el-table-column label="创建人">
diff --git a/client/src/views/audit/fee.vue b/client/src/views/audit/fee.vue
index 16d3e25..a2ac442 100644
--- a/client/src/views/audit/fee.vue
+++ b/client/src/views/audit/fee.vue
@@ -35,7 +35,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="创建人">
             <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -105,7 +105,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="是否可派差">
             <template slot-scope="scope">
@@ -165,12 +165,12 @@ export default {
     return {
       listLoading: true,
       listQuery: {
-        status: "已受理",
+        state: "已受理",
       },
       listQuery_project: {
         page: 1,
         page_size: 20,
-        status:"待策划"
+        state:"待策划"
       },
       projectData: { count: 0, results: [] },
     };
@@ -193,7 +193,7 @@ export default {
     },
     resetFilter() {
       this.listQuery = {
-        status: "已受理",
+        state: "已受理",
       };
       this.getCertappList_();
     },
diff --git a/client/src/views/audit/task.vue b/client/src/views/audit/task.vue
index 0bce9c8..033b96f 100644
--- a/client/src/views/audit/task.vue
+++ b/client/src/views/audit/task.vue
@@ -62,7 +62,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="审核组成员">
             <template slot-scope="scope" v-if="scope.row.members">
@@ -139,7 +139,7 @@
           </el-table-column>
           <el-table-column label="当前状态">
             <template slot-scope="scope">
-              {{ scope.row.status}}
+              {{ scope.row.state}}
             </template>
           </el-table-column>
           <el-table-column label="审核组成员">
diff --git a/client/src/views/certapp/certapp.vue b/client/src/views/certapp/certapp.vue
index b80d1d2..f579046 100644
--- a/client/src/views/certapp/certapp.vue
+++ b/client/src/views/certapp/certapp.vue
@@ -88,7 +88,7 @@
           </el-table-column>
           <el-table-column label="当前状态">
             <template slot-scope="scope">
-              {{ scope.row.status}}
+              {{ scope.row.state}}
             </template>
           </el-table-column>
           <el-table-column label="创建人">
diff --git a/client/src/views/certapp/certapphandle.vue b/client/src/views/certapp/certapphandle.vue
index db5ed45..95f7d10 100644
--- a/client/src/views/certapp/certapphandle.vue
+++ b/client/src/views/certapp/certapphandle.vue
@@ -93,6 +93,7 @@ export default {
   props: [],
   data() {
     return {
+      // steps:['申请', '受理', ''],
       activeName:'Basic',
       certapp:null,
       certappdata:null,
diff --git a/client/src/views/certificate/index.vue b/client/src/views/certificate/index.vue
index c220e67..a47f996 100644
--- a/client/src/views/certificate/index.vue
+++ b/client/src/views/certificate/index.vue
@@ -59,7 +59,7 @@
           </el-table-column>
           <el-table-column label="当前状态">
             <template slot-scope="scope">
-              {{ scope.row.status}}
+              {{ scope.row.state}}
             </template>
           </el-table-column>
           <el-table-column label="创建人">
diff --git a/client/src/views/certificate/issue.vue b/client/src/views/certificate/issue.vue
index ec8b5f9..59431cf 100644
--- a/client/src/views/certificate/issue.vue
+++ b/client/src/views/certificate/issue.vue
@@ -15,13 +15,8 @@
         <template slot-scope="scope" v-if="scope.row.certunit_">{{ scope.row.certunit_.name }}</template>
       </el-table-column>
       <el-table-column label="证书信息">
-        <template slot-scope="scope">
-          <!-- <el-button
-            type="danger"
-            size="small"
-            :disabled="!checkPermission(['certapps_update'])"
-            @click="handleDelete(scope)"
-          >删除</el-button> -->
+        <template slot-scope="scope" v-if="scope.row.certificate_">
+          {{scope.row.certificate_.number}}
         </template>
       </el-table-column>
       <el-table-column label="认证决定">
@@ -45,8 +40,9 @@
   title="发证"
   :visible.sync="drawerVisible"
   direction="rtl"
-  :close-on-click-modal="false">
-  <span>我来啦!</span>
+  :close-on-click-modal="false"
+  :with-header="false">
+  
 </el-drawer>
 
   </div>
@@ -58,6 +54,7 @@ import { accessCertapp, getCertapp } from "@/api/certapp"
 import { getCertappunitList, accessCertappunit } from "@/api/certappunit"
 import { getCertunitList } from "@/api/certunit";
 import checkPermission from "@/utils/permission";
+import { createCertificate } from "@/api/certificate"
 export default {
   name: "issue",
   props:['certapp'],
@@ -128,8 +125,11 @@ getDictList({type__code:'cert_decision', pageoff:true}).then(res=>{
       });
     },
       handleIssue(scope){
-        this.drawerVisible = true
-        
+        // this.drawerVisible = true
+        createCertificate({certunit:scope.row.certunit, first_send:'2020-06-19', used_start:'2020-06-19', used_end:'2021-11-11'}).then(res=>{
+          this.$message.success('成功')
+          this.getUnitList()
+        })
       }
   }
 };
diff --git a/client/src/views/certificate/issueindex.vue b/client/src/views/certificate/issueindex.vue
index a0bd9a8..261f709 100644
--- a/client/src/views/certificate/issueindex.vue
+++ b/client/src/views/certificate/issueindex.vue
@@ -59,7 +59,7 @@
           </el-table-column>
           <el-table-column label="当前状态">
             <template slot-scope="scope">
-              {{ scope.row.status}}
+              {{ scope.row.state}}
             </template>
           </el-table-column>
           <el-table-column label="创建人">
diff --git a/client/src/views/plan/handle.vue b/client/src/views/plan/handle.vue
index ec4d256..bd3da2f 100644
--- a/client/src/views/plan/handle.vue
+++ b/client/src/views/plan/handle.vue
@@ -45,7 +45,7 @@
           </div>
           <div class="text item">
             <span class="span">当前状态</span>
-            {{project.status}}
+            {{project.state}}
           </div>
           <div class="text item" v-if="project.assign_by_">
             <span class="span">下达人</span>
@@ -111,7 +111,7 @@
             </template>
             </el-table-column>-->
             <el-table-column label="当前状态">
-              <template slot-scope="scope">{{ scope.row.status}}</template>
+              <template slot-scope="scope">{{ scope.row.state}}</template>
             </el-table-column>
             <el-table-column label="受理/确认人">
               <template
diff --git a/client/src/views/plan/paichai.vue b/client/src/views/plan/paichai.vue
index 16d3e25..a2ac442 100644
--- a/client/src/views/plan/paichai.vue
+++ b/client/src/views/plan/paichai.vue
@@ -35,7 +35,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="创建人">
             <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -105,7 +105,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="是否可派差">
             <template slot-scope="scope">
@@ -165,12 +165,12 @@ export default {
     return {
       listLoading: true,
       listQuery: {
-        status: "已受理",
+        state: "已受理",
       },
       listQuery_project: {
         page: 1,
         page_size: 20,
-        status:"待策划"
+        state:"待策划"
       },
       projectData: { count: 0, results: [] },
     };
@@ -193,7 +193,7 @@ export default {
     },
     resetFilter() {
       this.listQuery = {
-        status: "已受理",
+        state: "已受理",
       };
       this.getCertappList_();
     },
diff --git a/client/src/views/plan/plan.vue b/client/src/views/plan/plan.vue
index b328887..9f1271e 100644
--- a/client/src/views/plan/plan.vue
+++ b/client/src/views/plan/plan.vue
@@ -95,7 +95,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="当前状态">
-                <template slot-scope="scope">{{ scope.row.status}}</template>
+                <template slot-scope="scope">{{ scope.row.state}}</template>
               </el-table-column>
               <el-table-column label="创建人">
                 <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -170,7 +170,7 @@
               </template>
             </el-table-column>
             <el-table-column label="当前状态">
-              <template slot-scope="scope">{{ scope.row.status}}</template>
+              <template slot-scope="scope">{{ scope.row.state}}</template>
             </el-table-column>
             <el-table-column label="是否可派差">
               <template slot-scope="scope">
@@ -195,7 +195,7 @@
                     @click="planProject(scope)"
                   >计划</el-button>
                   <el-button
-                    v-if="scope.row.status !='待现场审核'"
+                    v-if="scope.row.state !='待现场审核'"
                     type="primary"
                     size="small"
                     :disabled="!checkPermission(['project_assgin'])||!scope.row.can_paichai"
@@ -270,7 +270,7 @@ export default {
       listQuery_project: {
         page: 1,
         page_size: 20,
-        status: "待策划",
+        state: "待策划",
         planoff: true,
       },
       listQuery2: {
@@ -326,7 +326,7 @@ export default {
     },
     resetFilter() {
       this.listQuery = {
-        status: "已受理",
+        state: "已受理",
       };
       this.getCertappList_();
     },
diff --git a/client/src/views/project/handle.vue b/client/src/views/project/handle.vue
index a6e3fdd..2aea01c 100644
--- a/client/src/views/project/handle.vue
+++ b/client/src/views/project/handle.vue
@@ -25,7 +25,7 @@
             </div>
             <div class="text item">
               <span class="span">当前状态</span>
-              {{project.status}}
+              {{project.state}}
             </div>
             <div class="text item" v-if="project.assign_by_">
               <span class="span">任务下达人</span>
@@ -145,7 +145,7 @@
             </template>
             </el-table-column>-->
             <el-table-column label="当前状态">
-              <template slot-scope="scope">{{ scope.row.status}}</template>
+              <template slot-scope="scope">{{ scope.row.state}}</template>
             </el-table-column>
             <el-table-column label="受理/确认人">
               <template
diff --git a/client/src/views/project/project copy.vue b/client/src/views/project/project copy.vue
index 0d7877c..c899661 100644
--- a/client/src/views/project/project copy.vue	
+++ b/client/src/views/project/project copy.vue	
@@ -48,7 +48,7 @@
           </template>
         </el-table-column>
         <el-table-column label="当前状态">
-          <template slot-scope="scope">{{ scope.row.status}}</template>
+          <template slot-scope="scope">{{ scope.row.state}}</template>
         </el-table-column>
         <el-table-column label="创建人">
           <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -111,7 +111,7 @@
           </template>
         </el-table-column>
         <el-table-column label="当前状态">
-          <template slot-scope="scope">{{ scope.row.status}}</template>
+          <template slot-scope="scope">{{ scope.row.state}}</template>
         </el-table-column>
         <el-table-column label="创建人">
           <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -139,7 +139,7 @@ export default {
       tableData: [],
       listLoading: true,
       listQuery: {
-        status: "已受理",
+        state: "已受理",
       },
       deptOptions: [],
       field_list: [],
@@ -166,7 +166,7 @@ export default {
     },
     resetFilter() {
       this.listQuery = {
-        status: "已受理",
+        state: "已受理",
       };
       this.getList();
     },
diff --git a/client/src/views/project/project.vue b/client/src/views/project/project.vue
index 761c364..292441d 100644
--- a/client/src/views/project/project.vue
+++ b/client/src/views/project/project.vue
@@ -30,7 +30,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态" >
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="创建人">
             <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -44,7 +44,7 @@
         <template slot-scope="scope">
           <el-button-group>
           <el-button
-            v-if="scope.row.status == '创建中'"
+            v-if="scope.row.state == '创建中'"
             type="warning"
             size="small"
             :disabled="!checkPermission(['project_assign'])"
@@ -127,7 +127,7 @@
             </template>
           </el-table-column>
           <el-table-column label="当前状态">
-            <template slot-scope="scope">{{ scope.row.status}}</template>
+            <template slot-scope="scope">{{ scope.row.state}}</template>
           </el-table-column>
           <el-table-column label="创建人">
             <template slot-scope="scope">{{ scope.row.create_by_.name}}</template>
@@ -193,7 +193,7 @@ export default {
       listQuery: {
         page:1,
         page_size:20,
-        status: "已受理",
+        state: "已受理",
       },
       listQuery_project: {
         page:1,
@@ -262,7 +262,7 @@ export default {
     },
     resetFilter() {
       this.listQuery = {
-        status: "已受理",
+        state: "已受理",
       };
       this.getCertappList_();
     },
diff --git a/server/apps/certificate/migrations/0002_auto_20201009_1106.py b/server/apps/certificate/migrations/0002_auto_20201009_1106.py
new file mode 100644
index 0000000..2b0b203
--- /dev/null
+++ b/server/apps/certificate/migrations/0002_auto_20201009_1106.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.0.7 on 2020-10-09 03:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0031_delete_bscodeset'),
+        ('certificate', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='certificate',
+            options={'verbose_name': '证书', 'verbose_name_plural': '证书'},
+        ),
+        migrations.RemoveField(
+            model_name='certificate',
+            name='enterprise',
+        ),
+        migrations.AddField(
+            model_name='certificate',
+            name='number',
+            field=models.CharField(default=1, max_length=100, verbose_name='证书编号'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='certificate',
+            name='state',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='system.Dict', verbose_name='证书状态'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/server/apps/certificate/migrations/0003_auto_20201009_1142.py b/server/apps/certificate/migrations/0003_auto_20201009_1142.py
new file mode 100644
index 0000000..73fd223
--- /dev/null
+++ b/server/apps/certificate/migrations/0003_auto_20201009_1142.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-10-09 03:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certificate', '0002_auto_20201009_1106'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='certificate',
+            old_name='state',
+            new_name='status',
+        ),
+    ]
diff --git a/server/apps/certificate/migrations/0004_auto_20201009_1550.py b/server/apps/certificate/migrations/0004_auto_20201009_1550.py
new file mode 100644
index 0000000..6b80dff
--- /dev/null
+++ b/server/apps/certificate/migrations/0004_auto_20201009_1550.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-10-09 07:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0015_certunit_testorgs'),
+        ('certificate', '0003_auto_20201009_1142'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='certificate',
+            name='certunit',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='certificate_certunit', to='crm.Certunit', verbose_name='关联单元'),
+        ),
+    ]
diff --git a/server/apps/certificate/models.py b/server/apps/certificate/models.py
index 94f6ddb..f869c0f 100644
--- a/server/apps/certificate/models.py
+++ b/server/apps/certificate/models.py
@@ -8,8 +8,16 @@ class Certificate(CommonAModel):
     """
     证书表
     """
-    certunit = models.ForeignKey('crm.Certunit', on_delete=models.CASCADE, null=True, blank=True, verbose_name='关联单元')
-    enterprise = models.ForeignKey('crm.Enterprise', on_delete=models.CASCADE, verbose_name='所属公司')
+    number = models.CharField('证书编号', max_length=100)
+    certunit = models.ForeignKey('crm.Certunit', on_delete=models.CASCADE, null=True, blank=True, verbose_name='关联单元', related_name='certificate_certunit')
     first_send = models.DateField('证书首发时间')
     used_start = models.DateField('有效期开始')
     used_end = models.DateField('有效期结束')
+    status = models.ForeignKey(Dict, verbose_name='证书状态', on_delete=models.CASCADE)
+
+    class Meta:
+        verbose_name = '证书'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.number
diff --git a/server/apps/certificate/serializers.py b/server/apps/certificate/serializers.py
new file mode 100644
index 0000000..b8c21ea
--- /dev/null
+++ b/server/apps/certificate/serializers.py
@@ -0,0 +1,22 @@
+from rest_framework import serializers
+
+from .models import *
+from apps.system.serializers import DictSerializer
+
+
+class CertificateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Certificate
+        fields = '__all__'
+    
+class CertificateCreateSerializer(serializers.ModelSerializer):
+    number = serializers.CharField(read_only = True)
+    status = serializers.CharField(read_only = True)
+    class Meta:
+        model = Certificate
+        fields = '__all__'
+
+class CertificateSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Certificate
+        fields = ['id', 'number']
\ No newline at end of file
diff --git a/server/apps/certificate/urls.py b/server/apps/certificate/urls.py
new file mode 100644
index 0000000..fff16f4
--- /dev/null
+++ b/server/apps/certificate/urls.py
@@ -0,0 +1,10 @@
+from django.urls import path, include
+from .views import *
+from rest_framework import routers
+
+router = routers.DefaultRouter()
+router.register('certificate', CertificateViewSet, basename="certificate")
+
+urlpatterns = [
+    path('', include(router.urls))
+]
\ No newline at end of file
diff --git a/server/apps/certificate/views.py b/server/apps/certificate/views.py
index 91ea44a..e9b81a5 100644
--- a/server/apps/certificate/views.py
+++ b/server/apps/certificate/views.py
@@ -1,3 +1,38 @@
+from apps.certificate.serializers import CertificateSerializer
+import re
+from django.http import request
+from rest_framework.views import APIView
 from django.shortcuts import render
-
+from rest_framework.serializers import ModelSerializer
+from rest_framework.viewsets import ModelViewSet, GenericViewSet
+from rest_framework.response import Response
+from rest_framework import status
+from .models import *
+from apps.system.models import Dict
+from apps.system.permission_data import RbacFilterSet
+from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
+import random
+from rest_framework.decorators import action
+from utils.pagination import PageOrNot
+from .serializers import *
+from rest_framework.exceptions import ParseError, NotAuthenticated
+from django.utils import timezone
 # Create your views here.
+
+class CertificateViewSet(PageOrNot, OptimizationMixin, ModelViewSet):
+    perms_map = {'get': 'certificate_view', 'post':'certificate_create', 'put':'certificate_update'}
+    queryset = Certificate.objects.all()
+    serializer_class = CertificateSerializer
+    ordering = ['-create_time']
+
+    def create(self, request, *args, **kwargs):
+        """
+        证书颁发
+        """
+        serializer = CertificateCreateSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        if Certificate.objects.filter(certunit__id=request.data['certunit']).exists():
+            return Response('该认证单元已存在证书', status = status.HTTP_400_BAD_REQUEST)
+        serializer.save(create_by = self.request.user, number = 'ZS' + str(random.randrange(2000,3000)), status = Dict.objects.get(code='validate_01'))
+        headers = self.get_success_headers(serializer.data)
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
\ No newline at end of file
diff --git a/server/apps/crm/views.py b/server/apps/crm/views.py
index 607b76a..a36ca9a 100644
--- a/server/apps/crm/views.py
+++ b/server/apps/crm/views.py
@@ -9,6 +9,7 @@ from apps.system.permission_data import RbacFilterSet
 from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
 from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.decorators import action
 # Create your views here.
 
 class EnterpriseViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
diff --git a/server/apps/laboratory/models.py b/server/apps/laboratory/models.py
index 291517d..32c49df 100644
--- a/server/apps/laboratory/models.py
+++ b/server/apps/laboratory/models.py
@@ -37,9 +37,6 @@ class TestOrgNotice(CommonBModel):
 
     def __str__(self):
         return self.name
-class DetectionTask(CommonBModel):
-
-    testorg = models.ForeignKey(TestOrg,verbose_name='检测机构', related_name='detectionTask_testorg', on_delete=models.DO_NOTHING)
 
 
     
diff --git a/server/apps/project/filters.py b/server/apps/project/filters.py
index 0090c0c..b57195d 100644
--- a/server/apps/project/filters.py
+++ b/server/apps/project/filters.py
@@ -5,10 +5,10 @@ class CertAppFilter(filters.FilterSet):
     noproject = filters.BooleanFilter(field_name='project', lookup_expr='isnull')
     class Meta:
         model = CertApp
-        fields = ['status', 'noproject']
+        fields = ['state', 'noproject']
 
 class ProjectFilter(filters.FilterSet):
     planoff = filters.BooleanFilter(field_name='plan', lookup_expr='isnull')
     class Meta:
         model = Project
-        fields = ['plan', 'planoff', 'status', 'certapp_project__member_certapp__user']
\ No newline at end of file
+        fields = ['plan', 'planoff', 'state', 'certapp_project__member_certapp__user']
\ No newline at end of file
diff --git a/server/apps/project/migrations/0040_merge_20201009_1104.py b/server/apps/project/migrations/0040_merge_20201009_1104.py
new file mode 100644
index 0000000..262227b
--- /dev/null
+++ b/server/apps/project/migrations/0040_merge_20201009_1104.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-10-09 03:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0034_evaluationdetail_result'),
+        ('project', '0039_auto_20200929_1605'),
+    ]
+
+    operations = [
+    ]
diff --git a/server/apps/project/migrations/0041_auto_20201009_1518.py b/server/apps/project/migrations/0041_auto_20201009_1518.py
new file mode 100644
index 0000000..44e7072
--- /dev/null
+++ b/server/apps/project/migrations/0041_auto_20201009_1518.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.7 on 2020-10-09 07:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0040_merge_20201009_1104'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='certapp',
+            name='status',
+            field=models.CharField(choices=[('申请', '申请'), ('受理', '受理'), ('策划', '策划'), ('现场审核', '现场审核'), ('产品检测', '产品检测'), ('评定', '评定'), ('出证', '出证'), ('归档', '归档')], default='申请', max_length=50, verbose_name='申请状态'),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='status',
+            field=models.CharField(choices=[('创建中', '创建中'), ('待策划', '待策划'), ('策划中', '策划中'), ('审核任务已下达', '审核任务已下达'), ('审核任务已接受', '审核任务已接受'), ('待现场审核', '待现场审核'), ('现场审核中', '现场审核中'), ('任务已反馈', '任务已反馈'), ('归档', '归档')], default='创建中', max_length=50, verbose_name='项目状态'),
+        ),
+    ]
diff --git a/server/apps/project/migrations/0042_auto_20201009_1550.py b/server/apps/project/migrations/0042_auto_20201009_1550.py
new file mode 100644
index 0000000..0d945d3
--- /dev/null
+++ b/server/apps/project/migrations/0042_auto_20201009_1550.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.7 on 2020-10-09 07:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0041_auto_20201009_1518'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='certapp',
+            old_name='status',
+            new_name='state',
+        ),
+        migrations.RenameField(
+            model_name='project',
+            old_name='status',
+            new_name='state',
+        ),
+    ]
diff --git a/server/apps/project/models.py b/server/apps/project/models.py
index 9fb17f2..708545e 100644
--- a/server/apps/project/models.py
+++ b/server/apps/project/models.py
@@ -15,7 +15,7 @@ class Project(CommonBModel):
     """
     认证项目
     """
-    status_choices = (
+    state_choices = (
         ('创建中', '创建中'),
         ('待策划', '待策划'),
         ('策划中', '策划中'),
@@ -23,9 +23,10 @@ class Project(CommonBModel):
         ('审核任务已接受', '审核任务已接受'),
         ('待现场审核', '待现场审核'),
         ('现场审核中', '现场审核中'),
-        ('任务已反馈', '任务已反馈')
+        ('任务已反馈', '任务已反馈'),
+        ('归档', '归档')
     )
-    status = models.CharField('项目状态', choices=status_choices, default='创建中', max_length=50)
+    state = models.CharField('项目状态', choices=state_choices, default='创建中', max_length=50)
     number = models.CharField('项目编号', max_length = 100, null=True, blank=True)
     auditee = models.ForeignKey(Enterprise, related_name='project_auditee', on_delete=models.DO_NOTHING, verbose_name='受审核方')
     auditee_v = JSONField(verbose_name='受审核方', default=dict)
@@ -50,13 +51,15 @@ class CertApp(CommonBModel):
     """
     认证受理
     """
-    status_choices = (
-        ('草稿', '草稿'),
-        ('已申请', '已申请'),
-        ('已受理', '已受理'),
-        ('进行中', '进行中'),
-        ('已中止', '已中止'),
-        ('已完成', '已完成')
+    state_choices = (
+        ('申请', '申请'),
+        ('受理', '受理'),
+        ('策划', '策划'),
+        ('现场审核', '现场审核'),
+        ('产品检测', '产品检测'),
+        ('评定', '评定'),
+        ('出证', '出证'),
+        ('归档', '归档'),
     )
     result_choices = (
         ('未评审', '未评审'),
@@ -71,7 +74,7 @@ class CertApp(CommonBModel):
     applicant_v = JSONField(verbose_name='申请方')
     applicant = models.ForeignKey(Enterprise, related_name='certapp_applicant', on_delete=models.DO_NOTHING)
     
-    status = models.CharField('申请状态', choices=status_choices, default='草稿', max_length=50)
+    state = models.CharField('申请状态', choices=state_choices, default='申请', max_length=50)
     evresult = models.CharField('评审结论', choices = result_choices, default='未评审', max_length=50)
     evremark = models.TextField('备注', blank=True)
     level = models.ForeignKey(Dict, verbose_name='业务级别', related_name='certapp_level', on_delete=models.DO_NOTHING, default=Dict.objects.get(code='ybxm').id)
diff --git a/server/apps/project/serializers.py b/server/apps/project/serializers.py
index 95b9fd6..74058b3 100644
--- a/server/apps/project/serializers.py
+++ b/server/apps/project/serializers.py
@@ -1,3 +1,4 @@
+from apps.project.filters import CertAppFilter
 from apps.plan.models import Plan
 from rest_framework import serializers
 
@@ -56,10 +57,11 @@ class CertappSerializer(serializers.ModelSerializer):
         return queryset
 
 from apps.crm.serializers import CertunitSimpleSerializer
+from apps.certificate.models import Certificate
 class CertappunitSerializer(serializers.ModelSerializer):
     certunit_ = CertunitSimpleSerializer(source = 'certunit', read_only=True)
     decision_ = DictSimpleSerializer(source = 'decision', read_only=True)
-
+    certificate_ = serializers.SerializerMethodField()
     class Meta:
         model = Certappunit
         fields = '__all__'
@@ -69,6 +71,13 @@ class CertappunitSerializer(serializers.ModelSerializer):
         """ Perform necessary eager loading of data. """
         queryset = queryset.select_related('certunit','decision')
         return queryset
+    
+    def get_certificate_(self, obj):
+        certificates = Certificate.objects.filter(certunit = obj.certunit).order_by('-create_time')
+        if certificates.exists():
+            certificate = certificates[0]
+            return {'id':certificate.id,'number':certificate.number}
+        return None
 
 class EvaluationDetailSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index ea4b4a8..918e73b 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -77,7 +77,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
     queryset = CertApp.objects.all()
     serializer_class = CertappSerializer
     ordering = ['-create_time']
-    filterset_fields = ['status', 'project']
+    filterset_fields = ['state', 'project']
     # filterset_class = CertAppFilter
 
 
@@ -99,7 +99,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
         完成受理
         """
         obj = self.get_object()
-        obj.status = '已受理'
+        obj.state = '策划'
         obj.save()
         return Response(status=status.HTTP_200_OK)
 
@@ -127,6 +127,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
         instance = self.get_object()
         instance.conclusion = Dict.objects.get(pk=request.data['conclusion'])
         instance.score = request.data['score']
+        instance.state = '出证'
         instance.save()
         instance.nonitems.clear()
         instance.nonitems.add(*request.data['nonitems'])
@@ -196,7 +197,7 @@ class ProjectViewSet(RbacFilterSet, ModelViewSet):
         if self.request.user is not None:
             instance = serializer.save(create_by = self.request.user, belong_dept=self.request.user.dept)
             if 'certapps' in postdata and postdata['certapps']:
-                CertApp.objects.filter(pk__in = postdata['certapps']).update(project=instance, status='进行中')
+                CertApp.objects.filter(pk__in = postdata['certapps']).update(project=instance, state='进行中')
             headers = self.get_success_headers(serializer.data)
             return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
         else:
@@ -209,12 +210,12 @@ class ProjectViewSet(RbacFilterSet, ModelViewSet):
         项目流转
         """
         obj = self.get_object()
-        if obj.status == '创建中':
-            obj.status = '待策划'
+        if obj.state == '创建中':
+            obj.state = '待策划'
             obj.save()
             return Response(status=status.HTTP_200_OK)
-        elif obj.status == '策划中' and obj.can_paichai:
-            obj.status = '待现场审核'
+        elif obj.state == '策划中' and obj.can_paichai:
+            obj.state = '待现场审核'
             obj.save()
             return Response(status=status.HTTP_200_OK)
         else:
@@ -233,8 +234,8 @@ class ProjectViewSet(RbacFilterSet, ModelViewSet):
             objs = Project.objects.filter(pk__in=projects)
             for i in objs:
                 i.plan=plan
-                if i.status == '待策划':
-                    i.status == '策划中'
+                if i.state == '待策划':
+                    i.state == '策划中'
                 i.save()
         return Response(status=status.HTTP_200_OK)
     
diff --git a/server/server/urls.py b/server/server/urls.py
index ea43c9f..a69767d 100644
--- a/server/server/urls.py
+++ b/server/server/urls.py
@@ -40,6 +40,7 @@ urlpatterns = [
     path('plan/', include('apps.plan.urls')),
     path('audit/', include('apps.audit.urls')),
     path('laboratory/', include('apps.laboratory.urls')),
+    path('certificate/', include('apps.certificate.urls')),
     # path('accessment/', include('apps.accessment.urls')),
     path('docs/', include_docs_urls(title="接口文档",
                                     authentication_classes=[], permission_classes=[])),