From de4b832165effc8619fe94911227afc7e18b4d75 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 10 Oct 2020 17:37:35 +0800
Subject: [PATCH] =?UTF-8?q?tab=E9=A1=B5=E7=82=B9=E5=87=BB=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/certapp/certapphandle.vue | 29 ++++++++++++----------
 server/apps/project/views.py               |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/client/src/views/certapp/certapphandle.vue b/client/src/views/certapp/certapphandle.vue
index 95f7d10..9137be6 100644
--- a/client/src/views/certapp/certapphandle.vue
+++ b/client/src/views/certapp/certapphandle.vue
@@ -1,27 +1,22 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-steps :active="1" finish-status="success">
-  <el-step title="申请"></el-step>
-  <el-step title="受理"></el-step>
-  <el-step title="策划"></el-step>
-  <el-step title="现场审核"></el-step>
-  <el-step title="产品检测"></el-step>
-  <el-step title="评定"></el-step>
-  <el-step title="出证"></el-step>
-  <el-step title="归档"></el-step>
+      <el-steps :active="stateIndex" finish-status="success">
+        <el-step v-for="item in states" :title="item"
+      :key="item"
+      ></el-step>
 </el-steps>
     </el-card>
     <el-row :gutter="6" style="margin-top:6px">
       <el-col :xs="24" :md="20">
 
-            <el-tabs type="border-card" v-model="activeName">
+            <el-tabs type="border-card" v-model="activeName" @tab-click="handleLoad">
       <el-tab-pane label="申请信息" name="Basic" style="overflow-y:auto;overflow-x:hidden;">
         <CCCform @handleCommit="save" :certapp="certappdata" v-if="kind=='CCC'&isLoad"></CCCform>
         <QMSform @handleCommit="save" :certapp="certappdata" v-if="kind=='QMS'&isLoad"></QMSform>
       </el-tab-pane>
       <el-tab-pane label="产品单元"  name="Certunit" v-if="certapp" lazy>
-          <Certunit :certapp="certapp"></Certunit>
+          <Certunit :certapp="certapp" :key="time2"></Certunit>
       </el-tab-pane>
       <el-tab-pane label="原材料供应商" name="Certunit1" v-if="certapp" lazy>
       </el-tab-pane>
@@ -93,7 +88,8 @@ export default {
   props: [],
   data() {
     return {
-      // steps:['申请', '受理', ''],
+      states:['申请', '受理', '策划', '现场审核', '产品检测', '评定', '出证', '归档'],
+      stateIndex:1,
       activeName:'Basic',
       certapp:null,
       certappdata:null,
@@ -108,7 +104,8 @@ export default {
         }, {
           content: '创建成功',
           timestamp: '2018-04-11'
-        }]
+        }],
+      time2:'',
     };
   },
   computed: {},
@@ -120,6 +117,11 @@ export default {
   },
   mounted() {},
   methods: {
+      handleLoad(){
+        if(this.activeName=="Certunit"){
+          this.time2 = new Date().getTime()
+        }
+      },
       getParams(){
           var id = this.$route.params.id
           this.certapp = id
@@ -127,6 +129,7 @@ export default {
             this.certappdata = res.data
             this.kind = res.data.cert_field_.code
             this.isLoad = true
+            this.stateIndex = this.states.indexOf(res.data.state)
           })
           if(this.$route.name=='Certappupdate' || this.$route.name=='Certappdetail'){
             this.activeName = 'Basic'
diff --git a/server/apps/project/views.py b/server/apps/project/views.py
index 918e73b..9c6df91 100644
--- a/server/apps/project/views.py
+++ b/server/apps/project/views.py
@@ -161,6 +161,7 @@ class CertappunitViewset(PageOrNot, ListModelMixin, GenericViewSet):
     perms_map={'*':'certapp_view'}
     queryset = Certappunit.objects.all()
     serializer_class = CertappunitSerializer
+    filterset_fields = ['certapp']
     ordering= ['-id']
 
     @action(methods=['put'], detail=True, perms_map={'put':'certapp_access'}, url_name='certappunit_access')