Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

src/views/etpManage/index.vue

@@ -40,12 +40,13 @@
 				<!-- <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> -->
 				<el-table-column type="selection" width="55"></el-table-column>
 				<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
-				<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
-				<el-table-column prop="ktpName" label="专家库名称" align="center">
+				<!-- <el-table-column prop="ktpName" label="专家库名称" align="center">
 					<template slot-scope="scope">
 						<span >{{dicObj.name[scope.row.ktpName] == null ? (scope.row.ktpName):dicObj.name[scope.row.ktpName]}}</span>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
+				<el-table-column prop="ktpName" label="专家库名称" align="center"></el-table-column>
+				<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
 				<el-table-column prop="talentName" label="专家名称" align="center"></el-table-column>
 				<el-table-column prop="" width="250" label="专业标签" align="center">
 					<template slot-scope="scope">
@@ -98,8 +99,8 @@
 					</div>
 					<div class="dialog_form_item">
 						<div class="dialog_form_item_title">专家库名称</div>
-						<el-select v-model="formData.name" placeholder="请选择" clearable class="search_item">
-                			<el-option v-for="(item,idnex) in selectData1" :key="idnex" :label="item.name" :value="item.ktpId" ></el-option>
+						<el-select v-model="formData.ktpName" placeholder="请选择" clearable class="search_item">
+                			<el-option v-for="(item,idnex) in selectData1" :key="idnex" :label="item.ktpName" :value="item.ktpName" ></el-option>
 						</el-select>
 					</div>
 					<div class="dialog_form_item">
@@ -176,7 +177,7 @@ export default {
 			openType: "",
 			formData: {
 				deptName: "",
-				name: "",
+				ktpName: "",
 				talentName: "",
 				klTaglist: [],
 				level: "",
@@ -320,7 +321,7 @@ export default {
 				this.title = "编辑专家人才库";
 				this.resetForm();
 				this.formData = item;
-				this.formData.name = Number(this.formData.name);
+				// this.formData.ktpName = Number(this.formData.ktpName);
 				this.formData.state = String(this.formData.state);
 				this.formData.level = String(this.formData.level);
 				this.formData.klTaglist = [];
@@ -418,7 +419,7 @@ export default {
 		resetForm(){
 			this.formData = {
 				deptName: "",
-				name: "",
+				ktpName: "",
 				talentName: "",
 				klTaglist: [],
 				level: "",