From 1775213c1805937478abe375c293374ab2e671a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 28 Apr 2021 18:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/skill/skillMng.vue            |  9 ++++++++-
 src/views/xm/core/xmProduct/XmProductSelect.vue | 11 ++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue
index c1486082..6d58a82e 100644
--- a/src/views/xm/core/skill/skillMng.vue
+++ b/src/views/xm/core/skill/skillMng.vue
@@ -194,6 +194,7 @@ export default {
             }
             console.log(convert);
             this.convertSkills = convert;
+            localStorage.setItem("skill_"+this.userInfo.branchId,JSON.stringify(convert))
           } else {
             this.$message({
               message: tips.msg,
@@ -420,7 +421,13 @@ export default {
     //在下面添加其它组件
   },
   mounted() {
-    this.getAllHrSkill();
+    var localSkills=localStorage.getItem("skill_"+this.userInfo.branchId)
+    if(localSkills){
+      this.convertSkills=JSON.parse(localSkills)
+    }else{
+      this.getAllHrSkill();
+    }
+    
     // this.$nextTick(() => {
     // 	this.getAllHrSkill();
     // });
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index b27b5598..ca27d236 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -5,6 +5,15 @@
 			<el-table  max-height="650" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				<el-table-column sortable type="index" width="55"></el-table-column>				
 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
+					 <template slot="header" slot-scope="scope">
+						 <div>
+						 产品名称 <el-input v-model="filters.key" style="width:60%;" placeholder="按产品名称模糊搜索">
+							 <template slot="append">
+							 <el-button icon="el-icon-search" @click="searchXmProducts"></el-button>
+							 </template>
+						 </el-input>
+						 </div>
+					 </template>
 					<template slot-scope="scope">
 						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary">{{scope.row.productName}}</el-link>
 					</template>
@@ -114,7 +123,7 @@
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
+					params.key=this.filters.key
 				}else{
 					//params.xxx=xxxxx
 				}