From e7ffbe9fab4458d6cbf36a4188a769404d796160 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 29 Sep 2020 16:37:58 +0800
Subject: [PATCH 1/3] certappunti

---
 client/src/api/certapp.js                     |   8 +
 client/src/api/certappunit.js                 |  32 +++
 client/src/styles/index.scss                  |   6 +-
 client/src/views/accessment/access.vue        | 225 ++++++++++++++----
 client/src/views/accessment/index.vue         |  17 +-
 client/src/views/certapp/certunit.vue         |  15 +-
 client/src/views/system/dict.vue              |   7 +-
 .../migrations/0003_auto_20200929_1544.py     |  44 ++++
 .../migrations/0004_auto_20200929_1605.py     |  35 +++
 server/apps/accessment/models.py              |  56 +++--
 server/apps/accessment/serializers.py         |  40 ++--
 server/apps/accessment/urls.py                |  16 +-
 server/apps/accessment/views.py               |  51 ++--
 .../migrations/0039_auto_20200929_1605.py     |  35 +++
 server/apps/project/models.py                 |  11 +
 server/apps/project/serializers.py            |  22 +-
 server/apps/project/urls.py                   |   1 +
 server/apps/project/views.py                  |  36 ++-
 server/apps/system/serializers.py             |   4 +
 server/server/urls.py                         |   2 +-
 20 files changed, 504 insertions(+), 159 deletions(-)
 create mode 100644 client/src/api/certappunit.js
 create mode 100644 server/apps/accessment/migrations/0003_auto_20200929_1544.py
 create mode 100644 server/apps/accessment/migrations/0004_auto_20200929_1605.py
 create mode 100644 server/apps/project/migrations/0039_auto_20200929_1605.py

diff --git a/client/src/api/certapp.js b/client/src/api/certapp.js
index e942f60..06bca08 100644
--- a/client/src/api/certapp.js
+++ b/client/src/api/certapp.js
@@ -54,3 +54,11 @@ export function getCertapp(id) {
     method: 'get',
   })
 }
