From 6a6e6d859b52baffed62889d99801371ae45de23 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Mon, 2 Nov 2020 09:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/certappunit.js               | 13 +++++++
 client/src/views/certapp/detectiontask.vue  |  8 ++--
 client/src/views/testorg/feedback.vue       | 41 +++++----------------
 client/src/views/testorg/feedbacks.vue      |  2 +-
 client/src/views/testorg/taskmanagement.vue |  5 +--
 server/apps/crm/serializers.py              | 12 +++---
 server/apps/project/serializers.py          |  6 +--
 server/apps/project/views.py                | 31 +++++++++++++++-
 8 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/client/src/api/certappunit.js b/client/src/api/certappunit.js
index 4b71a16..75bbe37 100644
--- a/client/src/api/certappunit.js
+++ b/client/src/api/certappunit.js
@@ -7,6 +7,9 @@ export function getCertappunitList(query) {
     params: query
   })
 }
+
+
+
 export function getCertappunit(id) {
   return request({
     url: `/project/certappunit/${id}/`,
@@ -48,6 +51,16 @@ export function createcompleteCertappunit(id,data) {
     data
   })
 }
+export function testlistCertappunit(query) {
+  return request({
+    url: `/project/certappunit/testlist/`,
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 // export function createAccess(data) {
 //   return request({
 //     url: '/accessment/certass/',
diff --git a/client/src/views/certapp/detectiontask.vue b/client/src/views/certapp/detectiontask.vue
index 4516644..6a36622 100644
--- a/client/src/views/certapp/detectiontask.vue
+++ b/client/src/views/certapp/detectiontask.vue
@@ -276,7 +276,7 @@ export default {
       },
         updatestate(id){
         var val='待CTC下达';
-       teststateCertappunit(id, {'teststate':val}).then(res=>{
+       teststateCertappunit(this.formData.id, {'teststate':val}).then(res=>{
           this.$message.success('成功')
            this.getList()
         })
@@ -287,13 +287,11 @@ export default {
         if (!valid) return;
           testtaskCertappunit(this.formData.id, this.formData).then((res) => {
             this.$message.success('成功')
+            this.getList()
         });
       });
       },
-      updatestate()
-      {
-             alert(提交CTC还没有做)
-      },
+     
   rowClick(row, column, event){
       this.formData = Object.assign({}, row);
       console.log( this.formData)
diff --git a/client/src/views/testorg/feedback.vue b/client/src/views/testorg/feedback.vue
index e5c321b..ba4f2fa 100644
--- a/client/src/views/testorg/feedback.vue
+++ b/client/src/views/testorg/feedback.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-tabs type="border-card" v-model="activeName"  >
+    <el-tabs type="border-card"  >
     
       <el-form ref="Form"
                :model="formData"
@@ -18,8 +18,8 @@
         </el-form-item>
           </el-col>
              <el-col :span="12">
-        <el-form-item label="生产企业" prop="">
-          <el-input v-model="formData.certunit_.enterprise_.name"  />
+        <el-form-item label="生产企业" prop="enterprise_.name">
+          <el-input v-model="formData.enterprise_.name"  />
         </el-form-item>
          </el-col>
              <el-col :span="12">
@@ -28,7 +28,7 @@
         </el-form-item>
          </el-col>
              <el-col :span="12">
-        <el-form-item label="单元描述" prop="ontactManTel">
+        <el-form-item label="单元描述" prop="certunit_.description">
           <el-input v-model="formData.certunit_.description"  />
         </el-form-item>
          </el-col>
@@ -55,7 +55,8 @@
                               type="date"
                               placeholder="选择日期"
                               format="yyyy 年 MM 月 dd 日"
-                              value-format="yyyy-MM-dd":style="{width: '100%'}">
+                              value-format="yyyy-MM-dd"
+                              :style="{width: '100%'}">
               </el-date-picker>
         </el-form-item>
          </el-col>
@@ -85,16 +86,8 @@
          </el-col>
             <el-col :span="8">
          <el-form-item label="检测状态" prop="inspectionstate">
-          <el-select placeholder="请选择检测状态" v-model="formData.inspectionstate" filterable allow-create :style="{width: '100%'}"
-            >
-              <el-option
-                v-for="(item, index) in inspectionOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
+         
+             <el-input v-model="formData.inspectionstate"  />
         </el-form-item>
          </el-col>
              <el-col :span="8">
@@ -180,8 +173,7 @@
        issuancedate:undefined,
        conclusion:undefined,
        resultremark:undefined,
-       remarks:undefined
-        
+       remarks:undefined,
       },
        chargeOptions:[
          {
@@ -194,21 +186,6 @@
         }
        
       ],
-      inspectionOptions:[
-         {
-          label: "待检测",
-          value: "待检测",
-        },
-        {
-          label: "在检测",
-          value: "在检测",
-        }
-        ,
-        {
-          label: "已检测",
-          value: "已检测",
-        }
-      ],
       conclusionOptions:[
          {
           label: "合格",
diff --git a/client/src/views/testorg/feedbacks.vue b/client/src/views/testorg/feedbacks.vue
index 74a52f4..e65c6b0 100644
--- a/client/src/views/testorg/feedbacks.vue
+++ b/client/src/views/testorg/feedbacks.vue
@@ -19,7 +19,7 @@
           </el-col>
              <el-col :span="12">
         <el-form-item label="生产企业" prop="">
-          <el-input v-model="formData.certunit_.enterprise_.name"  />
+          <el-input v-model="formData.enterprise_.name"  />
         </el-form-item>
          </el-col>
              <el-col :span="12">
diff --git a/client/src/views/testorg/taskmanagement.vue b/client/src/views/testorg/taskmanagement.vue
index 8c427b4..fd4c627 100644
--- a/client/src/views/testorg/taskmanagement.vue
+++ b/client/src/views/testorg/taskmanagement.vue
@@ -87,7 +87,7 @@
 import { getTestOrgList} from "@/api/laboratory"
 import { getDictList } from "@/api/dict";
 import { getCertunitList } from "@/api/certunit";
-import { getCertappunitList, testtaskCertappunit,teststateCertappunit } from "@/api/certappunit";
+import { getCertappunitList, testtaskCertappunit,teststateCertappunit ,getTasklist} from "@/api/certappunit";
 import Pagination from "@/components/Pagination";
 import checkPermission from "@/utils/permission";
 import Treeselect from "@riophae/vue-treeselect";
@@ -135,8 +135,7 @@ export default {
     getList() {
       this.listLoading = true;
       
-      getCertappunitList({ pageoff:true,
-          certapp:this.certapp}).then((response) => {
+      getTasklist().then((response) => {
        
         if (response.data) {
            this.tableData = response.data;
diff --git a/server/apps/crm/serializers.py b/server/apps/crm/serializers.py
index 42784a0..c7dd8c1 100644
--- a/server/apps/crm/serializers.py
+++ b/server/apps/crm/serializers.py
@@ -28,19 +28,19 @@ class EnterpriseAddressSerializer(serializers.ModelSerializer):
     class Meta:
         model = EnterpriseAddress
         fields = '__all__'
-   
+class EnterpriseSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Enterprise
+        fields = ['id', 'name']  
 
 class CertunitSerializer(serializers.ModelSerializer):
     standard_ = StandardSerializer(source='standard', read_only=True)
-    enterprise_ = serializers.CharField(source='enterprise',read_only=True)
+   
     class Meta:
         model = Certunit
         fields = '__all__'
 
-class EnterpriseSimpleSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Enterprise
-        fields = ['id', 'name']
+
 
 class CertunitSimpleSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/server/apps/project/serializers.py b/server/apps/project/serializers.py
index ddae5ca..50a8b6a 100644
--- a/server/apps/project/serializers.py
+++ b/server/apps/project/serializers.py
@@ -8,7 +8,7 @@ from apps.system.serializers import DictSerializer, UserSimpleSerializer, DictSi
 from apps.certset.serializers import StandardSerializer
 from apps.plan.serializers import PlanSerializer
 from apps.laboratory.serializers import TestOrgSerializer
-
+from apps.crm.serializers import EnterpriseSimpleSerializer
 # class ApplicationCreateSerializer(serializers.ModelSerializer):
 #     number = serializers.CharField(required=False)
 #     class Meta:
@@ -69,7 +69,7 @@ from apps.certificate.models import Certificate
 class CertappunitSerializer(serializers.ModelSerializer):
     certunit_ = CertunitSimpleSerializer(source = 'certunit', read_only=True)
     decision_ = DictSimpleSerializer(source = 'decision', read_only=True)
-
+    enterprise_ = EnterpriseSimpleSerializer(source='certunit.enterprise',read_only=True)
     testorg_ = TestOrgSerializer(source = 'testorg', read_only=True)
 
     certificate_ = serializers.SerializerMethodField()
@@ -80,7 +80,7 @@ class CertappunitSerializer(serializers.ModelSerializer):
     @staticmethod
     def setup_eager_loading(queryset):
         """ Perform necessary eager loading of data. """
-        queryset = queryset.select_related('certunit','testorg','decision')
+        queryset = queryset.select_related('certunit','testorg','decision','certunit.enterprise')
         return queryset
     
     def get_certificate_(self, obj):
diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index b2508de..f2c39f7 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -14,6 +14,8 @@ from apps.system.permission_data import RbacFilterSet
 from apps.system.mixins import CreateUpdateCustomMixin, OptimizationMixin
 import random
 from rest_framework.decorators import action
+
+from rest_framework.generics import ListAPIView
 from .filters import *
 from utils.pagination import PageOrNot
 from rest_framework.exceptions import ParseError, NotAuthenticated
@@ -226,7 +228,7 @@ class CertappunitViewset(PageOrNot, ModelViewSet):
     perms_map={'get': '*', '*':'certapp_view'}
     queryset = Certappunit.objects.all()
     serializer_class = CertappunitSerializer
-    filterset_fields = ['certapp','teststate']
+    filterset_fields = ['certapp','teststate','id','inspectionstate']
     ordering= ['-id']
 
     @action(methods=['put'], detail=True, perms_map={'put':'certapp_access'}, url_name='certappunit_access')   
@@ -259,6 +261,16 @@ class CertappunitViewset(PageOrNot, ModelViewSet):
         obj.charge = request.data['charge']
         obj.save()
         return Response(status=status.HTTP_200_OK)
+    @action(methods=['get'], detail=True, perms_map={'get':'certapp_testlist'}, url_name='certappunit_testlist')   
+    def testlist(self, request, pk=None):
+        """
+        实验室任务列表
+        """
+       
+        queryset = Certappunit.objects.filter(teststate__in=['待实验室检验', '到样检测中'])
+        return queryset
+
+        
     @action(methods=['put'], detail=True, perms_map={'put':'certapp_teststate'}, url_name='certappunit_teststate')   
     def teststate(self, request, pk=None):
         """
@@ -283,6 +295,7 @@ class CertappunitViewset(PageOrNot, ModelViewSet):
         """
         obj = self.get_object()
         obj.teststate = '到样检测中'
+        obj.inspectionstate = "在检验"
         obj.sampledate = request.data['sampledate']
         obj.save()
         return Response(status=status.HTTP_200_OK)   
@@ -294,6 +307,7 @@ class CertappunitViewset(PageOrNot, ModelViewSet):
         obj = self.get_object()
         obj.teststate = '待提取报告'
         obj.path = request.data['path']
+        obj.inspectionstate = "已检验"
         obj.conclusion = request.data['conclusion']
         obj.completedate = request.data['completedate']
         obj.issuancedate = request.data['issuancedate']
@@ -302,6 +316,21 @@ class CertappunitViewset(PageOrNot, ModelViewSet):
         obj.save()
         return Response(status=status.HTTP_200_OK)
 
+class TaskList(ListAPIView):
+    """
+    我的审核项目
+    """
+    perms_map = {'get': 'myaudittask_view'}
+    serializer_class = ProjectSerializerX
+    filterset_class = ProjectFilter
+    search_fields = ['auditee__name', 'plan__name']
+    ordering=['-pk']
+
+    def get_queryset(self):
+        queryset = Project.objects.filter(certapp_project__member_certapp__user=self.request.user).distinct()
+        if hasattr(self.get_serializer_class(), 'setup_eager_loading'):
+            queryset = self.get_serializer_class().setup_eager_loading(queryset)
+        return queryset