专家模块添加

jeecg-boot/jeecg-module-demo/pom.xml

@@ -16,6 +16,10 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-biz</artifactId>
+        </dependency>
     </dependencies>
 
-</project>
+</project>

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -0,0 +1,220 @@
+package org.jeecg.modules.demo.expert.controller;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.PasswordUtil;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.expert.entity.Expert;
+import org.jeecg.modules.demo.expert.service.IExpertService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 专家管理
+ * @Author: jeecg-boot
+ * @Date:   2024-09-29
+ * @Version: V1.0
+ */
+@Api(tags="专家管理")
+@RestController
+@RequestMapping("/expert/expert")
+@Slf4j
+public class ExpertController extends JeecgController<Expert, IExpertService> {
+	@Autowired
+	private IExpertService expertService;
+	 @Autowired
+	 private ISysUserService sysUserService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param expert
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "专家管理-分页列表查询")
+	@ApiOperation(value="专家管理-分页列表查询", notes="专家管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<Expert>> queryPageList(Expert expert,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
+		Page<Expert> page = new Page<Expert>(pageNo, pageSize);
+		IPage<Expert> pageList = expertService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param expert
+	 * @return
+	 */
+	@AutoLog(value = "专家管理-添加")
+	@ApiOperation(value="专家管理-添加", notes="专家管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody Expert expert) {
+		//先判断两个密码是否相同
+		if (!expert.getPsd().equals(expert.getSepsd())){
+			return Result.OK().error500("两次输入的密码不同");
+		}
+		//判断是用户名是否存在
+		String isusername = expertService.isusername(expert.getSeusername());
+		if(isusername.equals("1")){
+			Result.OK().error500("当前的用户名已经存在");
+		}
+		//判断工号是否存在
+		String isworkon =expertService.isworkon(expert.getWorkon());
+		if (isworkon.equals("1")){
+			Result.OK().error500("当前的工号已经存在");
+		}
+		//判断电话号码是否存在
+		String isphone = expertService.isphone(expert.getPhone());
+		if (isphone.equals("1")){
+			Result.OK().error500("当前的电话号码已经存在");
+		}
+		//判断电子邮件是否存在
+		String isemils = expertService.isemils(expert.getEmails());
+		if (isemils.equals("1")){
+			Result.OK().error500("当前的电子邮件已经存在");
+		}
+
+		//开始添加到用户表
+		SysUser user = new SysUser();
+		user.setAvatar(expert.getTopPic());
+		user.setSex(expert.getSex());
+		user.setRealname(expert.getRealname());
+		user.setUsername(expert.getSeusername());
+		user.setWorkNo(expert.getWorkon());
+		user.setEmail(expert.getEmails());
+		user.setPhone(expert.getPhone());
+		user.setCreateTime(new Date());//设置创建时间
+		String salt = oConvertUtils.randomGen(8);
+		user.setSalt(salt);
+		String passwordEncode = PasswordUtil.encrypt(expert.getSeusername(), expert.getPsd(), salt);
+		user.setPassword(passwordEncode);
+		user.setStatus(1);
+		user.setDelFlag(CommonConstant.DEL_FLAG_0);
+		sysUserService.saveUser(user, "1843478958968647681", expert.getSsdep(), "");
+		expertService.save(expert);
+		//
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param expert
+	 * @return
+	 */
+	@AutoLog(value = "专家管理-编辑")
+	@ApiOperation(value="专家管理-编辑", notes="专家管理-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody Expert expert) {
+		expertService.updateById(expert);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "专家管理-通过id删除")
+	@ApiOperation(value="专家管理-通过id删除", notes="专家管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		expertService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "专家管理-批量删除")
+	@ApiOperation(value="专家管理-批量删除", notes="专家管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.expertService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "专家管理-通过id查询")
+	@ApiOperation(value="专家管理-通过id查询", notes="专家管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<Expert> queryById(@RequestParam(name="id",required=true) String id) {
+		Expert expert = expertService.getById(id);
+		if(expert==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(expert);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param expert
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Expert expert) {
+        return super.exportXls(request, expert, Expert.class, "专家管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, Expert.class);
+    }
+
+}

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java

@@ -0,0 +1,113 @@
+package org.jeecg.modules.demo.expert.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 专家管理
+ * @Author: jeecg-boot
+ * @Date:   2024-09-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("expert")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="expert对象", description="专家管理")
+public class Expert implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private String seusername;
+	/**毕业院校*/
+	@Excel(name = "毕业院校", width = 15)
+    @ApiModelProperty(value = "毕业院校")
+    private String colleges;
+	/**专业*/
+	@Excel(name = "专业", width = 15)
+    @ApiModelProperty(value = "专业")
+    private String major;
+	/**研究方向*/
+	@Excel(name = "研究方向", width = 15)
+    @ApiModelProperty(value = "研究方向")
+    private String directioncal;
+	/**研究类型*/
+	@Excel(name = "研究类型", width = 15)
+    @ApiModelProperty(value = "研究类型")
+    private String research;
+	/**学历*/
+	@Excel(name = "学历", width = 15)
+    @ApiModelProperty(value = "学历")
+    private String educationcal;
+	/**专家简介*/
+	@Excel(name = "专家简介", width = 15)
+    @ApiModelProperty(value = "专家简介")
+    private String expinfo;
+	/**部门审核*/
+    @Excel(name = "部门审核", width = 15,replace = {"是_Y","否_N"} )
+    @ApiModelProperty(value = "部门审核")
+    private String compopen;
+	/**管理员审核*/
+    @Excel(name = "管理员审核", width = 15,replace = {"是_Y","否_N"} )
+    @ApiModelProperty(value = "管理员审核")
+    private String adminopen;
+
+    @TableField(exist = false)
+    private String psd;
+    @TableField(exist = false)
+    private String sepsd;
+    @TableField(exist = false)
+    private String realname;
+    @TableField(exist = false)
+    private String workon;
+    @TableField(exist = false)
+    private String ssdep;
+    @TableField(exist = false)
+    private String topPic;
+    @TableField(exist = false)
+    private String phone;
+    @TableField(exist = false)
+    private String emails;
+    @TableField(exist = false)
+    private Integer sex;
+}

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.demo.expert.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.demo.expert.entity.Expert;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 专家管理
+ * @Author: jeecg-boot
+ * @Date:   2024-09-29
+ * @Version: V1.0
+ */
+public interface ExpertMapper extends BaseMapper<Expert> {
+
+    @Select("SELECT COUNT(*) FROM sys_user WHERE username =#{seusername}")
+    String isusername(String seusername);
+
+    @Select("SELECT COUNT(*) FROM sys_user WHERE work_no =#{workon}")
+    String isworkon(String workon);
+
+    @Select("SELECT COUNT(*) FROM sys_user WHERE phone =#{phone}")
+    String isphone(String phone);
+
+    @Select("SELECT COUNT(*) FROM sys_user WHERE email =#{emails}")
+    String isemils(String emails);
+}

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/xml/ExpertMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.expert.mapper.ExpertMapper">
+
+</mapper>

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/IExpertService.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.demo.expert.service;
+
+import org.jeecg.modules.demo.expert.entity.Expert;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 专家管理
+ * @Author: jeecg-boot
+ * @Date:   2024-09-29
+ * @Version: V1.0
+ */
+public interface IExpertService extends IService<Expert> {
+
+    String isusername(String seusername);
+
+    String isworkon(String workon);
+
+    String isphone(String phone);
+
+    String isemils(String emails);
+}

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/impl/ExpertServiceImpl.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.demo.expert.service.impl;
+
+import org.jeecg.modules.demo.expert.entity.Expert;
+import org.jeecg.modules.demo.expert.mapper.ExpertMapper;
+import org.jeecg.modules.demo.expert.service.IExpertService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 专家管理
+ * @Author: jeecg-boot
+ * @Date:   2024-09-29
+ * @Version: V1.0
+ */
+@Service
+public class ExpertServiceImpl extends ServiceImpl<ExpertMapper, Expert> implements IExpertService {
+
+    @Autowired
+    private  ExpertMapper expertMapper;
+
+
+    @Override
+    public String isusername(String seusername) {
+        return expertMapper.isusername(seusername);
+    }
+
+    @Override
+    public String isworkon(String workon) {
+        return expertMapper.isworkon(workon);
+    }
+
+    @Override
+    public String isphone(String phone) {
+        return expertMapper.isphone(phone);
+    }
+
+    @Override
+    public String isemils(String emails) {
+        return expertMapper.isemils(emails);
+    }
+}

jeecgboot-vue3/src/views/expert/Expert.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/expert/expert/list',
+  save='/expert/expert/add',
+  edit='/expert/expert/edit',
+  deleteOne = '/expert/expert/delete',
+  deleteBatch = '/expert/expert/deleteBatch',
+  importExcel = '/expert/expert/importExcel',
+  exportXls = '/expert/expert/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

jeecgboot-vue3/src/views/expert/Expert.data.ts

@@ -0,0 +1,72 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '用户名',
+    align: "center",
+    dataIndex: 'seusername'
+  },
+  {
+    title: '毕业院校',
+    align: "center",
+    dataIndex: 'colleges'
+  },
+  {
+    title: '专业',
+    align: "center",
+    dataIndex: 'major'
+  },
+  {
+    title: '研究方向',
+    align: "center",
+    dataIndex: 'directioncal'
+  },
+  {
+    title: '研究类型',
+    align: "center",
+    dataIndex: 'research'
+  },
+  {
+    title: '学历',
+    align: "center",
+    dataIndex: 'educationcal'
+  },
+  {
+    title: '专家简介',
+    align: "center",
+    dataIndex: 'expinfo'
+  },
+  {
+    title: '部门审核',
+    align: "center",
+    dataIndex: 'compopen',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
+     },
+  },
+  {
+    title: '管理员审核',
+    align: "center",
+    dataIndex: 'adminopen',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
+     },
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  seusername: {title: '用户名',order: 0,view: 'text', type: 'string',},
+  colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',},
+  major: {title: '专业',order: 2,view: 'text', type: 'string',},
+  directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',},
+  research: {title: '研究类型',order: 4,view: 'text', type: 'string',},
+  educationcal: {title: '学历',order: 5,view: 'text', type: 'string',},
+  expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',},
+  compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',},
+  adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',},
+};

