Browse Source

1、用户实名信息添加字段【所属公司】

2、添加功能模块表
master
Aug 6 months ago
parent
commit
933d552379
23 changed files with 1204 additions and 93 deletions
  1. +41
    -41
      .idea/workspace.xml
  2. +171
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java
  3. +66
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java
  4. +17
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java
  5. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml
  6. +14
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java
  7. +19
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java
  8. +190
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue
  9. +119
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue
  10. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue
  11. +60
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue
  12. +61
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts
  13. +56
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts
  14. +162
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue
  15. +58
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue
  16. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java
  17. +15
    -10
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java
  18. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java
  19. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java
  20. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java
  21. +17
    -11
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue
  22. +13
    -8
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue
  23. +32
    -19
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts

+ 41
- 41
.idea/workspace.xml View File

@ -4,14 +4,6 @@
<list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增,修改,查询)">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -153,7 +145,7 @@
<workItem from="1733103883735" duration="17631000" />
<workItem from="1733710180531" duration="11896000" />
<workItem from="1733968817518" duration="63976000" />
<workItem from="1735284739666" duration="65891000" />
<workItem from="1735284739666" duration="68026000" />
</task>
<task id="LOCAL-00001" summary="1、项目初始化">
<created>1731385713383</created>
@ -281,7 +273,14 @@
<option name="project" value="LOCAL" />
<updated>1736421140462</updated>
</task>
<option name="localTasksCounter" value="19" />
<task id="LOCAL-00019" summary="1、寻车申请,年限字段修改">
<created>1736497668414</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1736497668414</updated>
</task>
<option name="localTasksCounter" value="20" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -319,7 +318,8 @@
<MESSAGE value="1、金刚区模块补充" />
<MESSAGE value="1、修改后台图标&#10;2、一级分类去掉导入、导出、高级查询按钮&#10;3、补充个人/企业实名查询接口" />
<MESSAGE value="1、商品信息添加审核状态、审核备注以及年限修改&#10;2、商品发布添加修改、删除、查询详情功能&#10;3、预约订单添加修改、删除、查询详情功能" />
<option name="LAST_COMMIT_MESSAGE" value="1、商品信息添加审核状态、审核备注以及年限修改&#10;2、商品发布添加修改、删除、查询详情功能&#10;3、预约订单添加修改、删除、查询详情功能" />
<MESSAGE value="1、寻车申请,年限字段修改" />
<option name="LAST_COMMIT_MESSAGE" value="1、寻车申请,年限字段修改" />
</component>
<component name="WindowStateProjectService">
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1731382591329">
@ -338,62 +338,62 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733992136886" />
<state x="713" y="297" key="CommitChangelistDialog2" timestamp="1736421139462">
<state x="713" y="297" key="CommitChangelistDialog2" timestamp="1736504474522">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1736421139462" />
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1736488860627">
<state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1736504474522" />
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1736498111597">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1736488860627" />
<state width="2517" height="432" key="GridCell.Tab.0.bottom" timestamp="1736497086581">
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1736498111597" />
<state width="2517" height="432" key="GridCell.Tab.0.bottom" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086581" />
<state width="2517" height="432" key="GridCell.Tab.0.center" timestamp="1736497086581">
<state width="2517" height="432" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.0.center" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086581" />
<state width="2517" height="432" key="GridCell.Tab.0.left" timestamp="1736497086581">
<state width="2517" height="432" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.0.left" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086581" />
<state width="2517" height="432" key="GridCell.Tab.0.right" timestamp="1736497086581">
<state width="2517" height="432" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.0.right" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086581" />
<state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1736504287909">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287909" />
<state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1736497086507">
<state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1736504287910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736497086507" />
<state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736504287910" />
<state x="1079" y="413" key="RollbackChangesDialog" timestamp="1735568417191">
<screen x="0" y="0" width="2560" height="1400" />
</state>
@ -402,10 +402,10 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1732701780265" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1736421216931">
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1736497673018">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1736421216931" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1736497673018" />
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1731750734819">
<screen x="0" y="0" width="2560" height="1400" />
</state>


+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java View File

