20231220汪皖苏

src/views/etpManage/index.vue

@@ -43,9 +43,9 @@
 				<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
 				<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
 				<el-table-column prop="name" label="专家库名称" align="center"></el-table-column>
 				<el-table-column prop="name" label="专家库名称" align="center"></el-table-column>
 				<el-table-column prop="talentName" label="专家名称" align="center"></el-table-column>
 				<el-table-column prop="talentName" label="专家名称" align="center"></el-table-column>
-				<el-table-column prop="ktagId" label="专业标签" align="center">
+				<el-table-column prop="" width="250" label="专业标签" align="center">
 					<template slot-scope="scope">
 					<template slot-scope="scope">
-						<span >{{dicObj.ktagId[scope.row.ktagId]}}</span>
+						<div class="tagName"><el-tag v-for="(item,index) in scope.row.ktagIdlist" :key="index" v-show="dicObj.ktagId[item.ktagId]">{{dicObj.ktagId[item.ktagId]}}</el-tag></div>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 				<el-table-column prop="level" label="专家级别" align="center">
 				<el-table-column prop="level" label="专家级别" align="center">
@@ -63,8 +63,8 @@
 				<el-table-column label="操作" width="200" align="center">
 				<el-table-column label="操作" width="200" align="center">
 					<template slot-scope="scope">
 					<template slot-scope="scope">
 						<div style="display: flex;align-items: center;justify-content: center;">
 						<div style="display: flex;align-items: center;justify-content: center;">
-							<el-button :class="scope.row.state == 1 ? '':'editBtn'" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)">编辑</el-button>
-							<el-button :class="scope.row.state == 1 ? '':'delBtn'" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)">删除</el-button>
+							<el-button class="editBtn" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)">编辑</el-button>
+							<el-button class="delBtn" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)">删除</el-button>
 						</div>
 						</div>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
@@ -211,12 +211,12 @@ export default {
 				level: {
 				level: {
 					1: "初级",
 					1: "初级",
 					2: "中级",
 					2: "中级",
-					2: "高级",
+					3: "高级",
 				},
 				},
 				ktagId: {
 				ktagId: {
 					1: "设备",
 					1: "设备",
 					2: "信息化",
 					2: "信息化",
-					2: "技术",
+					3: "技术",
 				},
 				},
 			},
 			},
 			selectData1: [
 			selectData1: [
@@ -236,18 +236,18 @@ export default {
 				},
 				},
 			],
 			],
 			selectData3: [
 			selectData3: [
-				{
-					label: "设备",
-					value: 1,
-				},
-				{
-					label: "信息化",
-					value: 2,
-				},
-				{
-					label: "技术",
-					value: 3,
-				},
+				// {
+				// 	label: "设备",
+				// 	value: 1,
+				// },
+				// {
+				// 	label: "信息化",
+				// 	value: 2,
+				// },
+				// {
+				// 	label: "技术",
+				// 	value: 3,
+				// },
 			],
 			],
 			selectData4: [
 			selectData4: [
 				{
 				{
@@ -271,10 +271,6 @@ export default {
 			this.set_table_height();
 			this.set_table_height();
 		})
 		})
 		this.set_table_height();
 		this.set_table_height();
-	},
-	created() {
-		// 初始化查询列表
-		this.getList();
 
 
 		// 获取元素列表
 		// 获取元素列表
 		this.getSelect1();
 		this.getSelect1();
@@ -282,6 +278,11 @@ export default {
 		this.getSelect3();
 		this.getSelect3();
 		this.getSelect4();
 		this.getSelect4();
 	},
 	},
+	created() {
+		// 初始化查询列表
+		this.getList();
+
+	},
 	methods: {
 	methods: {
 		// 查询列表
 		// 查询列表
 		getList() {
 		getList() {
@@ -331,11 +332,11 @@ export default {
 				this.formData.name = Number(this.formData.name);
 				this.formData.name = Number(this.formData.name);
 				this.formData.state = String(this.formData.state);
 				this.formData.state = String(this.formData.state);
 				this.formData.level = String(this.formData.level);
 				this.formData.level = String(this.formData.level);
-				// if (this.formData.ktagId) {
-				// 	this.formData.ktagId = String(this.formData.ktagId);
-				// }
+				this.formData.klTaglist = [];
+				this.formData.ktagIdlist.forEach(item => {
+					this.labelList.push(String(item.ktagId));
+				});
 			}else if (type == "create") {
 			}else if (type == "create") {
-				console.log(this.selectData3,this.labelList);
 				this.selectData3.forEach(item1 => {
 				this.selectData3.forEach(item1 => {
 					this.labelList.forEach(item2 => {
 					this.labelList.forEach(item2 => {
 						if (item1.value == item2) {
 						if (item1.value == item2) {
@@ -656,7 +657,11 @@ export default {
 		.stopBtn{
 		.stopBtn{
 			color: #E7A20E;
 			color: #E7A20E;
 		}
 		}
-		
+		.tagName{
+			.el-tag{
+				margin:0 5px;
+			}
+		}
 	}
 	}
 	.el-pagination{
 	.el-pagination{
 		margin-top: 50px;
 		margin-top: 50px;