From e8653fcaab8899128579e8b92850867fa07294ff Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 21 Oct 2020 15:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=B5=8B=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/qualification.js               |  9 ++++++-
 client/src/views/ability/inspection.vue       |  8 ++++--
 client/src/views/ability/qualification.vue    | 16 ++++++------
 .../migrations/0015_remove_inspection_type.py | 17 ++++++++++++
 server/apps/ability/models.py                 |  7 +----
 server/apps/ability/serializers.py            | 26 +++++++++----------
 server/apps/ability/urls.py                   |  3 ++-
 server/apps/ability/views.py                  |  8 ++++++
 8 files changed, 63 insertions(+), 31 deletions(-)
 create mode 100644 server/apps/ability/migrations/0015_remove_inspection_type.py

diff --git a/client/src/api/qualification.js b/client/src/api/qualification.js
index 52df95b..18e0926 100644
--- a/client/src/api/qualification.js
+++ b/client/src/api/qualification.js
@@ -50,4 +50,11 @@ export function importQualification(data) {
     method: 'post',
     data
   })
-}
\ No newline at end of file
+}
+export function getQualificationotherList(query) {
+  return request({
+    url: '/ability/qualificationother/',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/client/src/views/ability/inspection.vue b/client/src/views/ability/inspection.vue
index 26a7c59..6331d4f 100644
--- a/client/src/views/ability/inspection.vue
+++ b/client/src/views/ability/inspection.vue
@@ -139,8 +139,12 @@
       </el-table-column>
        <el-table-column label="生效日期">
         <template slot-scope="scope"
-          ><span v-html="showlight(scope.row.sxrq.substring(0,10)) "></span
-        ></template>
+          >
+          <span v-if="showlight(scope.row.sxrq).length>10" v-html="showlight(scope.row.sxrq.substring(0,10)) "></span
+        >
+         <span v-else v-html="showlight(scope.row.sxrq) "></span
+        >
+        </template>
       </el-table-column>
      
       <el-table-column
diff --git a/client/src/views/ability/qualification.vue b/client/src/views/ability/qualification.vue
index 214aa07..01b5cfc 100644
--- a/client/src/views/ability/qualification.vue
+++ b/client/src/views/ability/qualification.vue
@@ -86,33 +86,33 @@
           :filters="groupBy.sszx"
           :filter-multiple="false"
           >
-            <template  slot-scope="scope">{{ scope.row.sszx }}</template>
+            <template  slot-scope="scope">{{ scope.row.qualification_.sszx }}</template>
           </el-table-column>
           <el-table-column width="150" fixed label="CMA资质">
             <template slot-scope="scope">
-              <span  v-html="showlight(scope.row.cma)"></span>
+              <span  v-html="showlight(scope.row.qualification_.cma)"></span>
               </template>
           </el-table-column>
           <el-table-column width="150" fixed label="CNAS资质">
             <template slot-scope="scope">
-              <span  v-html="showlight(scope.row.cnas)"></span>
+              <span  v-html="showlight(scope.row.qualification_.cnas)"></span>
               </template>
           </el-table-column>
            <el-table-column width="1050" label="检验检测相关其他资质及校准资质">
           <el-table-column  label="其它资质" width="360">
             <template slot-scope="scope">
-              <p style="border-bottom: 1px dashed blue"  v-for="item in scope.row.otherqualification" v-html="showlight(item.name)"  ></p>
+              <span  v-html="showlight(scope.row.name)"  ></span>
               </template>
           </el-table-column>
           <el-table-column  label="资质范围"  width="690">
             <template slot-scope="scope">
-              <p v-for="item in scope.row.otherqualification" style="border-bottom: 1px dashed blue " v-html="showlight(item.description)" ></p>
+              <span  v-html="showlight(scope.row.description)" ></span>
               </template>
           </el-table-column>
            </el-table-column>
           <el-table-column fixed="right" width="200" label="主要服务">
             <template slot-scope="scope">
-              <span  v-html="showlight(scope.row.service)"></span>
+              <span  v-html="showlight(scope.row.qualification_.service)"></span>
               </template>
           </el-table-column>
           <el-table-column width="150" fixed="right" label="操作">
@@ -181,7 +181,7 @@
 }
 </style>
 <script>
-import { getQualificationList, getQualificationGroup, createQualification, updateQualification, deleteQualification, importQualification } from "@/api/qualification";
+import { getQualificationList,getQualificationotherList, getQualificationGroup, createQualification, updateQualification, deleteQualification, importQualification } from "@/api/qualification";
 import checkPermission from "@/utils/permission"
 import { upUrl, upHeaders } from "@/api/file"
 import Pagination from "@/components/Pagination" // secondary package based on el-pagination
@@ -275,7 +275,7 @@ export default {
     },
     getList() {
       this.listLoading = true;
-      getQualificationList(this.listQuery).then(response => {
+      getQualificationotherList(this.listQuery).then(response => {
         if (response.data) {
           this.tableData = response.data
         }
diff --git a/server/apps/ability/migrations/0015_remove_inspection_type.py b/server/apps/ability/migrations/0015_remove_inspection_type.py
new file mode 100644
index 0000000..793ad91
--- /dev/null
+++ b/server/apps/ability/migrations/0015_remove_inspection_type.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.5 on 2020-10-21 06:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ability', '0014_auto_20201020_1601'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='inspection',
+            name='type',
+        ),
+    ]
diff --git a/server/apps/ability/models.py b/server/apps/ability/models.py
index f142712..ce30b85 100644
--- a/server/apps/ability/models.py
+++ b/server/apps/ability/models.py
@@ -29,10 +29,7 @@ class Inspection(BaseModel):
     """
     检验能力表
     """
-    type_choices = (
-        ('center', '总部'),
-        ('sub', '分子公司')
-    )
+    
     dlxh = models.TextField('大类序号', null=True,blank=True)
     dlmc = models.TextField('大类名称', null=True,blank=True)
     dxxh = models.TextField('对象序号', null=True,blank=True)
@@ -43,8 +40,6 @@ class Inspection(BaseModel):
     sm = models.TextField('说明', null=True,blank=True)
     sxrq = models.TextField('生效日期', null=True,blank=True)
     sszx = models.TextField('所属中心',null=True,blank=True)
-    type = models.CharField('所属类型', max_length=50,
-                             choices=type_choices, default='center')
 
 class CNAS(BaseModel):
     """
diff --git a/server/apps/ability/serializers.py b/server/apps/ability/serializers.py
index b515e24..01fb97f 100644
--- a/server/apps/ability/serializers.py
+++ b/server/apps/ability/serializers.py
@@ -18,28 +18,28 @@ class CNASSerializer(serializers.ModelSerializer):
         fields = '__all__'
 class InspectionSerializer(serializers.ModelSerializer):
     """
-    检验能力反馈
+    检验能力反馈啊
     """
     class Meta:
         model = Inspection
         fields = '__all__'
-class QualificationotherSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Qualificationother
-        fields = '__all__'
 
 class QualificationSerializer(serializers.ModelSerializer):
     """
     资质能力序列化
     """
-    otherqualification = QualificationotherSerializer(source='other_qualification', many=True)
-
-    @staticmethod
-    def setup_eager_loading(queryset):
-        """ Perform necessary eager loading of data. """
-        queryset = queryset.prefetch_related('other_qualification',)
-        return queryset
+    
     class Meta:
         model = Qualification
         fields = '__all__'
-
+class QualificationotherSerializer(serializers.ModelSerializer):
+    qualification_ = QualificationSerializer(source = 'qualification', read_only=True)
+    
+    class Meta:
+        model = Qualificationother
+        fields = '__all__'
+    @staticmethod
+    def setup_eager_loading(queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.select_related('qualification')
+        return queryset
\ No newline at end of file
diff --git a/server/apps/ability/urls.py b/server/apps/ability/urls.py
index adc0958..15ffed0 100644
--- a/server/apps/ability/urls.py
+++ b/server/apps/ability/urls.py
@@ -1,11 +1,12 @@
 from django.urls import path, include
 from rest_framework import routers
-from .views import CMAViewSet, CNASViewSet, QualificationViewSet,InspectionViewSet
+from .views import CMAViewSet, CNASViewSet, QualificationViewSet,InspectionViewSet,QualificationotherViewSet
 
 router = routers.DefaultRouter()
 router.register('cma', CMAViewSet, basename="cma")
 router.register('cnas', CNASViewSet, basename="cnas")
 router.register('qualification', QualificationViewSet, basename="qualification")
+router.register('qualificationother', QualificationotherViewSet, basename="qualificationother")
 router.register('inspection', InspectionViewSet, basename="inspection")
 urlpatterns = [
     path('', include(router.urls))
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index 53e4b9f..40db3a4 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -170,6 +170,14 @@ class QualificationViewSet(ModelViewSet):
             return Response(status = status.HTTP_200_OK)
         else:
             return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
+class QualificationotherViewSet(ModelViewSet):
+    """
+    资质能力：增删改查
+    """
+    perms_map = {'get': '*', 'post': 'qualificationother_create',
+                 'put': 'qualificationother_update', 'delete': 'qualificationother_delete'}
+    queryset = Qualificationother.objects.all()
+    serializer_class = QualificationotherSerializer
 class InspectionViewSet(ModelViewSet):
     """
     CNAS检测能力：增删改查