@ -0,0 +1,171 @@
package org.jeecg.modules.carrentModule.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
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.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.carrentModule.entity.CarrentModule;
import org.jeecg.modules.carrentModule.service.ICarrentModuleService;
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.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;
/**
* @Description: 活动模块表
* @Author: jeecg-boot
* @Date: 2025-01-03
* @Version: V1.0
*/
@Api(tags="活动模块表")
@RestController
@RequestMapping("/carrentModule/carrentModule")
@Slf4j
public class CarrentModuleController extends JeecgController<CarrentModule, ICarrentModuleService> {
@Autowired
private ICarrentModuleService carrentModuleService;
/**
* 分页列表查询
*
* @param carrentModule
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "活动模块表-分页列表查询")
@ApiOperation(value="活动模块表-分页列表查询", notes="活动模块表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<CarrentModule>> queryPageList(CarrentModule carrentModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CarrentModule> queryWrapper = QueryGenerator.initQueryWrapper(carrentModule, req.getParameterMap());
Page<CarrentModule> page = new Page<CarrentModule>(pageNo, pageSize);
IPage<CarrentModule> pageList = carrentModuleService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param carrentModule
* @return
*/
@AutoLog(value = "活动模块表-添加")
@ApiOperation(value="活动模块表-添加", notes="活动模块表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CarrentModule carrentModule) {
carrentModuleService.save(carrentModule);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param carrentModule
* @return
*/
@AutoLog(value = "活动模块表-编辑")
@ApiOperation(value="活动模块表-编辑", notes="活动模块表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody CarrentModule carrentModule) {
carrentModuleService.updateById(carrentModule);
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) {
carrentModuleService.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.carrentModuleService.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<CarrentModule> queryById(@RequestParam(name="id",required=true) String id) {
CarrentModule carrentModule = carrentModuleService.getById(id);
if(carrentModule==null) {
return Result.error("未找到对应数据");
}
return Result.OK(carrentModule);
}
/**
* 导出excel
*
* @param request
* @param carrentModule
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CarrentModule carrentModule) {
return super.exportXls(request, carrentModule, CarrentModule.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, CarrentModule.class);
}
}

+ 66
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java View File

@ -0,0 +1,66 @@
package org.jeecg.modules.carrentModule.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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: 2025-01-03
* @Version: V1.0
*/
@Data
@TableName("carrent_module")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="carrent_module对象", description="活动模块表")
public class CarrentModule implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
private java.lang.String title;
/**图片*/
@Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片")
private java.lang.String image;
/**排序编号*/
@Excel(name = "排序编号", width = 15)
@ApiModelProperty(value = "排序编号")
private java.lang.Integer orderNo;
/**跳转地址*/
@Excel(name = "跳转地址", width = 15)
@ApiModelProperty(value = "跳转地址")
private java.lang.String path;
}

+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.carrentModule.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.carrentModule.entity.CarrentModule;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 活动模块表
* @Author: jeecg-boot
* @Date: 2025-01-03
* @Version: V1.0
*/
public interface CarrentModuleMapper extends BaseMapper<CarrentModule> {
}

+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml View File

@ -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.carrentModule.mapper.CarrentModuleMapper">
</mapper>

+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java View File

@ -0,0 +1,14 @@
package org.jeecg.modules.carrentModule.service;
import org.jeecg.modules.carrentModule.entity.CarrentModule;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 活动模块表
* @Author: jeecg-boot
* @Date: 2025-01-03
* @Version: V1.0
*/
public interface ICarrentModuleService extends IService<CarrentModule> {
}

+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.carrentModule.service.impl;
import org.jeecg.modules.carrentModule.entity.CarrentModule;
import org.jeecg.modules.carrentModule.mapper.CarrentModuleMapper;
import org.jeecg.modules.carrentModule.service.ICarrentModuleService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 活动模块表
* @Author: jeecg-boot
* @Date: 2025-01-03
* @Version: V1.0
*/
@Service
public class CarrentModuleServiceImpl extends ServiceImpl<CarrentModuleMapper, CarrentModule> implements ICarrentModuleService {
}

+ 190
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue View File

@ -0,0 +1,190 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('活动模块表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<carrent-module-modal ref="modalForm" @ok="modalFormOk"></carrent-module-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CarrentModuleModal from './modules/CarrentModuleModal'
export default {
name: 'CarrentModuleList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CarrentModuleModal
},
data () {
return {
description: '活动模块表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'标题',
align:"center",
dataIndex: 'title'
},
{
title:'图片',
align:"center",
dataIndex: 'image',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'排序编号',
align:"center",
dataIndex: 'orderNo'
},
{
title:'跳转地址',
align:"center",
dataIndex: 'path'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/carrentModule/carrentModule/list",
delete: "/carrentModule/carrentModule/delete",
deleteBatch: "/carrentModule/carrentModule/deleteBatch",
exportXlsUrl: "/carrentModule/carrentModule/exportXls",
importExcelUrl: "carrentModule/carrentModule/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
fieldList.push({type:'int',value:'orderNo',text:'排序编号',dictCode:''})
fieldList.push({type:'Text',value:'path',text:'跳转地址',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 119
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue View File

@ -0,0 +1,119 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<j-image-upload isMultiple v-model="model.image" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="排序编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
<a-input-number v-model="model.orderNo" placeholder="请输入排序编号" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="跳转地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="path">
<a-input v-model="model.path" placeholder="请输入跳转地址" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'CarrentModuleForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/carrentModule/carrentModule/add",
edit: "/carrentModule/carrentModule/edit",
queryById: "/carrentModule/carrentModule/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<carrent-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-module-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import CarrentModuleForm from './CarrentModuleForm'
export default {
name: 'CarrentModuleModal',
components: {
CarrentModuleForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<carrent-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-module-form>
</j-modal>
</template>
<script>
import CarrentModuleForm from './CarrentModuleForm'
export default {
name: 'CarrentModuleModal',
components: {
CarrentModuleForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts View File

@ -0,0 +1,61 @@
import {defHttp} from '/@/utils/http/axios';
import {Modal} from 'ant-design-vue';
enum Api {
list = '/carrentModule/carrentModule/list',
save='/carrentModule/carrentModule/add',
edit='/carrentModule/carrentModule/edit',
deleteOne = '/carrentModule/carrentModule/delete',
deleteBatch = '/carrentModule/carrentModule/deleteBatch',
importExcel = '/carrentModule/carrentModule/importExcel',
exportXls = '/carrentModule/carrentModule/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});
/**
*
*/
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});
}

+ 56
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts View File

@ -0,0 +1,56 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '标题',
align:"center",
dataIndex: 'title'
},
{
title: '图片',
align:"center",
dataIndex: 'image',
customRender:render.renderAvatar,
},
{
title: '排序编号',
align:"center",
dataIndex: 'orderNo'
},
{
title: '跳转地址',
align:"center",
dataIndex: 'path'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '标题',
field: 'title',
component: 'Input',
},
{
label: '图片',
field: 'image',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '排序编号',
field: 'orderNo',
component: 'InputNumber',
},
{
label: '跳转地址',
field: 'path',
component: 'Input',
},
];

+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue View File

@ -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>
<!-- 表单区域 -->
<CarrentModuleModal @register="registerModal" @success="handleSuccess"></CarrentModuleModal>
</div>
</template>
<script lang="ts" name="carrentModule-carrentModule" setup>
import {ref, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import CarrentModuleModal from './components/CarrentModuleModal.vue'
import {columns, searchFormSchema} from './carrentModule.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentModule.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>

+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue View File

@ -0,0 +1,58 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../carrentModule.data';
import {saveOrUpdate} from '../carrentModule.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
</style>

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
* @Date: 2024-12-26
* @Date: 2025-01-10
* @Version: V1.0
*/
@Api(tags="个人实名信息表")


+ 15
- 10
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
* @Date: 2024-12-26
* @Date: 2025-01-10
* @Version: V1.0
*/
@Data
@ -55,16 +55,13 @@ public class CarrentUser implements Serializable {
@Excel(name = "联系方式", width = 15)
@ApiModelProperty(value = "联系方式")
private java.lang.String phone;
/**身份证号码*/
@Excel(name = "身份证号码", width = 15)
@ApiModelProperty(value = "身份证号码")
private java.lang.String cerNo;
/**身份证正面照*/
@Excel(name = "身份证正面照", width = 15)
@ApiModelProperty(value = "身份证正面照")
private java.lang.String cerImage;
/**所属单位*/
@Excel(name = "所属单位", width = 15)
@ApiModelProperty(value = "所属单位")
private java.lang.String company;
/**状态*/
@Excel(name = "状态", width = 15)
@Excel(name = "状态", width = 15, dicCode = "authentic_status")
@Dict(dicCode = "authentic_status")
@ApiModelProperty(value = "状态")
private java.lang.String status;
/**关联用户id*/
@ -72,4 +69,12 @@ public class CarrentUser implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
/**身份证正面照片*/
@Excel(name = "身份证正面照片", width = 15)
@ApiModelProperty(value = "身份证正面照片")
private java.lang.String cerImage;
/**身份证号*/
@Excel(name = "身份证号", width = 15)
@ApiModelProperty(value = "身份证号")
private java.lang.String cerNo;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
* @Date: 2024-12-26
* @Date: 2025-01-10
* @Version: V1.0
*/
public interface CarrentUserMapper extends BaseMapper<CarrentUser> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
* @Date: 2024-12-26
* @Date: 2025-01-10
* @Version: V1.0
*/
public interface ICarrentUserService extends IService<CarrentUser> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
* @Date: 2024-12-26
* @Date: 2025-01-10
* @Version: V1.0
*/
@Service


+ 17
- 11
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue View File

@ -133,26 +133,31 @@
dataIndex: 'phone'
},
{
title:'身份证号码',
title:'所属单位',
align:"center",
dataIndex: 'cerNo'
},
{
title:'身份证正面照',
align:"center",
dataIndex: 'cerImage',
scopedSlots: {customRender: 'imgSlot'}
dataIndex: 'company'
},
{
title:'状态',
align:"center",
dataIndex: 'status'
dataIndex: 'status_dictText'
},
{
title:'关联用户id',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'身份证正面照片',
align:"center",
dataIndex: 'cerImage',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'身份证号',
align:"center",
dataIndex: 'cerNo'
},
{
title: '操作',
dataIndex: 'action',
@ -189,10 +194,11 @@
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
fieldList.push({type:'string',value:'cerNo',text:'身份证号码',dictCode:''})
fieldList.push({type:'string',value:'cerImage',text:'身份证正面照',dictCode:''})
fieldList.push({type:'string',value:'company',text:'所属单位',dictCode:''})
fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'})
fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
fieldList.push({type:'Text',value:'cerImage',text:'身份证正面照片',dictCode:''})
fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''})
this.superFieldList = fieldList
}
}


+ 13
- 8
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue View File

@ -14,18 +14,13 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerNo">
<a-input v-model="model.cerNo" placeholder="请输入身份证号码" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身份证正面照" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerImage">
<j-image-upload isMultiple v-model="model.cerImage" ></j-image-upload>
<a-form-model-item label="所属单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<a-input v-model="model.company" placeholder="请输入所属单位" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<a-input v-model="model.status" placeholder="请输入状态" ></a-input>
<j-dict-select-tag type="list" v-model="model.status" dictCode="authentic_status" placeholder="请选择状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -33,6 +28,16 @@
<j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身份证正面照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerImage">
<j-image-upload isMultiple v-model="model.cerImage" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerNo">
<a-input v-model="model.cerNo" placeholder="请输入身份证号" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>


+ 32
- 19
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts View File

@ -15,26 +15,31 @@ export const columns: BasicColumn[] = [
dataIndex: 'phone'
},
{
title: '身份证号码',
title: '所属单位',
align:"center",
dataIndex: 'cerNo'
},
{
title: '身份证正面照',
align:"center",
dataIndex: 'cerImage',
customRender:render.renderAvatar,
dataIndex: 'company'
},
{
title: '状态',
align:"center",
dataIndex: 'status'
dataIndex: 'status_dictText'
},
{
title: '关联用户id',
align:"center",
dataIndex: 'userId_dictText'
},
{
title: '身份证正面照片',
align:"center",
dataIndex: 'cerImage',
customRender:render.renderAvatar,
},
{
title: '身份证号',
align:"center",
dataIndex: 'cerNo'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -52,21 +57,17 @@ export const formSchema: FormSchema[] = [
component: 'Input',
},
{
label: '身份证号码',
field: 'cerNo',
label: '所属单位',
field: 'company',
component: 'Input',
},
{
label: '身份证正面照',
field: 'cerImage',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '状态',
field: 'status',
component: 'Input',
component: 'JDictSelectTag',
componentProps:{
dictCode:"authentic_status"
},
},
{
label: '关联用户id',
@ -76,4 +77,16 @@ export const formSchema: FormSchema[] = [
dictCode:"han_hai_member,nick_name,id"
},
},
{
label: '身份证正面照片',
field: 'cerImage',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '身份证号',
field: 'cerNo',
component: 'Input',
},
];

Loading…
Cancel
Save