+
+export function accessCertapp(id, data) {
+  return request({
+    url: `/project/certapp/${id}/access/`,
+    method: 'put',
+    data
+  })
+}
\ No newline at end of file
diff --git a/client/src/api/certappunit.js b/client/src/api/certappunit.js
new file mode 100644
index 0000000..27d943d
--- /dev/null
+++ b/client/src/api/certappunit.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function getCertappunitList(query) {
+  return request({
+    url: '/project/certappunit/',
+    method: 'get',
+    params: query
+  })
+}
+
+// export function createAccess(data) {
+//   return request({
+//     url: '/accessment/certass/',
+//     method: 'post',
+//     data
+//   })
+// }
+
+// export function updateAccess(id, data) {
+//   return request({
+//     url: `/accessment/certass/${id}/`,
+//     method: 'put',
+//     data
+//   })
+// }
+
+// export function deleteAccess(id) {
+//   return request({
+//     url: `/accessment/certass/${id}/`,
+//     method: 'delete'
+//   })
+// }
\ No newline at end of file
diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss
index 797311f..b47aaea 100644
--- a/client/src/styles/index.scss
+++ b/client/src/styles/index.scss
@@ -98,6 +98,6 @@ div:focus {
 .el-button+.el-button {
   margin-left: 1px;
 }
-.el-button {
-  border-radius: 0px;
-}
\ No newline at end of file
+// .el-button {
+//   border-radius: 0px;
+// }
\ No newline at end of file
diff --git a/client/src/views/accessment/access.vue b/client/src/views/accessment/access.vue
index 65a662c..e243248 100644
--- a/client/src/views/accessment/access.vue
+++ b/client/src/views/accessment/access.vue
@@ -4,63 +4,196 @@
       <div slot="header" class="clearfix">
         <span>评定结论</span>
       </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-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-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px" style="margin-top:10px">
+      <el-col :xs="24" :md="12">
+        <el-form-item label="工厂检查结论" prop="conclusion">
+          <el-select
+            v-model="formData.conclusion"
+            placeholder="请选择工厂检查结论"
+            clearable
+            :style="{width: '100%'}"
+          >
+            <el-option
+              v-for="(item, index) in conclusionOptions"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="12">
+        <el-form-item label="不符合项" prop="nonitems" >
+          <el-select
+            v-model="formData.nonitems"
+            placeholder="请选择不符合项"
+            clearable
+            multiple
+            collapse-tags
+            :style="{width: '100%'}"
+          >
+            <el-option
+              v-for="(item, index) in nonOptions"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="12">
+        <el-form-item label="审核质量评分" prop="score" >
+          <el-input-number v-model="formData.score" :min="1" :max="100" style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <div style="text-align:center">
+      <el-button type="primary" @click="save">保存</el-button>
+      </div>
+    </el-form>
+    </el-card>
+      <el-card style="margin-top:6px">
+      <div slot="header" class="clearfix">
+        <span>业务涉及的认证单元</span>
+      </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" >{{ scope.row.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">
+          <!-- <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">
+          <!-- <el-button
+            type="danger"
+            size="small"
+            :disabled="!checkPermission(['certapps_update'])"
+            @click="handleDelete(scope)"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
     </el-card>
   </div>
 </template>
 <script>
+import { getDictList } from "@/api/dict"
+import { accessCertapp, getCertapp } from "@/api/certapp"
+import { getCertappunitList } from "@/api/certappunit"
+import { getCertunitList } from "@/api/certunit";
 export default {
   name: "access",
+  props:['certapp'],
   data() {
     return {
       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:[],
+      tableUnitData: [],
+      listQuery:{
+        pageoff:true,
+        certapp:this.certapp
+      }
     };
   },
+  created() {
+     this.getConclusion()
+      this.getOptions1()
+      this.getOptions2()
+      this.getUnitList();
+  },
+  methods:{
+      getConclusion() {
+        getCertapp(this.certapp).then(res=>{
+          if(res.data){
+            this.formData = res.data
+          }
+        })
+      },
+      getOptions1() {
+        getDictList({type__code:'factory_check_conclusion', pageoff:true}).then(res=>{
+          this.conclusionOptions = res.data
+        })
+      },
+      getOptions2() {
+        getDictList({type__code:'factory_check_noitem', pageoff:true}).then(res=>{
+          this.nonOptions = res.data
+        })
+      },
+      getUnitList() {
+      this.listLoading = true;
+      getCertappunitList(this.listQuery).then((response) => {
+
+        if (response.data) {
+          
+          this.tableUnitData = response.data;
+          
+        }
+        this.listLoading = false;
+      });
+    },
+      save() {
+              this.$refs["elForm"].validate((valid) => {
+        if (!valid) return;
+          accessCertapp(this.certapp, this.formData).then((res) => {
+            this.$message.success('成功')
+        });
+      });
+      }
+  }
 };
 </script>
\ No newline at end of file
diff --git a/client/src/views/accessment/index.vue b/client/src/views/accessment/index.vue
index c220e67..3798699 100644
--- a/client/src/views/accessment/index.vue
+++ b/client/src/views/accessment/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-        <div style="display:flex">
+        <el-row :gutter="6">
+          <el-col :xs="24" :md="4">
           <treeselect 
           v-model="listQuery.user__dept" 
           :multiple="false" 
@@ -8,15 +9,18 @@
           placeholder="所属组织" 
           :disable-branch-nodes="true" 
           @input="handleFilter" 
-          style="width: 280px" clearable/>
-          
+          style="width: 100%" clearable/>
+          </el-col>
+          <el-col :xs="24" :md="4">
           <el-input
             v-model="listQuery.search"
             placeholder="姓名/易记码/编号/注册领域"
-            style="width: 300px;margin-left:10px"
+            style="width: 100%"
             class="filter-item"
             @keyup.enter.native="handleFilter"
           />
+          </el-col>
+          <el-col :xs="24" :md="4">
           <el-button
             class="filter-item"
             type="primary"
@@ -28,8 +32,9 @@
             type="primary"
             icon="el-icon-refresh-left"
             @click="resetFilter"
-          >刷新重置</el-button>
-        </div>
+          >刷新</el-button>
+          </el-col>
+        </el-row>
         <el-table
           v-loading="listLoading"
           :data="tableData.results"
diff --git a/client/src/views/certapp/certunit.vue b/client/src/views/certapp/certunit.vue
index 77b5383..db85a3b 100644
--- a/client/src/views/certapp/certunit.vue
+++ b/client/src/views/certapp/certunit.vue
@@ -2,7 +2,7 @@
   <div>
     <el-table
       v-loading="listLoading"
-      :data="tableData.results"
+      :data="tableData"
       style="width: 100%;"
       border
       fit
@@ -37,14 +37,6 @@
         </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"
-    />
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" style="margin-top:10px">
       <el-col :xs="24" :md="12">
         <el-form-item label="实施规则" prop="implementrule">
@@ -154,11 +146,10 @@ export default {
   props:['certapp'],
   data() {
     return {
-      tableData: { count: 0 },
+      tableData: [],
       listLoading: true,
       listQuery: {
-        page: 1,
-        page_size: 20,
+        pageoff:true,
         certappunit_certunit__certapp:this.certapp
       },
       formData: {
diff --git a/client/src/views/system/dict.vue b/client/src/views/system/dict.vue
index e001527..a1f0bc1 100644
--- a/client/src/views/system/dict.vue
+++ b/client/src/views/system/dict.vue
@@ -121,7 +121,7 @@
           <el-input v-model="dicttype.code" placeholder="代号" />
         </el-form-item>
         <el-form-item label="父级" prop="parent">
-          <treeselect v-model="dicttype.parent" :multiple="false" :options="dictTypeData" placeholder="父级"/>
+          <treeselect v-model="dicttype.parent" :multiple="false" :options="dictTypeData" placeholder="父级" />
         </el-form-item>
       </el-form>
       <div style="text-align:right;">
@@ -309,6 +309,9 @@ export default {
         })
     },
     async confirm1(form) {
+      if(this.dicttype.parent==undefined){
+        this.dicttype.parent = null
+      }
       this.$refs[form].validate(valid => {
         if (valid) {
           const isEdit = this.dgT1 === 'edit'
@@ -363,7 +366,7 @@ export default {
           return false
         }
       })
-    }
+    },
   }
 }
 </script>
diff --git a/server/apps/accessment/migrations/0003_auto_20200929_1544.py b/server/apps/accessment/migrations/0003_auto_20200929_1544.py
new file mode 100644
index 0000000..fe7f4f5
--- /dev/null
+++ b/server/apps/accessment/migrations/0003_auto_20200929_1544.py
@@ -0,0 +1,44 @@
+# Generated by Django 3.0.7 on 2020-09-29 07:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0031_delete_bscodeset'),
+        ('project', '0038_certappunit_testorg'),
+        ('accessment', '0002_auto_20200921_1444'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='certaccess',
+        ),
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='certificate',
+        ),
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='certunit',
+        ),
+        migrations.AddField(
+            model_name='unitaccess',
+            name='certappunit',
+            field=models.OneToOneField(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='unitaccess_certappunit', to='project.Certappunit'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='certaccess',
+            name='certapp',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='certaccess_certapp', to='project.CertApp'),
+        ),
+        migrations.AlterField(
+            model_name='unitaccess',
+            name='decision',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unitaccess_decision', to='system.Dict', verbose_name='认证决定'),
+        ),
+    ]
diff --git a/server/apps/accessment/migrations/0004_auto_20200929_1605.py b/server/apps/accessment/migrations/0004_auto_20200929_1605.py
new file mode 100644
index 0000000..ad0df4b
--- /dev/null
+++ b/server/apps/accessment/migrations/0004_auto_20200929_1605.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.0.7 on 2020-09-29 08:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accessment', '0003_auto_20200929_1544'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='certappunit',
+        ),
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='create_by',
+        ),
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='decision',
+        ),
+        migrations.RemoveField(
+            model_name='unitaccess',
+            name='update_by',
+        ),
+        migrations.DeleteModel(
+            name='Certaccess',
+        ),
+        migrations.DeleteModel(
+            name='Unitaccess',
+        ),
+    ]
diff --git a/server/apps/accessment/models.py b/server/apps/accessment/models.py
index 30b8c1b..fe9963f 100644
--- a/server/apps/accessment/models.py
+++ b/server/apps/accessment/models.py
@@ -5,38 +5,36 @@ from rest_framework.exceptions import ParseError
 from simple_history.models import HistoricalRecords
 
 from apps.certset.models import ImplementRule, UnitType, EvaluationItem, Standard
