From 3d906738fb050f4b99137cd438e0ee0212e39d4b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 24 Jun 2022 08:30:51 +0800
Subject: [PATCH] search

---
 client/src/views/ability/abilityQuality.vue | 16 ++--
 client/src/views/ability/mQualityTask.vue   | 82 +++++++++++----------
 client/src/views/ability/qualityTaskDo.vue  |  2 +-
 client/src/views/ability/quliShow.vue       | 24 +++---
 4 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/client/src/views/ability/abilityQuality.vue b/client/src/views/ability/abilityQuality.vue
index 4ff298c..f9b17a1 100644
--- a/client/src/views/ability/abilityQuality.vue
+++ b/client/src/views/ability/abilityQuality.vue
@@ -69,12 +69,12 @@
                 <span v-html="showlight(scope.row.name)"></span>
               </template>
             </el-table-column>
-            <el-table-column label="资质类型">
+            <el-table-column label="资质认定">
               <template slot-scope="scope">
                 <span v-html="showlight(scope.row.type)"></span>
               </template>
             </el-table-column>
-            <el-table-column label="等级">
+            <el-table-column label="资质类型">
               <template slot-scope="scope">
                 <span v-if="scope.row.type==='OTHER'" v-html="showlight(scope.row.level)">{{scope.row.level}}</span>
                 <span v-else v-html="showlight(typeOptions[scope.row.grade])">{{typeOptions[scope.row.grade]}}</span>
@@ -106,8 +106,12 @@
                 <span v-html="showlight(scope.row.description)"></span>
               </template>
             </el-table-column>
-            <el-table-column label="创建日期">
-              <template slot-scope="scope">{{scope.row.create_time.substring(0, 10)}}</template>
+            <el-table-column label="截止日期">
+              <template slot-scope="scope">
+                <span v-if="scope.row.end_date">
+                  {{scope.row.end_date.substring(0, 10)}}
+                </span>
+              </template>
             </el-table-column>
             <el-table-column label="变更日期">
               <template slot-scope="scope">{{scope.row.update_time.substring(0, 10)}}</template>
@@ -156,7 +160,9 @@
         typeOptions: {
           10: '国家级',
           20: '省级',
-          30: '市级'
+          30: '市级',
+          40: '实验室',
+          50: '检验机构',
         },
       };
     },
diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue
index 6e42f77..e091f75 100644
--- a/client/src/views/ability/mQualityTask.vue
+++ b/client/src/views/ability/mQualityTask.vue
@@ -289,11 +289,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质类型" prop="type">
+        <el-form-item label="资质认定" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质类型"
+            placeholder="资质认定"
             @change="qualiTypeChange"
           >
             <el-option
@@ -307,7 +307,7 @@
         <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
           <el-input v-model="qualiForm.name" placeholder="资质名称"/>
         </el-form-item>
-        <el-form-item label="资质等级" v-if="qualiForm.type!=='OTHER'">
+        <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.grade"
@@ -321,8 +321,22 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="等级" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.level" placeholder="等级"/>
+        <el-form-item label="资质类型" v-if="qualiForm.type==='CNAS'">
+          <el-select
+            style="width: 100%;"
+            v-model="qualiForm.grade"
+            placeholder="资质类型"
+          >
+            <el-option
+              v-for="item in gradeOptions1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资质类型" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.level" placeholder="资质类型"/>
         </el-form-item>
         <el-form-item label="有效期">
           <el-date-picker
@@ -480,11 +494,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质类型" prop="type">
+        <el-form-item label="资质认定" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质类型"
+            placeholder="资质认定"
             @change="qualiTypeChange"
           >
             <el-option
@@ -498,7 +512,7 @@
         <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
           <el-input v-model="qualiForm.name" placeholder="资质名称"/>
         </el-form-item>
-        <el-form-item label="资质等级" v-if="qualiForm.type!=='OTHER'">
+        <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.grade"
@@ -512,8 +526,22 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="等级" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.level" placeholder="等级"/>
+        <el-form-item label="资质类型" v-if="qualiForm.type==='CNAS'">
+          <el-select
+            style="width: 100%;"
+            v-model="qualiForm.grade"
+            placeholder="资质类型"
+          >
+            <el-option
+              v-for="item in gradeOptions1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资质类型" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.level" placeholder="资质类型"/>
         </el-form-item>
         <el-form-item label="有效期">
           <el-date-picker
@@ -682,28 +710,6 @@
         @handleDo="handleDo"
       ></quliShow>
     </el-drawer>
-    <!--<el-drawer
-      title="操作记录"
-      :visible.sync="drawer"
-      :with-header="false"
-      size="40%"
-    >
-      <el-table
-        :data="recordData"
-        border
-        fit
-        stripe
-        highlight-current-row
-      >
-        <el-table-column type="index" width="50"/>
-        <el-table-column label="字段代码" prop="field">
-        </el-table-column>
-        <el-table-column label="初始值" prop="value1">
-        </el-table-column>
-        <el-table-column label="更改值" prop="value2">
-        </el-table-column>
-      </el-table>
-    </el-drawer>-->
   </div>
 </template>
 
