1、文章信息字段调整

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/controller/EducationThesisController.java

@@ -55,7 +55,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Api(tags="论文信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationCourse.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 课程安排表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_course对象", description="课程安排表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationDocument.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 附加材料表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_document对象", description="附加材料表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationPeriodical.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 期刊推荐表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_periodical对象", description="期刊推荐表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationProcess.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 发表全流程辅导
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_process对象", description="发表全流程辅导")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTarget.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 发表方向表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_target对象", description="发表方向表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTeacher.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 师资力量表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_teacher对象", description="师资力量表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationThesis.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_thesis对象", description="论文信息表")
@@ -54,6 +54,10 @@ public class EducationThesis implements Serializable {
     @Dict(dictTable = "education_category_thesis", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "二级分类")
     private java.lang.String categoryTwo;
+	/**封面/海报图片*/
+	@Excel(name = "封面/海报图片", width = 15)
+    @ApiModelProperty(value = "封面/海报图片")
+    private java.lang.String paperImage;
 	/**标题*/
 	@Excel(name = "标题", width = 15)
     @ApiModelProperty(value = "标题")
@@ -66,26 +70,14 @@ public class EducationThesis implements Serializable {
 	@Excel(name = "详情页图片", width = 15)
     @ApiModelProperty(value = "详情页图片")
     private java.lang.String image;
-	/**发表全流程辅导*/
-	@Excel(name = "发表全流程辅导", width = 15)
-    @ApiModelProperty(value = "发表全流程辅导")
-    private java.lang.String process;
-	/**适用人群*/
-	@Excel(name = "适用人群", width = 15)
-    @ApiModelProperty(value = "适用人群")
-    private java.lang.String suit;
-	/**封面/海报图片*/
-	@Excel(name = "封面/海报图片", width = 15)
-    @ApiModelProperty(value = "封面/海报图片")
-    private java.lang.String paperImage;
-	/**海报文字描述*/
-	@Excel(name = "海报文字描述", width = 15)
-    @ApiModelProperty(value = "海报文字描述")
-    private java.lang.String paperDesc;
 	/**模块一标题*/
 	@Excel(name = "模块一标题", width = 15)
     @ApiModelProperty(value = "模块一标题")
     private java.lang.String processTitle;
+	/**发表全流程辅导*/
+	@Excel(name = "发表全流程辅导", width = 15)
+    @ApiModelProperty(value = "发表全流程辅导")
+    private java.lang.String process;
 	/**模块二标题*/
 	@Excel(name = "模块二标题", width = 15)
     @ApiModelProperty(value = "模块二标题")
@@ -102,6 +94,10 @@ public class EducationThesis implements Serializable {
 	@Excel(name = "模块五标题", width = 15)
     @ApiModelProperty(value = "模块五标题")
     private java.lang.String suitTitle;
+	/**适用人群*/
+	@Excel(name = "适用人群", width = 15)
+    @ApiModelProperty(value = "适用人群")
+    private java.lang.String suit;
 	/**模块六标题*/
 	@Excel(name = "模块六标题", width = 15)
     @ApiModelProperty(value = "模块六标题")
@@ -110,6 +106,15 @@ public class EducationThesis implements Serializable {
 	@Excel(name = "模块七标题", width = 15)
     @ApiModelProperty(value = "模块七标题")
     private java.lang.String documentTitle;
+	/**海报文字描述*/
+	@Excel(name = "海报文字描述", width = 15)
+    @ApiModelProperty(value = "海报文字描述")
+    private java.lang.String paperDesc;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String tag;
+
 
     //发表全流程辅导
     @TableField(exist = false)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationCourseMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 课程安排表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationCourseMapper extends BaseMapper<EducationCourse> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationDocumentMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 附加材料表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationDocumentMapper extends BaseMapper<EducationDocument> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationPeriodicalMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 期刊推荐表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationPeriodicalMapper extends BaseMapper<EducationPeriodical> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationProcessMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 发表全流程辅导
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationProcessMapper extends BaseMapper<EducationProcess> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTargetMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 发表方向表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationTargetMapper extends BaseMapper<EducationTarget> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTeacherMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 师资力量表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationTeacherMapper extends BaseMapper<EducationTeacher> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationThesisMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationThesisMapper extends BaseMapper<EducationThesis> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationCourseService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 课程安排表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationCourseService extends IService<EducationCourse> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationDocumentService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 附加材料表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationDocumentService extends IService<EducationDocument> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationPeriodicalService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 期刊推荐表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationPeriodicalService extends IService<EducationPeriodical> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationProcessService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 发表全流程辅导
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationProcessService extends IService<EducationProcess> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTargetService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 发表方向表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationTargetService extends IService<EducationTarget> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTeacherService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 师资力量表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationTeacherService extends IService<EducationTeacher> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationThesisService.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationThesisService extends IService<EducationThesis> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationCourseServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 课程安排表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationDocumentServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 附加材料表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationPeriodicalServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 期刊推荐表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationProcessServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 发表全流程辅导
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTargetServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 发表方向表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTeacherServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 师资力量表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationThesisServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.Collection;
 /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vo/EducationThesisPage.java

@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 论文信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-13
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Data
@@ -53,6 +53,10 @@ public class EducationThesisPage {
     @Dict(dictTable = "education_category_thesis", dicText = "title", dicCode = "id")
 	@ApiModelProperty(value = "二级分类")
     private java.lang.String categoryTwo;
+	/**封面/海报图片*/
+	@Excel(name = "封面/海报图片", width = 15)
+	@ApiModelProperty(value = "封面/海报图片")
+    private java.lang.String paperImage;
 	/**标题*/
 	@Excel(name = "标题", width = 15)
 	@ApiModelProperty(value = "标题")
@@ -65,26 +69,14 @@ public class EducationThesisPage {
 	@Excel(name = "详情页图片", width = 15)
 	@ApiModelProperty(value = "详情页图片")
     private java.lang.String image;
-	/**发表全流程辅导*/
-	@Excel(name = "发表全流程辅导", width = 15)
-	@ApiModelProperty(value = "发表全流程辅导")
-    private java.lang.String process;
-	/**适用人群*/
-	@Excel(name = "适用人群", width = 15)
-	@ApiModelProperty(value = "适用人群")
-    private java.lang.String suit;
-	/**封面/海报图片*/
-	@Excel(name = "封面/海报图片", width = 15)
-	@ApiModelProperty(value = "封面/海报图片")
-    private java.lang.String paperImage;
-	/**海报文字描述*/
-	@Excel(name = "海报文字描述", width = 15)
-	@ApiModelProperty(value = "海报文字描述")
-    private java.lang.String paperDesc;
 	/**模块一标题*/
 	@Excel(name = "模块一标题", width = 15)
 	@ApiModelProperty(value = "模块一标题")
     private java.lang.String processTitle;
+	/**发表全流程辅导*/
+	@Excel(name = "发表全流程辅导", width = 15)
+	@ApiModelProperty(value = "发表全流程辅导")
+    private java.lang.String process;
 	/**模块二标题*/
 	@Excel(name = "模块二标题", width = 15)
 	@ApiModelProperty(value = "模块二标题")
@@ -101,6 +93,10 @@ public class EducationThesisPage {
 	@Excel(name = "模块五标题", width = 15)
 	@ApiModelProperty(value = "模块五标题")
     private java.lang.String suitTitle;
+	/**适用人群*/
+	@Excel(name = "适用人群", width = 15)
+	@ApiModelProperty(value = "适用人群")
+    private java.lang.String suit;
 	/**模块六标题*/
 	@Excel(name = "模块六标题", width = 15)
 	@ApiModelProperty(value = "模块六标题")
@@ -109,6 +105,14 @@ public class EducationThesisPage {
 	@Excel(name = "模块七标题", width = 15)
 	@ApiModelProperty(value = "模块七标题")
     private java.lang.String documentTitle;
+	/**海报文字描述*/
+	@Excel(name = "海报文字描述", width = 15)
+	@ApiModelProperty(value = "海报文字描述")
+    private java.lang.String paperDesc;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+	@ApiModelProperty(value = "标签")
+    private java.lang.String tag;
 
 	@ExcelCollection(name="发表全流程辅导")
 	@ApiModelProperty(value = "发表全流程辅导")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/EducationThesisList.vue

@@ -151,6 +151,12 @@
             align:"center",
             dataIndex: 'categoryTwo_dictText'
           },
+          {
+            title:'封面/海报图片',
+            align:"center",
+            dataIndex: 'paperImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
           {
             title:'标题',
             align:"center",
@@ -168,33 +174,16 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'发表全流程辅导',
+            title:'模块一标题',
             align:"center",
-            dataIndex: 'process',
-            scopedSlots: {customRender: 'htmlSlot'}
+            dataIndex: 'processTitle'
           },
           {
-            title:'适用人群',
+            title:'发表全流程辅导',
             align:"center",
-            dataIndex: 'suit',
+            dataIndex: 'process',
             scopedSlots: {customRender: 'htmlSlot'}
           },
-          {
-            title:'封面/海报图片',
-            align:"center",
-            dataIndex: 'paperImage',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'海报文字描述',
-            align:"center",
-            dataIndex: 'paperDesc'
-          },
-          {
-            title:'模块一标题',
-            align:"center",
-            dataIndex: 'processTitle'
-          },
           {
             title:'模块二标题',
             align:"center",
@@ -215,6 +204,12 @@
             align:"center",
             dataIndex: 'suitTitle'
           },
+          {
+            title:'适用人群',
+            align:"center",
+            dataIndex: 'suit',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
           {
             title:'模块六标题',
             align:"center",
@@ -225,6 +220,11 @@
             align:"center",
             dataIndex: 'documentTitle'
           },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'tag'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -261,20 +261,20 @@
         let fieldList=[];
          fieldList.push({type:'string',value:'categoryOne',text:'一级分类'})
          fieldList.push({type:'string',value:'categoryTwo',text:'二级分类',dictCode:"education_category_thesis,title,id"})
+         fieldList.push({type:'Text',value:'paperImage',text:'封面/海报图片',dictCode:''})
          fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
          fieldList.push({type:'Text',value:'shortTitle',text:'副标题',dictCode:''})
          fieldList.push({type:'Text',value:'image',text:'详情页图片',dictCode:''})
-         fieldList.push({type:'Text',value:'process',text:'发表全流程辅导',dictCode:''})
-         fieldList.push({type:'Text',value:'suit',text:'适用人群',dictCode:''})
-         fieldList.push({type:'Text',value:'paperImage',text:'封面/海报图片',dictCode:''})
-         fieldList.push({type:'Text',value:'paperDesc',text:'海报文字描述',dictCode:''})
          fieldList.push({type:'Text',value:'processTitle',text:'模块一标题',dictCode:''})
+         fieldList.push({type:'Text',value:'process',text:'发表全流程辅导',dictCode:''})
          fieldList.push({type:'Text',value:'targetTitle',text:'模块二标题',dictCode:''})
          fieldList.push({type:'Text',value:'teacherTitle',text:'模块三标题',dictCode:''})
          fieldList.push({type:'Text',value:'courseTitle',text:'模块四标题',dictCode:''})
          fieldList.push({type:'Text',value:'suitTitle',text:'模块五标题',dictCode:''})
+         fieldList.push({type:'Text',value:'suit',text:'适用人群',dictCode:''})
          fieldList.push({type:'Text',value:'periodicalTitle',text:'模块六标题',dictCode:''})
          fieldList.push({type:'Text',value:'documentTitle',text:'模块七标题',dictCode:''})
+         fieldList.push({type:'Text',value:'tag',text:'标签',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/modules/EducationThesisForm.vue

@@ -14,6 +14,11 @@
               <j-dict-select-tag type="list" v-model="model.categoryTwo" dictCode="education_category_thesis,title,id" placeholder="请选择二级分类" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" >
+            <a-form-model-item label="封面/海报图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paperImage">
+              <j-image-upload isMultiple  v-model="model.paperImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24" >
             <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
               <a-input v-model="model.title" placeholder="请输入标题" ></a-input>
@@ -30,28 +35,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-model-item label="发表全流程辅导" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="process">
-              <j-editor v-model="model.process" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="适用人群" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suit">
-              <j-editor v-model="model.suit" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="封面/海报图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paperImage">
-              <j-image-upload isMultiple  v-model="model.paperImage" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="海报文字描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paperDesc">
-              <a-textarea v-model="model.paperDesc" rows="4" placeholder="请输入海报文字描述" />
+            <a-form-model-item label="模块一标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTitle">
+              <a-input v-model="model.processTitle" placeholder="请输入模块一标题" ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-model-item label="模块一标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTitle">
-              <a-input v-model="model.processTitle" placeholder="请输入模块一标题" ></a-input>
+            <a-form-model-item label="发表全流程辅导" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="process">
+              <j-editor v-model="model.process" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
@@ -74,6 +64,11 @@
               <a-input v-model="model.suitTitle" placeholder="请输入模块五标题" ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" >
+            <a-form-model-item label="适用人群" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suit">
+              <j-editor v-model="model.suit" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24" >
             <a-form-model-item label="模块六标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="periodicalTitle">
               <a-input v-model="model.periodicalTitle" placeholder="请输入模块六标题" ></a-input>
@@ -84,6 +79,11 @@
               <a-input v-model="model.documentTitle" placeholder="请输入模块七标题" ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" >
+            <a-form-model-item label="标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tag">
+              <a-input v-model="model.tag" placeholder="请输入标签" ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -188,6 +188,13 @@
           sm: { span: 16 },
         },
         model:{
+            processTitle:"发表全流程辅导",
+            targetTitle:"发表方向",
+            teacherTitle:"师资介绍",
+            courseTitle:"课程安排",
+            suitTitle:"适用人群",
+            periodicalTitle:"期刊推荐",
+            documentTitle:"附加材料",
         },
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/controller/EducationThesisTwoController.java

@@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Api(tags="论文信息表二")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationDocumentTwo.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 附加材料表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_document_two对象", description="附加材料表二")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelOne.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 表格一
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_excel_one对象", description="表格一")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelTwo.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 表格二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_excel_two对象", description="表格二")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationThesisTwo.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @ApiModel(value="education_thesis_two对象", description="论文信息表二")
@@ -133,6 +133,11 @@ public class EducationThesisTwo implements Serializable {
 	@Excel(name = "表格标题二", width = 15)
     @ApiModelProperty(value = "表格标题二")
     private java.lang.String titleExcelTwo;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String tag;
+
 
     //表格一
     @TableField(exist = false)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationDocumentTwoMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 附加材料表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationDocumentTwoMapper extends BaseMapper<EducationDocumentTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelOneMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 表格一
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationExcelOneMapper extends BaseMapper<EducationExcelOne> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelTwoMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 表格二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationExcelTwoMapper extends BaseMapper<EducationExcelTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationThesisTwoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface EducationThesisTwoMapper extends BaseMapper<EducationThesisTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationDocumentTwoService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 附加材料表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationDocumentTwoService extends IService<EducationDocumentTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelOneService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 表格一
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationExcelOneService extends IService<EducationExcelOne> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelTwoService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 表格二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationExcelTwoService extends IService<EducationExcelTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationThesisTwoService.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 public interface IEducationThesisTwoService extends IService<EducationThesisTwo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationDocumentTwoServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 附加材料表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelOneServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 表格一
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelTwoServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 表格二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationThesisTwoServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.Collection;
 /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vo/EducationThesisTwoPage.java

@@ -19,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 论文信息表二
  * @Author: jeecg-boot
- * @Date:   2025-08-12
+ * @Date:   2025-09-15
  * @Version: V1.0
  */
 @Data
@@ -129,6 +129,10 @@ public class EducationThesisTwoPage {
 	@Excel(name = "表格标题二", width = 15)
 	@ApiModelProperty(value = "表格标题二")
     private java.lang.String titleExcelTwo;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+	@ApiModelProperty(value = "标签")
+    private java.lang.String tag;
 
 	@ExcelCollection(name="表格一")
 	@ApiModelProperty(value = "表格一")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/EducationThesisTwoList.vue

@@ -239,6 +239,11 @@
             align:"center",
             dataIndex: 'titleExcelTwo'
           },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'tag'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -295,6 +300,7 @@
          fieldList.push({type:'Text',value:'cotentModuleSeven',text:'模块内容七',dictCode:''})
          fieldList.push({type:'Text',value:'titleExcelOne',text:'表格标题一',dictCode:''})
          fieldList.push({type:'Text',value:'titleExcelTwo',text:'表格标题二',dictCode:''})
+         fieldList.push({type:'Text',value:'tag',text:'标签',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/modules/EducationThesisTwoForm.vue

@@ -114,6 +114,11 @@
               <a-input v-model="model.titleExcelTwo" placeholder="请输入表格标题二" ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" >
+            <a-form-model-item label="标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tag">
+              <a-input v-model="model.tag" placeholder="请输入标签" ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.api.ts

@@ -0,0 +1,80 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/educationThesisTwo/educationThesisTwo/list',
+  save='/educationThesisTwo/educationThesisTwo/add',
+  edit='/educationThesisTwo/educationThesisTwo/edit',
+  deleteOne = '/educationThesisTwo/educationThesisTwo/delete',
+  deleteBatch = '/educationThesisTwo/educationThesisTwo/deleteBatch',
+  importExcel = '/educationThesisTwo/educationThesisTwo/importExcel',
+  exportXls = '/educationThesisTwo/educationThesisTwo/exportXls',
+  educationExcelOneList = '/educationThesisTwo/educationThesisTwo/queryEducationExcelOneByMainId',
+  educationExcelTwoList = '/educationThesisTwo/educationThesisTwo/queryEducationExcelTwoByMainId',
+  educationDocumentTwoList = '/educationThesisTwo/educationThesisTwo/queryEducationDocumentTwoByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const educationExcelOneList = Api.educationExcelOneList;
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const educationExcelTwoList = Api.educationExcelTwoList;
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const educationDocumentTwoList = Api.educationDocumentTwoList;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.data.ts

@@ -0,0 +1,318 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '一级分类',
+    align:"center",
+    dataIndex: 'categoryOne'
+   },
+   {
+    title: '二级分类',
+    align:"center",
+    dataIndex: 'categoryTwo_dictText'
+   },
+   {
+    title: '标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '副标题',
+    align:"center",
+    dataIndex: 'shortTitle'
+   },
+   {
+    title: '封面/海报图片',
+    align:"center",
+    dataIndex: 'paperImage',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '详情页图片',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '模块标题一',
+    align:"center",
+    dataIndex: 'titleModuleOne'
+   },
+   {
+    title: '模块内容一',
+    align:"center",
+    dataIndex: 'cotentModuleOne',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题二',
+    align:"center",
+    dataIndex: 'titleModuleTwo'
+   },
+   {
+    title: '模块内容二',
+    align:"center",
+    dataIndex: 'cotentModuleTwo',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题三',
+    align:"center",
+    dataIndex: 'titleModuleThree'
+   },
+   {
+    title: '模块内容三',
+    align:"center",
+    dataIndex: 'cotentModuleThree',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题四',
+    align:"center",
+    dataIndex: 'titleModuleFour'
+   },
+   {
+    title: '模块内容四',
+    align:"center",
+    dataIndex: 'cotentModuleFour',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题五',
+    align:"center",
+    dataIndex: 'titleModuleFive'
+   },
+   {
+    title: '模块内容五',
+    align:"center",
+    dataIndex: 'cotentModuleFive',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题六',
+    align:"center",
+    dataIndex: 'titleModuleSix'
+   },
+   {
+    title: '模块内容六',
+    align:"center",
+    dataIndex: 'cotentModuleSix',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '模块标题七',
+    align:"center",
+    dataIndex: 'titleModuleSeven'
+   },
+   {
+    title: '模块内容七',
+    align:"center",
+    dataIndex: 'cotentModuleSeven',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '表格标题一',
+    align:"center",
+    dataIndex: 'titleExcelOne'
+   },
+   {
+    title: '表格标题二',
+    align:"center",
+    dataIndex: 'titleExcelTwo'
+   },
+   {
+    title: '标签',
+    align:"center",
+    dataIndex: 'tag'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '一级分类',
+    field: 'categoryOne',
+    component: 'Input',
+  },
+  {
+    label: '二级分类',
+    field: 'categoryTwo',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:""
+     },
+  },
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '副标题',
+    field: 'shortTitle',
+    component: 'Input',
+  },
+  {
+    label: '封面/海报图片',
+    field: 'paperImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '详情页图片',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '模块标题一',
+    field: 'titleModuleOne',
+    component: 'Input',
+  },
+  {
+    label: '模块内容一',
+    field: 'cotentModuleOne',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题二',
+    field: 'titleModuleTwo',
+    component: 'Input',
+  },
+  {
+    label: '模块内容二',
+    field: 'cotentModuleTwo',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题三',
+    field: 'titleModuleThree',
+    component: 'Input',
+  },
+  {
+    label: '模块内容三',
+    field: 'cotentModuleThree',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题四',
+    field: 'titleModuleFour',
+    component: 'Input',
+  },
+  {
+    label: '模块内容四',
+    field: 'cotentModuleFour',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题五',
+    field: 'titleModuleFive',
+    component: 'Input',
+  },
+  {
+    label: '模块内容五',
+    field: 'cotentModuleFive',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题六',
+    field: 'titleModuleSix',
+    component: 'Input',
+  },
+  {
+    label: '模块内容六',
+    field: 'cotentModuleSix',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '模块标题七',
+    field: 'titleModuleSeven',
+    component: 'Input',
+  },
+  {
+    label: '模块内容七',
+    field: 'cotentModuleSeven',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '表格标题一',
+    field: 'titleExcelOne',
+    component: 'Input',
+  },
+  {
+    label: '表格标题二',
+    field: 'titleExcelTwo',
+    component: 'Input',
+  },
+  {
+    label: '标签',
+    field: 'tag',
+    component: 'Input',
+  },
+];
+//子表单数据
+//子表表格配置
+export const educationExcelOneColumns: JVxeColumn[] = [
+    {
+      title: '第一列',
+      key: 'columnOne',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '第二列',
+      key: 'columnTwo',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+export const educationExcelTwoColumns: JVxeColumn[] = [
+    {
+      title: '第一列',
+      key: 'columnOne',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '第二列',
+      key: 'columnTwo',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+export const educationDocumentTwoColumns: JVxeColumn[] = [
+    {
+      title: '标题',
+      key: 'title',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '文件',
+      key: 'document',
+      type: JVxeTypes.file,
+      token:true,
+      responseName:"message",
+      width:"200px",
+      placeholder: '请选择文件',
+      defaultValue:'',
+    },
+  ]

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwoList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</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>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EducationThesisTwoModal @register="registerModal" @success="handleSuccess"></EducationThesisTwoModal>
+  </div>
+</template>
+
+<script lang="ts" name="educationThesisTwo-educationThesisTwo" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import EducationThesisTwoModal from './components/EducationThesisTwoModal.vue'
+  import {columns, searchFormSchema} from './educationThesisTwo.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './educationThesisTwo.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '论文信息表二',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+                labelWidth: 120,
+                schemas: searchFormSchema,
+                autoSubmitOnEnter:true,
+                showAdvancedButton:true,
+                fieldMapToTime: [
+                ],
+            },
+            actionColumn: {
+               width: 120,
+            },
+        },
+        exportConfig: {
+            name:"论文信息表二",
+            url: getExportUrl,
+        },
+        importConfig: {
+            url: getImportUrl
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/components/EducationThesisTwoModal.vue

@@ -0,0 +1,149 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm" ref="formRef"/>
+  <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" @change="handleChangeTabs">
+      <a-tab-pane tab="表格一" :key="refKeys[0]" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          :ref="refKeys[0]"
+          :loading="educationExcelOneTable.loading"
+          :columns="educationExcelOneTable.columns"
+          :dataSource="educationExcelOneTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+      <a-tab-pane tab="表格二" :key="refKeys[1]" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          :ref="refKeys[1]"
+          :loading="educationExcelTwoTable.loading"
+          :columns="educationExcelTwoTable.columns"
+          :dataSource="educationExcelTwoTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+      <a-tab-pane tab="附加材料表二" :key="refKeys[2]" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          :ref="refKeys[2]"
+          :loading="educationDocumentTwoTable.loading"
+          :columns="educationDocumentTwoTable.columns"
+          :dataSource="educationDocumentTwoTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+    </a-tabs>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref,reactive} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,educationExcelOneColumns,educationExcelTwoColumns,educationDocumentTwoColumns} from '../educationThesisTwo.data';
+    import {saveOrUpdate,educationExcelOneList,educationExcelTwoList,educationDocumentTwoList} from '../educationThesisTwo.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const refKeys = ref(['educationExcelOne', 'educationExcelTwo', 'educationDocumentTwo', ]);
+    const activeKey = ref('educationExcelOne');
+    const educationExcelOne = ref();
+    const educationExcelTwo = ref();
+    const educationDocumentTwo = ref();
+    const tableRefs = {educationExcelOne, educationExcelTwo, educationDocumentTwo, };
+    const educationExcelOneTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:educationExcelOneColumns
+    })
+    const educationExcelTwoTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:educationExcelTwoColumns
+    })
+    const educationDocumentTwoTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:educationDocumentTwoColumns
+    })
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+     //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await reset();
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+             requestSubTableData(educationExcelOneList, {id:data?.record?.id}, educationExcelOneTable)
+             requestSubTableData(educationExcelTwoList, {id:data?.record?.id}, educationExcelTwoTable)
+             requestSubTableData(educationDocumentTwoList, {id:data?.record?.id}, educationDocumentTwoTable)
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'educationExcelOne';
+      educationExcelOneTable.dataSource = [];
+      educationExcelTwoTable.dataSource = [];
+      educationDocumentTwoTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           educationExcelOneList: allValues.tablesValue[0].tableData,
+           educationExcelTwoList: allValues.tablesValue[1].tableData,
+           educationDocumentTwoList: allValues.tablesValue[2].tableData,
+         }
+       }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+        try {
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>