-from apps.crm.models import Enterprise
-from apps.project.models import CertApp
-from apps.system.models import CommonAModel, CommonBModel, Dict, User
+# from apps.crm.models import Enterprise
+# from apps.project.models import CertApp
+# from apps.system.models import CommonAModel, CommonBModel, Dict, User
 
-class Certaccess(CommonAModel):
-    """
-    业务评定
-    """
-    certapp = models.ForeignKey('project.certapp', on_delete=models.CASCADE, related_name='unitaccess_certapp')
-    conclusion = models.ForeignKey(Dict, verbose_name='工厂检查结论', on_delete=models.CASCADE, related_name='certaccess_conclusion')
-    nonitems = models.ManyToManyField(Dict, verbose_name='不符合项目', related_name='certaccess_nonitems')
-    score = models.IntegerField('审核质量评分', default=0)
+# class Certaccess(CommonAModel):
+#     """
+#     业务评定
+#     """
+#     certapp = models.ForeignKey('project.certapp', on_delete=models.CASCADE, related_name='certaccess_certapp')
+#     conclusion = models.ForeignKey(Dict, verbose_name='工厂检查结论', on_delete=models.CASCADE, related_name='certaccess_conclusion')
+#     nonitems = models.ManyToManyField(Dict, verbose_name='不符合项目', related_name='certaccess_nonitems')
+#     score = models.IntegerField('审核质量评分', default=0)
 
-    class Meta:
-        verbose_name = '业务评定'
-        verbose_name_plural = verbose_name
+#     class Meta:
+#         verbose_name = '业务评定'
+#         verbose_name_plural = verbose_name
 
-    def __str__(self):
-        return self.certapp.number
+#     def __str__(self):
+#         return self.certapp.number
 
-class Unitaccess(CommonAModel):
-    """
-    单元评定
-    """
-    certunit = models.ForeignKey('crm.Certunit', on_delete=models.CASCADE, related_name='unitaccess_certunit')
-    certificate = models.ForeignKey('certificate.Certificate', on_delete=models.CASCADE, null=True, blank=True, related_name='unitaccess_certificate')
-    decision = models.ForeignKey(Dict,verbose_name='认证决定', on_delete=models.CASCADE)
-    certaccess = models.ForeignKey('accessment.Certaccess', on_delete=models.CASCADE, related_name='unitaccess_certaccess')
+# class Unitaccess(CommonAModel):
+#     """
+#     单元评定
+#     """
+#     certappunit = models.OneToOneField('project.Certappunit', on_delete=models.CASCADE, related_name='unitaccess_certappunit')
+#     decision = models.ForeignKey(Dict,verbose_name='认证决定', on_delete=models.CASCADE, related_name='unitaccess_decision')
 
