添加教师库部分

main
王家东 3 months ago
parent 3d51e6c8e5
commit 0b0aeb2d25
  1. 7
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/InstructorSheet.java
  2. 23
      jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
  3. 2
      jeecgboot-vue3-master/src/views/system/userTEA/index.vue

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date; import java.util.Date;
@ -57,6 +58,11 @@ public class InstructorSheet implements Serializable {
@Excel(name = "指导老师类型", width = 15, dicCode = "teacher_type") @Excel(name = "指导老师类型", width = 15, dicCode = "teacher_type")
@ApiModelProperty(value = "指导老师类型") @ApiModelProperty(value = "指导老师类型")
private java.lang.Integer teacherType; 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) @Excel(name = "指导老师姓名", width = 15)
@ApiModelProperty(value = "指导老师姓名") @ApiModelProperty(value = "指导老师姓名")
@ -81,4 +87,5 @@ public class InstructorSheet implements Serializable {
private java.lang.String teacherPhone; private java.lang.String teacherPhone;
} }

@ -156,12 +156,23 @@ export const instructorSheetColumns: JVxeColumn[] = [
defaultValue: '', defaultValue: '',
}, },
{ {
title: '指导老师姓名', title: '指导老师姓名',
key: 'teacherName', key: 'teacherName',
type: JVxeTypes.input, type: JVxeTypes.popup,
width: '200px', popupCode: 'findtea',
placeholder: '请输入${title}', fieldConfig: [
defaultValue: '', { 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: '学历', title: '学历',

@ -8,7 +8,7 @@
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" >导入</j-upload-button> <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" >导入</j-upload-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导入模板</a-button> <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导入模板</a-button>-->
<JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" /> <JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" />
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay> <template #overlay>

Loading…
Cancel
Save