@@ -780,7 +786,7 @@
         },
         qualiForm: {
           name: "",
-          type: "",
+          type: "CMA",
           grade: "",
           scope: "",
           level: "",
@@ -823,9 +829,8 @@
         fieldList2: [],
         atypeOptions: [],
         afieldOptions: [],//领域
-        gradeOptions: [
-          {id: 10, name: '国家级'}, {id: 20, name: '省级'}, {id: 30, name: '市级'}
-        ],//等级
+        gradeOptions: [{id: 10, name: '国家级'}, {id: 20, name: '省级'}, {id: 30, name: '市级'}],//等级
+        gradeOptions1: [{id: 40, name: '实验室'}, {id: 50, name: '检验机构'}],//等级
         qtaskName: "",
         atype_name: "",
         afield_name: "",
@@ -1019,10 +1024,13 @@
       },
       //更改资质类型
       qualiTypeChange() {
+        this.qualiForm.grade = '';
+        this.qualiForm.level = '';
         if (this.qualiForm.type === 'OTHER') {
-          this.qualiForm.grade = '';
           this.qualiForm.city = '';
           this.qualiForm.province = '';
+        }else{
+          this.citys=[];
         }
       },
       //编辑资质
diff --git a/client/src/views/ability/qualityTaskDo.vue b/client/src/views/ability/qualityTaskDo.vue
index 0d64d30..b91d6f2 100644
--- a/client/src/views/ability/qualityTaskDo.vue
+++ b/client/src/views/ability/qualityTaskDo.vue
@@ -397,7 +397,7 @@
       },
       checkPermission,
       getQtaskDept() {
-        qtaskDetail({qtask: this.qtaskId}).then((res) => {
+        qtaskDetail({page:1,page_size:9999,qtask: this.qtaskId}).then((res) => {
           this.qtaskDepts = res.data.results;
           this.qtask = res.data.results[0].qtask_;
         });
diff --git a/client/src/views/ability/quliShow.vue b/client/src/views/ability/quliShow.vue
index fa11765..2e9269f 100644
--- a/client/src/views/ability/quliShow.vue
+++ b/client/src/views/ability/quliShow.vue
@@ -10,15 +10,17 @@
       <el-form-item label="资质名称">
         {{ data.name }}
       </el-form-item>
-      <el-form-item label="资质类型">
+      <el-form-item label="资质认定">
         {{ data.type }}
       </el-form-item>
-      <el-form-item label="资质等级" v-if="data.type!=='OTHER'">
+      <el-form-item label="资质类型" v-if="data.type!=='OTHER'">
         <span v-if="data.grade===10">国家级</span>
         <span v-if="data.grade===20">省级</span>
         <span v-if="data.grade===30">市级</span>
+        <span v-if="data.grade===40">实验室</span>
+        <span v-if="data.grade===50">检验机构</span>
       </el-form-item>
-      <el-form-item label="二级等级" v-if="data.type==='OTHER'">
+      <el-form-item label="资质类型" v-if="data.type==='OTHER'">
         {{ data.level }}
       </el-form-item>
       <el-form-item label="有效期">
@@ -54,15 +56,17 @@
         <el-form-item label="资质名称">
           {{ formData.name }}
         </el-form-item>
-        <el-form-item label="资质类型">
+        <el-form-item label="资质认定">
           {{ formData.type }}
         </el-form-item>
-        <el-form-item label="资质等级" v-if="formData.type!=='OTHER'">
+        <el-form-item label="资质类型" v-if="formData.type!=='OTHER'">
           <span v-if="formData.grade===10">国家级</span>
           <span v-if="formData.grade===20">省级</span>
           <span v-if="formData.grade===30">市级</span>
+          <span v-if="formData.grade===40">实验室</span>
+          <span v-if="formData.grade===50">检验机构</span>
         </el-form-item>
-        <el-form-item label="二级等级" v-if="formData.type==='OTHER'">
+        <el-form-item label="资质类型" v-if="formData.type==='OTHER'">
           {{ formData.level }}
         </el-form-item>
         <el-form-item label="有效期">
@@ -97,15 +101,17 @@
         <el-form-item label="资质名称">
           <span :class="setClass('name')"> {{ formData2.name }}</span>
         </el-form-item>
-        <el-form-item label="资质类型">
+        <el-form-item label="资质认定">
           <span :class="setClass('type')"> {{ formData2.type }}</span>
         </el-form-item>
-        <el-form-item label="资质等级" v-if="formData2.type!=='OTHER'">
+        <el-form-item label="资质类型" v-if="formData2.type!=='OTHER'">
           <span v-if="formData2.grade===10" :class="setClass('grade')">国家级</span>
           <span v-if="formData2.grade===20" :class="setClass('grade')">省级</span>
           <span v-if="formData2.grade===30" :class="setClass('grade')">市级</span>
+          <span v-if="formData2.grade===40" :class="setClass('grade')">实验室</span>
+          <span v-if="formData2.grade===50" :class="setClass('grade')">检验机构</span>
         </el-form-item>
-        <el-form-item label="二级等级" v-if="formData2.type==='OTHER'">
+        <el-form-item label="资质类型" v-if="formData2.type==='OTHER'">
           <span :class="setClass('level')"> {{ formData2.level }}</span>
         </el-form-item>
         <el-form-item label="资质范围">