-    class Meta:
-        verbose_name = '认证单元评定'
-        verbose_name_plural = verbose_name
+#     class Meta:
+#         verbose_name = '认证单元评定'
+#         verbose_name_plural = verbose_name
 
-    def __str__(self):
-        return self.decision
\ No newline at end of file
+#     def __str__(self):
+#         return self.decision
\ No newline at end of file
diff --git a/server/apps/accessment/serializers.py b/server/apps/accessment/serializers.py
index bf299e6..d26d7f6 100644
--- a/server/apps/accessment/serializers.py
+++ b/server/apps/accessment/serializers.py
@@ -1,26 +1,26 @@
-from apps.system.models import Dict
-from rest_framework import serializers
+# from apps.system.models import Dict
+# from rest_framework import serializers
 
-from .models import Certaccess, Unitaccess
+# from .models import Certaccess, Unitaccess
 
-from apps.system.serializers import DictSerializer
+# from apps.system.serializers import DictSerializer
 
-class CertaccessSerializer(serializers.ModelSerializer):
-    conclusion_ = DictSerializer(source='conclusion', read_only=True)
-    nonitems = DictSerializer(source='nonitems', read_only=True)
+# class CertaccessSerializer(serializers.ModelSerializer):
+#     conclusion_ = DictSerializer(source='conclusion', read_only=True)
+#     nonitems_ = DictSerializer(source='nonitems', read_only=True, many=True)
 
-    class Meta:
-        model = Certaccess
-        fields = '__all__'
+#     class Meta:
+#         model = Certaccess
+#         fields = '__all__'
     
-    @staticmethod
-    def setup_eager_loading(queryset):
-        """ Perform necessary eager loading of data. """
-        queryset = queryset.select_related('conclusion',)
-        queryset = queryset.prefetch_related('nonitems',)
-        return queryset
+#     @staticmethod
+#     def setup_eager_loading(queryset):
+#         """ Perform necessary eager loading of data. """
+#         queryset = queryset.select_related('conclusion',)
+#         queryset = queryset.prefetch_related('nonitems',)
+#         return queryset
 
-class UnitaccessSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Unitaccess
-        fields = '__all__'
\ No newline at end of file
+# class UnitaccessSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = Unitaccess
+#         fields = '__all__'
\ No newline at end of file
diff --git a/server/apps/accessment/urls.py b/server/apps/accessment/urls.py
index 8042ce8..58dbe7f 100644
--- a/server/apps/accessment/urls.py
+++ b/server/apps/accessment/urls.py
@@ -1,10 +1,10 @@
-from django.urls import path, include
-from .views import CertaccessViewSet
-from rest_framework import routers
+# from django.urls import path, include
+# from .views import CertaccessViewSet
+# from rest_framework import routers
 
-router = routers.DefaultRouter()
-router.register('certaccess', CertaccessViewSet, basename="certaccess")
+# router = routers.DefaultRouter()
+# router.register('certaccess', CertaccessViewSet, basename="certaccess")
 
-urlpatterns = [
-    path('', include(router.urls))
-]
\ No newline at end of file
+# urlpatterns = [
+#     path('', include(router.urls))
+# ]
\ No newline at end of file
diff --git a/server/apps/accessment/views.py b/server/apps/accessment/views.py
index 31c43f3..4f8b27b 100644
--- a/server/apps/accessment/views.py
+++ b/server/apps/accessment/views.py
@@ -1,29 +1,30 @@
-import random
+# import random
 
-from django.shortcuts import render
-from django.utils import timezone
-from rest_framework import status
-from rest_framework.decorators import action
-from rest_framework.exceptions import NotAuthenticated, ParseError
-from rest_framework.response import Response
-from rest_framework.serializers import ModelSerializer
-from rest_framework.views import APIView
-from rest_framework.viewsets import GenericViewSet, ModelViewSet
+# from django.shortcuts import render
+# from django.utils import timezone
+# from rest_framework import status
+# from rest_framework.decorators import action
+# from rest_framework.exceptions import NotAuthenticated, ParseError
+# from rest_framework.response import Response
+# from rest_framework.serializers import ModelSerializer
+# from rest_framework.views import APIView
+# from rest_framework.viewsets import GenericViewSet, ModelViewSet
 
-from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
-from apps.system.models import Dict
-from apps.system.permission_data import RbacFilterSet
-from utils.pagination import PageOrNot
+# from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
+# from apps.system.models import Dict
+# from apps.system.permission_data import RbacFilterSet
+# from utils.pagination import PageOrNot
 
-from .models import *
-from .serializers import *
+# from .models import *
+# from .serializers import *
 
