From eda1c5c446229b321fe60c626165d5b58536a31c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 6 Jun 2022 09:08:24 +0800
Subject: [PATCH] 0606

---
 client/src/views/ability/abilityQuality.vue | 2 +-
 client/src/views/ability/qualification.vue  | 8 +++++---
 client/src/views/ability/quliShow.vue       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/src/views/ability/abilityQuality.vue b/client/src/views/ability/abilityQuality.vue
index 94d0af9..d3f1b27 100644
--- a/client/src/views/ability/abilityQuality.vue
+++ b/client/src/views/ability/abilityQuality.vue
@@ -71,7 +71,7 @@
             </el-table-column>
             <el-table-column label="资质类型">
               <template slot-scope="scope">
-                <span v-html="showlight(scope.row.name)"></span>
+                <span v-html="showlight(scope.row.type)"></span>
               </template>
             </el-table-column>
             <el-table-column label="等级">
diff --git a/client/src/views/ability/qualification.vue b/client/src/views/ability/qualification.vue
index 8967fee..7f652ce 100644
--- a/client/src/views/ability/qualification.vue
+++ b/client/src/views/ability/qualification.vue
@@ -416,10 +416,12 @@ this.getList()
     },
      showlight(val) {
 val = val + "";
-  if (this.listQuery.search != "") {
-    let  searchList = this.listQuery.search.split(' ')
+  if (this.listQuery.search !== "") {
+    let  searchList = this.listQuery.search.split(' ');
+    let reg = null;
     for(var i=0;i<searchList.length;i++){
-      val = val.replace(searchList[i], '<span style="color:red;font-weight:bold">' + searchList[i] + "</span>");
+      reg=new RegExp(searchList[i],"g");
+      val = val.replace(reg, '<span style="color:red;font-weight:bold">' + searchList[i] + "</span>");
     }
     return val
   } else {
diff --git a/client/src/views/ability/quliShow.vue b/client/src/views/ability/quliShow.vue
index 566ab1a..a7ee805 100644
--- a/client/src/views/ability/quliShow.vue
+++ b/client/src/views/ability/quliShow.vue
@@ -190,7 +190,7 @@
         })
       },
       confirm() {
-        qactionConfirm(this.data.id).then(res => {
+        qactionConfirm(this.showData.id).then(res => {
           if (res.code>=200) {
             this.$emit("handleDo", false);
           }