jeecgboot-vue3/src/views/expert/ExpertList.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="seusername">
+              <template #label><span title="用户名">用户名</span></template>
+              <a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="directioncal">
+              <template #label><span title="研究方向">研究方向</span></template>
+              <a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="research">
+                <template #label><span title="研究类型">研究类型</span></template>
+                <a-input placeholder="请输入研究类型" v-model:value="queryParam.research" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </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="selectedRowKeys.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>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ExpertModal ref="registerModal" @success="handleSuccess"></ExpertModal>
+  </div>
+</template>
+
+<script lang="ts" name="expert-expert" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './Expert.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Expert.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ExpertModal from './components/ExpertModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '专家管理',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "专家管理",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && 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),
+          placement: 'topLeft',
+        },
+        auth: 'expert:expert:delete'
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

jeecgboot-vue3/src/views/expert/V20240926_1__menu_insert_Expert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/expert文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2024092603239210260', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210261', '2024092603239210260', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210262', '2024092603239210260', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210263', '2024092603239210260', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210264', '2024092603239210260', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210265', '2024092603239210260', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092603239210266', '2024092603239210260', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/expert/V20240929_1__menu_insert_Expert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/expert文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2024092910425270310', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270311', '2024092910425270310', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270312', '2024092910425270310', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270313', '2024092910425270310', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270314', '2024092910425270310', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270315', '2024092910425270310', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024092910425270316', '2024092910425270310', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/expert/V20240930_1__menu_insert_Expert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/expert文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2024093009506560560', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560561', '2024093009506560560', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560562', '2024093009506560560', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560563', '2024093009506560560', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560564', '2024093009506560560', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560565', '2024093009506560560', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024093009506560566', '2024093009506560560', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/expert/components/ExpertForm.vue

