From 0b0aeb2d252c96442c48035d2b2c2f2281161e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Wed, 28 Aug 2024 17:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=99=E5=B8=88=E5=BA=93?=
=?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/InstructorSheet.java | 7 ++++++
...nualCompetitionProjectRegistration.data.ts | 23 ++++++++++++++-----
.../src/views/system/userTEA/index.vue | 2 +-
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/InstructorSheet.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/InstructorSheet.java
index 4dc80590..787e8306 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/InstructorSheet.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/InstructorSheet.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
@@ -57,6 +58,11 @@ public class InstructorSheet implements Serializable {
@Excel(name = "指导老师类型", width = 15, dicCode = "teacher_type")
@ApiModelProperty(value = "指导老师类型")
private java.lang.Integer teacherType;
+ /**教师id*/
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+ @ApiModelProperty(value = "指导老师姓名")
+ private java.lang.String teacherid;
+
/**指导老师姓名*/
@Excel(name = "指导老师姓名", width = 15)
@ApiModelProperty(value = "指导老师姓名")
@@ -81,4 +87,5 @@ public class InstructorSheet implements Serializable {
private java.lang.String teacherPhone;
+
}
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
index 15da55c8..f181905c 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
@@ -156,12 +156,23 @@ export const instructorSheetColumns: JVxeColumn[] = [
defaultValue: '',
},
{
- title: '指导老师姓名',
- key: 'teacherName',
- type: JVxeTypes.input,
- width: '200px',
- placeholder: '请输入${title}',
- defaultValue: '',
+ title: '指导老师姓名',
+ key: 'teacherName',
+ type: JVxeTypes.popup,
+ popupCode: 'findtea',
+ fieldConfig: [
+ { source: 'realname', target: 'teacherName' },
+ { source: 'exp_title', target: 'teacherXl' },
+ { source: 'exp_zc', target: 'teacherZc' },
+ { source: 'teamajor', target: 'teacherZy' },
+ { source: 'exp_yjfx', target: 'teacherYjfx' },
+ { source: 'phone', target: 'teacherPhone' },
+ { source: 'id', target: 'teacherid' },
+ ],
+
+ width: '200px',
+ placeholder: '请输入${title}',
+ defaultValue: '',
},
{
title: '学历',
diff --git a/jeecgboot-vue3-master/src/views/system/userTEA/index.vue b/jeecgboot-vue3-master/src/views/system/userTEA/index.vue
index 1354a90d..d4f99d76 100644
--- a/jeecgboot-vue3-master/src/views/system/userTEA/index.vue
+++ b/jeecgboot-vue3-master/src/views/system/userTEA/index.vue
@@ -8,7 +8,7 @@
导出
导入
- 导入模板
+