From 60492f6e60f29ea8da071ac7052ffa565344c540 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Sat, 6 Jul 2024 18:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E8=80=81=E5=B8=8806-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/InstructorSheet.java               | 17 ++++++++
 .../src/settings/registerThirdComp.ts         |  4 +-
 ...nualCompetitionProjectRegistration.data.ts | 40 +++++++++++++++++++
 3 files changed, 59 insertions(+), 2 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 986666d8..18fc1041 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
@@ -64,4 +64,21 @@ public class InstructorSheet implements Serializable {
 	/**报名编号*/
     @ApiModelProperty(value = "报名编号")
     private java.lang.String enrollCode;
+
+    @ApiModelProperty(value = "'学历'")
+    private java.lang.String teacherXl;
+
+    @ApiModelProperty(value = "职称")
+    private java.lang.String teacherZc;
+
+    @ApiModelProperty(value = "专业")
+    private java.lang.String teacherZy;
+
+    @ApiModelProperty(value = "研究方向")
+    private java.lang.String teacherYjfx;
+
+    @ApiModelProperty(value = "手机号")
+    private java.lang.String teacherPhone;
+
+
 }
diff --git a/jeecgboot-vue3-master/src/settings/registerThirdComp.ts b/jeecgboot-vue3-master/src/settings/registerThirdComp.ts
index 2001a452..7cfec462 100644
--- a/jeecgboot-vue3-master/src/settings/registerThirdComp.ts
+++ b/jeecgboot-vue3-master/src/settings/registerThirdComp.ts
@@ -3,7 +3,7 @@ import { registerJVxeTable } from '/@/components/jeecg/JVxeTable';
 import { registerJVxeCustom } from '/@/components/JVxeCustom';
 
 // 注册全局聊天表情包
-import { Picker } from 'emoji-mart-vue-fast/src';
+//import { Picker } from 'emoji-mart-vue-fast/src';
 import { EmojiIndex } from "emoji-mart-vue-fast/src";
 import data from "emoji-mart-vue-fast/data/apple.json";
 
@@ -19,7 +19,7 @@ export async function registerThirdComp(app: App) {
   await registerJVxeCustom();
   //---------------------------------------------------------------------
   // 注册全局聊天表情包
-  app.component('Picker', Picker);
+  //app.component('Picker', Picker);
   let myEmojiIndex = new EmojiIndex(data, {
     function() {
       return true;
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 c3d184f8..7aa044ca 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
@@ -145,6 +145,46 @@ export const instructorSheetColumns: JVxeColumn[] = [
         placeholder: '请输入${title}',
         defaultValue: '',
     },
+    {
+      title: '学历',
+      key: 'teacherXl',
+      type: JVxeTypes.input,
+      width: '200px',
+      placeholder: '请输入${title}',
+      defaultValue: '',
+    },
+    {
+      title: '职称',
+      key: 'teacherZc',
+      type: JVxeTypes.input,
+      width: '200px',
+      placeholder: '请输入${title}',
+      defaultValue: '',
+    },
+    {
+      title: '专业',
+      key: 'teacherZy',
+      type: JVxeTypes.input,
+      width: '200px',
+      placeholder: '请输入${title}',
+      defaultValue: '',
+    },
+    {
+      title: '研究方向',
+      key: 'teacherYjfx',
+      type: JVxeTypes.input,
+      width: '200px',
+      placeholder: '请输入${title}',
+      defaultValue: '',
+    },
+    {
+      title: '手机号',
+      key: 'teacherPhone',
+      type: JVxeTypes.input,
+      width: '200px',
+      placeholder: '请输入${title}',
+      defaultValue: '',
+    },
 ];
 
 /**