From 18591c6e3d0a50744b781089b7e34b203336aff2 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 28 Oct 2020 09:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=96=B0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js                  |  7 ++
 client/src/views/certapp/detectiontask.vue  | 14 +++-
 client/src/views/testorg/issued.vue         | 76 +++++++++++++++++++++
 client/src/views/testorg/taskmanagement.vue |  5 +-
 4 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 client/src/views/testorg/issued.vue

diff --git a/client/src/router/index.js b/client/src/router/index.js
index 8367d97..5824eac 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -219,6 +219,13 @@ export const asyncRoutes = [
         component: () => import('@/views/testorg/testorgnotice'),
         meta: { title: '实验室通知公告', icon: 'example', perms: ['testorg_manage'] }
       },
+      
+      {
+        path: 'issued',
+        name: 'Issued',
+        component: () => import('@/views/testorg/issued'),
+        meta: { title: '任务下达', icon: 'example', perms: ['testorg_manage'] }
+      },
       {
         path: 'taskmanagement',
         name: 'TaskManagement',
diff --git a/client/src/views/certapp/detectiontask.vue b/client/src/views/certapp/detectiontask.vue
index c4b7972..5d7c2c3 100644
--- a/client/src/views/certapp/detectiontask.vue
+++ b/client/src/views/certapp/detectiontask.vue
@@ -68,7 +68,7 @@
       </el-col>
    
         <el-col :xs="24" :md="12">
-        <el-form-item label="认证性质" prop="testorg">
+        <el-form-item label="认证性质" prop="testorgs">
           <el-select  placeholder="请选择认证性质" clearable :style="{width: '100%'}">
             <el-option
               v-for="(item, index) in testorgOptions"
@@ -160,10 +160,10 @@ import { getDictList } from "@/api/dict";
 import { getCertunitList } from "@/api/certunit";
 import { getCertappunitList, testtaskCertappunit,teststateCertappunit } from "@/api/certappunit";
 import Pagination from "@/components/Pagination";
-import checkPermission from "@/utils/permission";
+import { genTree } from "@/utils";
+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: "Detectform",
   components: { Pagination, Treeselect },
@@ -201,6 +201,14 @@ export default {
         }
        
       ],
+      testorgOptions:[ {
+          label: "初次申请",
+          value: "初次申请",
+        },
+        {
+          label: "复评",
+          value: "复评",
+        }],
       chargeOptions:[
          {
           label: "CTC代收",
diff --git a/client/src/views/testorg/issued.vue b/client/src/views/testorg/issued.vue
new file mode 100644
index 0000000..99d5af5
--- /dev/null
+++ b/client/src/views/testorg/issued.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="app-container">
+   
+   
+    <el-table v-loading="listLoading"
+              :data="detectoryList.results"
+              style="width: 100%;margin-top:10px;"
+              border
+              fit
+              stripe
+              highlight-current-row
+              max-height="600">
+      
+    </el-table>
+    <pagination v-show="detectoryList.count>0"
+                :total="detectoryList.count"
+                :page.sync="listQuery.page"
+                :limit.sync="listQuery.page_size"
+    
+  </div>
+</template>
+<script>
+  import { getTestOrgList} from "@/api/laboratory"
+ 
+  import Pagination from "@/components/Pagination"
+  import checkPermission from '@/utils/permission'
+ 
+  export default {
+    components: { Pagination },
+    data() {
+      return {
+        detectoryList: { count: 0 },
+       
+        listLoading: true,
+        listQuery: {
+          page: 1,
+          page_size: 20
+        },
+        
+        dialogVisible: false,
+        dialogType: 'create',
+        rule1: {
+         
+        },
+       
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      checkPermission,
+      getList() {
+        this.listLoading = true;
+        getTestOrgList(this.listQuery).then(response => {
+          if (response.data) {
+            this.detectoryList = response.data
+          }
+          this.listLoading = false;
+        });
+      },
+      resetFilter() {
+        this.listQuery = {
+          page: 1,
+          page_size: 20
+        };
+        this.getList();
+      },
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+    
+    }
+  };
+</script>
diff --git a/client/src/views/testorg/taskmanagement.vue b/client/src/views/testorg/taskmanagement.vue
index d12d57e..ee32ef8 100644
--- a/client/src/views/testorg/taskmanagement.vue
+++ b/client/src/views/testorg/taskmanagement.vue
@@ -22,7 +22,6 @@
       stripe
       highlight-current-row
       height="380"
-      @row-click="rowClick"
     >
     
       <el-table-column type="index" width="50" />
@@ -97,7 +96,6 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { genTree } from "../../utils";
 export default {
-  name: "Detectform",
   components: { Pagination, Treeselect },
   props:['certapp'],
   data() {
@@ -131,8 +129,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getTestOptions();
-    this.gettunitList() 
+    this.getList() 
    
   },
   methods: {