@@ -0,0 +1,253 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="用户名" v-bind="validateInfos.seusername" id="ExpertForm-seusername" name="seusername">
+								<a-input v-model:value="formData.seusername" placeholder="请输入用户名" ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="24">
+              <a-form-item label="密码" v-bind="validateInfos.psd" name="psd">
+                <a-input-password v-model:value="formData.psd" placeholder="请输入密码"  ></a-input-password>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="确人密码" v-bind="validateInfos.sepsd"  name="sepsd">
+                <a-input-password v-model:value="formData.sepsd" placeholder="确认用户名"  ></a-input-password>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="24">
+              <a-form-item label="真实姓名" v-bind="validateInfos.realname"  name="realname">
+                <a-input v-model:value="formData.realname" placeholder="请输入真实姓名" ></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="24">
+              <a-form-item label="工号" v-bind="validateInfos.workon"  name="workon">
+                <a-input v-model:value="formData.workon" placeholder="请输入工号" ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="性别" v-bind="validateInfos.sex" id="TestDemoForm-sex" name="sex">
+                <j-dict-select-tag v-model:value="formData.sex" dictCode="sex" placeholder="请选择性别"  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="所属部门" v-bind="validateInfos.ssdep" id="TestDemoForm-ssdep" name="ssdep">
+                <j-select-dept v-model:value="formData.ssdep"       :multiple="true" checkStrictly  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="头像" v-bind="validateInfos.topPic" id="TestDemoForm-topPic" name="topPic">
+                <j-image-upload :fileMax="0" v-model:value="formData.topPic" ></j-image-upload>
+              </a-form-item>
+            </a-col>
+
+
+            <a-col :span="24">
+              <a-form-item label="电话" v-bind="validateInfos.phone" name="phone">
+                <a-input v-model:value="formData.phone" placeholder="请输入电话"  allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="邮箱" v-bind="validateInfos.emails"  name="emails">
+                <a-input v-model:value="formData.emails" placeholder="请输入邮箱"  allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="24">
+							<a-form-item label="毕业院校" v-bind="validateInfos.colleges" id="ExpertForm-colleges" name="colleges">
+								<a-input v-model:value="formData.colleges" placeholder="请输入毕业院校"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="专业" v-bind="validateInfos.major" id="ExpertForm-major" name="major">
+								<a-input v-model:value="formData.major" placeholder="请输入专业"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
+								<a-input v-model:value="formData.directioncal" placeholder="请输入研究方向"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="研究类型" v-bind="validateInfos.research" id="ExpertForm-research" name="research">
+								<a-input v-model:value="formData.research" placeholder="请输入研究类型"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
+								<a-input v-model:value="formData.educationcal" placeholder="请输入学历"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+              <a-form-item label="专家简介" v-bind="validateInfos.expinfo" id="ExpertForm-expinfo" name="expinfo">
+                <a-textarea v-model:value="formData.expinfo" :rows="4" placeholder="请输入专家简介" />
+              </a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../Expert.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    seusername: '',
+    psd: '',
+    sepsd: '',
+    realname: '',
+    workon: '',
+    sex: '',
+    ssdep: '',
+    topPic: '',
+    phone: '',
+    emails: '',
+    colleges: '',
+    major: '',
+    directioncal: '',
+    research: '',
+    educationcal: '',
+    expinfo: '',
+    compopen: '',
+    adminopen: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    psd: [{ required: true, message: '请输入密码!'},],
+    sepsd: [{ required: true, message: '请输入确认密码!'},],
+    workon: [{ required: true, message: '请输入工号!'},],
+    ssdep: [{ required: true, message: '请输入部门!'},],
+    emails: [{ required: true, message: '请输入邮箱!'},],
+    phone: [{ required: true, message: '请输入电话!'},],
+    seusername: [{ required: true, message: '请输入用户名!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>

jeecgboot-vue3/src/views/expert/components/ExpertModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ExpertForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ExpertForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ExpertForm from './ExpertForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>