-# Create your views here.
-class CertaccessViewSet(CreateUpdateCustomMixin, ModelViewSet):
-    """
-    业务评定
-    """
-    perms_map = {'get': 'certapp_view', 'post':'certaccess_create', 'put':'certaccess_update','delete': 'certaccess_delete'}
-    queryset = Certaccess.objects.all()
-    serializer_class = CertaccessSerializer
-    ordering = ['-create_time']
\ No newline at end of file
+# # Create your views here.
+# class CertaccessViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
+#     """
+#     业务评定
+#     """
+#     perms_map = {'get': 'certapp_view', 'post':'certaccess_create', 'put':'certaccess_update','delete': 'certaccess_delete'}
+#     queryset = Certaccess.objects.all()
+#     serializer_class = CertaccessSerializer
+#     filterset_fields = ['certapp']
+#     ordering = ['-create_time']
\ No newline at end of file
diff --git a/server/apps/project/migrations/0039_auto_20200929_1605.py b/server/apps/project/migrations/0039_auto_20200929_1605.py
new file mode 100644
index 0000000..eb83050
--- /dev/null
+++ b/server/apps/project/migrations/0039_auto_20200929_1605.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.0.7 on 2020-09-29 08:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0031_delete_bscodeset'),
+        ('project', '0038_certappunit_testorg'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='certapp',
+            name='conclusion',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='certaccess_conclusion', to='system.Dict', verbose_name='工厂检查结论'),
+        ),
+        migrations.AddField(
+            model_name='certapp',
+            name='nonitems',
+            field=models.ManyToManyField(related_name='certaccess_nonitems', to='system.Dict', verbose_name='不符合项目'),
+        ),
+        migrations.AddField(
+            model_name='certapp',
+            name='score',
+            field=models.IntegerField(default=0, verbose_name='审核质量评分'),
+        ),
+        migrations.AddField(
+            model_name='certappunit',
+            name='decision',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='unitaccess_decision', to='system.Dict', verbose_name='认证决定'),
+        ),
+    ]
diff --git a/server/apps/project/models.py b/server/apps/project/models.py
index 8343c90..eea3c6a 100644
--- a/server/apps/project/models.py
+++ b/server/apps/project/models.py
@@ -105,6 +105,12 @@ class CertApp(CommonBModel):
     review_amount = models.FloatField('复评金额',null=True, blank=True, default=0)  
     system_standard = models.ForeignKey(Dict, verbose_name='依据的体系标准',null=True, blank=True, related_name='certapp_system_standard', on_delete=models.DO_NOTHING)
     risk = models.CharField('风险系数', choices=risk_choices, max_length=50, null=True, blank=True)
+
+    # 认证评定字段
+    conclusion = models.ForeignKey(Dict, verbose_name='工厂检查结论', on_delete=models.CASCADE, related_name='certaccess_conclusion', null=True, blank=True)
+    nonitems = models.ManyToManyField(Dict, verbose_name='不符合项目', related_name='certaccess_nonitems')
+    score = models.IntegerField('审核质量评分', default=0)
+
     class Meta:
         verbose_name = '认证受理'
         verbose_name_plural = verbose_name
@@ -205,6 +211,11 @@ class Certappunit(CommonBModel):
     certunit = models.ForeignKey('crm.Certunit', verbose_name='单元', on_delete=models.CASCADE, related_name='certappunit_certunit')
     certapp = models.ForeignKey(CertApp, verbose_name='所属业务', on_delete = models.CASCADE, related_name='certappunit_certapp')
     testorg = models.ForeignKey('laboratory.TestOrg', verbose_name='检测机构', on_delete=models.SET_NULL, null=True, blank=True)
+
+    # 认证评定
+    decision = models.ForeignKey(Dict,verbose_name='认证决定', on_delete=models.CASCADE, related_name='unitaccess_decision', null=True, blank=True)
+
+
     class Meta:
         verbose_name = '认证单元'
         verbose_name_plural = verbose_name
diff --git a/server/apps/project/serializers.py b/server/apps/project/serializers.py
index 5822e6b..cb19adf 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, UserListSerializer
+from apps.system.serializers import DictSerializer, UserSimpleSerializer
 from apps.certset.serializers import StandardSerializer
 from apps.plan.serializers import PlanSerializer
 
@@ -42,11 +42,23 @@ class CertappSerializer(serializers.ModelSerializer):
     cert_field_ = DictSerializer(source='cert_field', read_only=True)
     cccpv_class_ = DictSerializer(source='cccpv_class' , read_only=True)
     cnas_scopes_ = DictSerializer(source='cnas_scopes', many=True , read_only=True)
-    create_by_ = UserListSerializer(source='create_by', read_only=True)
-    accept_by_ = UserListSerializer(source='accept_by', read_only=True)
+    create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
+    accept_by_ = UserSimpleSerializer(source='accept_by', read_only=True)
     class Meta:
         model = CertApp
         fields = '__all__'
+    
+    @staticmethod
+    def setup_eager_loading(queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.select_related('cert_field','cccpv_class', 'create_by', 'accept_by')
+        queryset = queryset.prefetch_related('cnas_scopes',)
+        return queryset
+
+class CertappunitSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Certappunit
+        fields = '__all__'
 
 class EvaluationDetailSerializer(serializers.ModelSerializer):
     class Meta:
@@ -65,8 +77,8 @@ class EvaluationDetailSerializer(serializers.ModelSerializer):
 
 
 class ProjectSerializer(serializers.ModelSerializer):
-    create_by_ = UserListSerializer(source='create_by', read_only=True)
-    assign_by_ = UserListSerializer(source='assign_by', read_only=True)
+    create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
+    assign_by_ = UserSimpleSerializer(source='assign_by', read_only=True)
     certapps = serializers.SerializerMethodField()
     plan_ = PlanSerializer(source='plan', read_only=True)
     
diff --git a/server/apps/project/urls.py b/server/apps/project/urls.py
index 225e7ea..60d8ce5 100644
--- a/server/apps/project/urls.py
+++ b/server/apps/project/urls.py
@@ -6,6 +6,7 @@ router = routers.DefaultRouter()
 router.register('application', ApplicationViewSet, basename="application")
 router.register('subapplication', SubApplicationViewSet, basename="subapplication")
 router.register('certapp', CertappViewset, basename="certapp")
+router.register('certappunit', CertappunitViewset, basename="certappunit")
 router.register('evaluationdetail', EvaluationDetailViewset, basename="evaluationdetail")
 router.register('project', ProjectViewSet, basename="project")
 urlpatterns = [
diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index 9118981..19a9975 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -1,3 +1,5 @@
+import re
+from django.http import request
 from rest_framework.views import APIView
 from apps import project
 from django.shortcuts import render
@@ -16,6 +18,7 @@ from .filters import *
 from utils.pagination import PageOrNot
 from rest_framework.exceptions import ParseError, NotAuthenticated
 from django.utils import timezone
+
 # Create your views here.
 class ApplicationViewSet(RbacFilterSet, ModelViewSet):
     """
@@ -89,7 +92,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
     
-    @action(methods=['put'], detail=True, perms_map={'put':'complete_certapp'},
+    @action(methods=['put'], detail=True, perms_map={'put':'certapp_complete'},
             url_name='complete_certapp')
     def complete(self, request, pk=None):
         """
@@ -100,7 +103,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
         obj.save()
         return Response(status=status.HTTP_200_OK)
 
-    @action(methods=['put'], detail=False, perms_map={'put':'review_certapp'},
+    @action(methods=['put'], detail=False, perms_map={'put':'certapp_review'},
             url_name='review_certapp')
     def review(self, request, pk=None):
         """
@@ -113,6 +116,23 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
             instance.cert_app.add(*certapps)
         return Response(status=status.HTTP_200_OK)
 
+    @action(methods=['put'], detail=True, perms_map={'put':'certapp_access'}, url_name='certapp_access')   
+    def access(self, request, pk=None):
+        """
+        认证评定
+        """
+        # instance, ok = Certaccess.objects.get_or_create(certapp=self.get_object(), defaults={'certapp':self.get_object()
+        # , 'conclusion':Dict.objects.get(pk=request.data['conclusion']), 'score':request.data['score']})
+        # if not ok:
+        instance = self.get_object()
+        instance.conclusion = Dict.objects.get(pk=request.data['conclusion'])
+        instance.score = request.data['score']
+        instance.save()
+        instance.nonitems.clear()
+        instance.nonitems.add(*request.data['nonitems'])
+        return Response(status=status.HTTP_200_OK)
+
+
 class EvaluationDetailViewset(CreateUpdateCustomMixin, PageOrNot,ModelViewSet):
     """
     受理信息
@@ -125,7 +145,19 @@ class EvaluationDetailViewset(CreateUpdateCustomMixin, PageOrNot,ModelViewSet):
     ordering = ['-create_time']
     
 
+from rest_framework.mixins import ListModelMixin
+class CertappunitViewset(PageOrNot, ListModelMixin, GenericViewSet):
+    perms_map={'*':'certapp_view'}
+    queryset = Certappunit.objects.all()
+    serializer_class = CertappunitSerializer
+    ordering= ['-id']
 
+    @action(methods=['put'], detail=True, perms_map={'put':'certapp_access'}, url_name='certappunit_access')   
+    def access(self, request, pk=None):
+        obj = self.get_object()
+        obj.decision = Dict.objects.get(pk=request.data['decision'])
+        obj.save()
+        return Response(status=status.HTTP_200_OK)
 
 class ProjectViewSet(RbacFilterSet, ModelViewSet):
     perms_map = {'get': 'project_view', 'post':'project_create', 'put':'project_update','delete': 'project_delete'}
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index 4628289..6e3c37a 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -78,6 +78,10 @@ class OrganizationSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
+class UserSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ['id', 'name', 'username']
 class UserListSerializer(serializers.ModelSerializer):
     """
     用户列表序列化
diff --git a/server/server/urls.py b/server/server/urls.py
index f2f69e6..ea43c9f 100644
--- a/server/server/urls.py
+++ b/server/server/urls.py
@@ -40,7 +40,7 @@ urlpatterns = [
     path('plan/', include('apps.plan.urls')),
     path('audit/', include('apps.audit.urls')),
     path('laboratory/', include('apps.laboratory.urls')),
-    path('accessment/', include('apps.accessment.urls')),
+    # path('accessment/', include('apps.accessment.urls')),
     path('docs/', include_docs_urls(title="接口文档",
                                     authentication_classes=[], permission_classes=[])),
     path('signature/', GenSignature.as_view(), name='gen_signature'),

From 7acaddb46009a5cc8b0942d0754625f626344d79 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 29 Sep 2020 16:39:14 +0800
Subject: [PATCH 2/3] certappunti

---
 server/apps/project/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index 19a9975..b0b89e2 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -154,6 +154,9 @@ class CertappunitViewset(PageOrNot, ListModelMixin, GenericViewSet):
 
     @action(methods=['put'], detail=True, perms_map={'put':'certapp_access'}, url_name='certappunit_access')   
     def access(self, request, pk=None):
+        """
+        单元评定
+        """
         obj = self.get_object()
         obj.decision = Dict.objects.get(pk=request.data['decision'])
         obj.save()

From 23d2b81c5189222868b6514beef21baf11f21178 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 29 Sep 2020 16:52:06 +0800
Subject: [PATCH 3/3] certappunit

---
 client/src/views/certapp/certapphandle.vue |   9 +-
 client/src/views/certapp/detectiontask.vue | 320 ---------------------
 2 files changed, 4 insertions(+), 325 deletions(-)
 delete mode 100644 client/src/views/certapp/detectiontask.vue

diff --git a/client/src/views/certapp/certapphandle.vue b/client/src/views/certapp/certapphandle.vue
index a9d5884..d7d1a2d 100644
--- a/client/src/views/certapp/certapphandle.vue
+++ b/client/src/views/certapp/certapphandle.vue
@@ -73,19 +73,18 @@
 </template>
 <script>
 import CCCform from "@/views/certapp/cccform"
-  import Certunit from "@/views/certapp/certunit"
-  import CHARGE from "@/views/certapp/charge"
+import Certunit from "@/views/certapp/certunit"
+import CHARGE from "@/views/certapp/charge"
 import { getCertapp, completeCertapp } from "@/api/certapp"
 import router from '@/router';
 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 REVIEW from "@/views/certapp/review"
-  import Detectiontask from "@/views/certapp/detectiontask"
+import REVIEW from "@/views/certapp/review"
 export default {
 
-  components: { CCCform, Certunit, QMSform,Productunit, Conclusion, Member, access, CHARGE, REVIEW},
+  components: { CCCform, Certunit, QMSform, Conclusion, Member, access, CHARGE, REVIEW},
 
   props: [],
   data() {
diff --git a/client/src/views/certapp/detectiontask.vue b/client/src/views/certapp/detectiontask.vue
deleted file mode 100644
index 12f2a3b..0000000
--- a/client/src/views/certapp/detectiontask.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
-  <div>
-    <el-table
-      v-loading="listLoading"
-      :data="tableData.results"
-      style="width: 100%;"
-      border
-      fit
-      stripe
-      highlight-current-row
-      height="380"
-      @row-click="rowClick"
-    >
-      <el-table-column type="index" width="50" />
-      <el-table-column label="单元名称">
-        <template slot-scope="scope" >{{ scope.row.name }}</template>
-      </el-table-column>
-      <el-table-column label="单元描述">
-        <template slot-scope="scope" >{{ scope.row.description }}</template>
-      </el-table-column>
-      <el-table-column label="采用标准">
-        <template slot-scope="scope" >{{ scope.row.standard_.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 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>
-
-    <pagination
-      v-show="tableData.count>0"
-      :total="tableData.count"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.page_size"
-      @pagination="getList"
-    />
-    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" style="margin-top:10px">
-      <el-col :xs="24" :md="12">
-        <el-form-item label="实施规则" prop="implementrule">
-          <el-select
-            v-model="formData.implementrule"
-            placeholder="请选择实施规则"
-            clearable
-            :style="{width: '100%'}"
-            @change="changeTypeOptions"
-          >
-            <el-option
-              v-for="(item, index) in implementruleOptions"
-              :key="index"
-              :label="item.fullname"
-              :value="item.id"
-              :disabled="item.disabled"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :xs="24" :md="12">
-        <el-form-item label="单元类型" prop="unittype">
-          <el-select
-            v-model="formData.unittype"
-            placeholder="请选择单元类型"
-            clearable
-            :style="{width: '100%'}"
-            @change="changeUnit"
-          >
-            <el-option
-              v-for="(item, index) in unittypeOptions"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-              :disabled="item.disabled"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :xs="24" :md="12">
-        <el-form-item label="采用标准" prop="standard">
-          <el-input
-            v-model="formData.standard_.fullname"
-            placeholder="请输入采用标准"
-            readonly
-            clearable
-            :style="{width: '100%'}"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :xs="24" :md="12">
-        <el-form-item label="检测机构" prop="testorg">
-          <el-select v-model="formData.testorg" placeholder="请选择检测机构" clearable :style="{width: '100%'}">
-            <el-option
-              v-for="(item, index) in testorgOptions"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-              :disabled="item.disabled"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :xs="24" :md="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-col :xs="24" :md="16">
-        <el-form-item label="单元描述" prop="description">
-          <el-input
-            v-model="formData.description"
-            placeholder="请输入单元描述"
-            clearable
-            :style="{width: '100%'}"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item size="large">
-          <el-button type="primary" @click="createNew">创建新记录</el-button>
-          <el-button type="primary" @click="updateNow">保存</el-button>
-          <el-button @click="resetForm">重置</el-button>
-        </el-form-item>
-      </el-col>
-    </el-form>
-  </div>
-</template>
-<script>
-import { getImplementRuleList, getUnitTypeList } from "@/api/implementrule"
-import { getUnitList, deleteUnit, createUnit, updateUnit } from "@/api/unit";
-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 {
-  name: "Productunit",
-  components: { Pagination, Treeselect },
-  props:['certapp'],
-  data() {
-    return {
-      tableData: { count: 0 },
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        page_size: 20,
-        certapp:this.certapp
-      },
-      formData: {
-        certapp:this.certapp,
-        implementrule: undefined,
-        unittype: undefined,
-        standard: undefined,
-        standard_:{},
-        testorg: undefined,
-        name: undefined,
-        description: undefined,
-      },
-      rules: {
-        implementrule: [
-          {
-            required: true,
-            message: "请选择实施规则",
-            trigger: "change",
-          },
-        ],
-        unittype: [
-          {
-            required: true,
-            message: "请选择单元类型",
-            trigger: "change",
-          },
-        ],
-        standard: [],
-        testorg: [],
-        name: [
-          {
-            required: true,
-            message: "请输入单元名称",
-            trigger: "blur",
-          },
-        ],
-        description: [
-          {
-            required: true,
-            message: "请输入单元描述",
-            trigger: "blur",
-          },
-        ],
-      },
-      implementruleOptions: [
-      ],
-      unittypeOptions: [
-      ],
-      testorgOptions: [
-      ],
-    };
-  },
-  watch:{
-    'formData.implementrule': function(val){
-      this.changeTypeOptions()
-    },
-  },
-  created() {
-    this.getList();
-    this.getImplementRuleOptions()
-  },
-  methods: {
-    checkPermission,
-    getList() {
-      this.listLoading = true;
-      getUnitList(this.listQuery).then((response) => {
-
-        if (response.data) {
-          
-          this.tableData = response.data;
-          
-        }
-        this.listLoading = false;
-      });
-    },
-    resetFilter() {
-      this.listQuery = {
-        page: 1,
-        page_size: 20,
-      };
-      this.getList();
-    },
-    handleFilter() {
-      this.listQuery.page = 1;
-      this.getList();
-    },
-    handleCreate(item, index) {
-      this.$router.push({
-        name: "CertappForm",
-        params: { kind: item.code, action: "create" },
-      });
-    },
-    handleUpdate(scope) {
-      this.$router.push({
-        name: "CertappForm",
-        params: { action: "update", kind: scope.row.cert_field_.code },
-        query: { id: scope.row.id },
-      });
-    },
-    handleDelete(scope) {
-      this.$confirm("确定删除?", "警告", {
-        // confirmButtonText: '确定',
-        // cancelButtonText: '取消',
-        type: "warning",
-      }).then(() => {
-        deleteUnit(scope.row.id).then((res) => {
-          this.$message.success("成功");
-          this.getList();
-        });
-      }).catch(()=>{});
-    },
-    createNew() {
-      this.$refs['elForm'].validate(valid => {
-        if (!valid) return
-        // TODO 提交表单
-        createUnit(this.formData).then(res=>{
-          this.getList()
-          this.$message.success('成功')
-        })
-      })
-    },
-    updateNow(){
-      this.$refs['elForm'].validate(valid => {
-        if (!valid) return
-        // TODO 提交表单
-        updateUnit(this.formData.id, this.formData).then(res=>{
-          this.getList()
-          this.$message.success('成功')
-        })
-      })
-    },
-    resetForm() {
-      this.$refs['elForm'].resetFields()
-    },
-    getImplementRuleOptions(){
-      var query = {ccc_list:this.certapp.cccpv_class}
-      getImplementRuleList(query).then(res=>{
-        this.implementruleOptions = res.data.results
-      })
-    },
-    changeTypeOptions(){
-      getUnitTypeList({implementrule:this.formData.implementrule}).then(res=>{
-        this.unittypeOptions = genTree(res.data)
-      })
-    },
-    changeUnit(val){
-      let obj = {};
-      obj = this.unittypeOptions.find((item)=>{//这里的userList就是上面遍历的数据源
-          return item.id === val;//筛选出匹配数据
-      });
-      this.formData.name = obj.name
-      this.formData.standard = obj.standard
-      this.formData.standard_ = obj.standard_
-    },
-    rowClick(row, column, event){
-      this.formData = Object.assign({}, row);
-    }
-  },
-};
-</script>