diff --git a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java index 07f770b..687264c 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java @@ -224,5 +224,6 @@ public class ApiRiceIndexController { + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java index b0bfc96..832bf68 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java @@ -8,6 +8,7 @@ import org.jeecg.api.service.ApiRiceService; import org.jeecg.bean.PageBean; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; +import org.jeecg.modules.commonUser.entity.CommonUser; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -151,4 +152,21 @@ public class ApiRiceInfoController { } + + //根据用户查询渠道申请信息表单 + @ApiOperation(value="根据用户查询渠道申请信息表单", notes="根据用户查询渠道申请信息表单") + @GetMapping(value = "/getCommonUser") + public Result getCommonUser(@RequestHeader("X-Access-Token") String token){ + return apiRiceService.getCommonUser(token); + } + + + + //增加或者修改渠道申请信息 + @ApiOperation(value="增加或者修改渠道申请信息", notes="增加或者修改渠道申请信息") + @PostMapping(value = "/addOrUpdateCommonUser") + public Result addOrUpdateCommonUser(@RequestHeader("X-Access-Token") String token, CommonUser commonUser){ + return apiRiceService.addOrUpdateCommonUser(token,commonUser); + } + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java index 604fbd1..b9d58fb 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.bean.PageBean; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; +import org.jeecg.modules.commonUser.entity.CommonUser; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; @@ -135,4 +136,13 @@ public interface ApiRiceService { //确认收货 Result confirmOrder(String token,String orderId); + + + //根据用户查询渠道申请信息表单 + Result getCommonUser(String token); + + + //增加或者修改渠道申请信息 + Result addOrUpdateCommonUser(String token, CommonUser commonUser); + } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java index 5d620d7..79ddae7 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java @@ -46,6 +46,8 @@ import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku; import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService; import org.jeecg.modules.commonShop.entity.CommonShop; import org.jeecg.modules.commonShop.service.ICommonShopService; +import org.jeecg.modules.commonUser.entity.CommonUser; +import org.jeecg.modules.commonUser.service.ICommonUserService; import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig; import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -120,6 +122,8 @@ public class ApiRiceServiceImpl implements ApiRiceService { //支付接口 @Autowired private MpWxPayService mpWxPayService; + @Resource + private ICommonUserService commonUserService; @@ -1512,6 +1516,41 @@ public class ApiRiceServiceImpl implements ApiRiceService { + //根据用户查询渠道申请信息表单 + @Override + public Result getCommonUser(String token){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonUser one = commonUserService.lambdaQuery().eq(CommonUser::getUserId, hanHaiMember.getId()).one(); + return Result.OK(one); + } + + + //增加或者修改渠道申请信息 + @Override + public Result addOrUpdateCommonUser(String token, CommonUser commonUser){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //根据用户标识查询改用户是否以申请 + CommonUser one = commonUserService.lambdaQuery().eq(CommonUser::getUserId, hanHaiMember.getId()).one(); + //如果为空则申请 + if(one==null){ + commonUser.setUserId(hanHaiMember.getId()); + commonUserService.save(commonUser); + }else{ + //如果状态为1 + if(one.getState()==1){ + return Result.error("已申请通过,请勿重复申请"); + } + //修改 + commonUser.setId(one.getId()); + commonUserService.updateById(commonUser); + } + + return Result.OK("申请成功,等待审核"); + + + } + + diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java index c5bab1c..4ecd04e 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java @@ -26,12 +26,13 @@ public class AppletMyInfoController { //修改个人信息 @PostMapping(value = "/updateInfo") @ApiOperation(value="修改个人信息", notes="修改个人信息") - public Result updateInfo(@RequestHeader("X-Access-Token") String token, String nickName, String avatarUrl){ + public Result updateInfo(@RequestHeader("X-Access-Token") String token, String nickName, String avatarUrl,String phone){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); HanHaiMember member = new HanHaiMember(); member.setId(hanHaiMember.getId()); member.setNickName(nickName); member.setHeadImage(avatarUrl); + member.setPhone(phone); hanHaiMemberService.updateById(member); return Result.ok("修改成功"); } diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java b/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java new file mode 100644 index 0000000..a8b83ff --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonUser.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.commonUser.entity.CommonUser; +import org.jeecg.modules.commonUser.service.ICommonUserService; + +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: 2024-12-15 + * @Version: V1.0 + */ +@Api(tags="审核表") +@RestController +@RequestMapping("/commonUser/commonUser") +@Slf4j +public class CommonUserController extends JeecgController { + @Autowired + private ICommonUserService commonUserService; + + /** + * 分页列表查询 + * + * @param commonUser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "审核表-分页列表查询") + @ApiOperation(value="审核表-分页列表查询", notes="审核表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonUser commonUser, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonUser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonUserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonUser + * @return + */ + @AutoLog(value = "审核表-添加") + @ApiOperation(value="审核表-添加", notes="审核表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonUser commonUser) { + commonUserService.save(commonUser); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param commonUser + * @return + */ + @AutoLog(value = "审核表-编辑") + @ApiOperation(value="审核表-编辑", notes="审核表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonUser commonUser) { + commonUserService.updateById(commonUser); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "审核表-通过id删除") + @ApiOperation(value="审核表-通过id删除", notes="审核表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + commonUserService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "审核表-批量删除") + @ApiOperation(value="审核表-批量删除", notes="审核表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.commonUserService.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 queryById(@RequestParam(name="id",required=true) String id) { + CommonUser commonUser = commonUserService.getById(id); + if(commonUser==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonUser); + } + + /** + * 导出excel + * + * @param request + * @param commonUser + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonUser commonUser) { + return super.exportXls(request, commonUser, CommonUser.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, CommonUser.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java b/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java new file mode 100644 index 0000000..523b897 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java @@ -0,0 +1,86 @@ +package org.jeecg.modules.commonUser.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: 2024-12-15 + * @Version: V1.0 + */ +@Data +@TableName("common_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_user对象", description="审核表") +public class CommonUser 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.Integer type; + /**身份证或者营业执照*/ + @Excel(name = "身份证或者营业执照", width = 15) + @ApiModelProperty(value = "身份证或者营业执照") + private java.lang.String image; + /**身份证号或者公=企业编码*/ + @Excel(name = "身份证号或者公=企业编码", width = 15) + @ApiModelProperty(value = "身份证号或者公=企业编码") + private java.lang.String no; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private java.lang.String sex; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String phone; + /**邮寄地址*/ + @Excel(name = "邮寄地址", width = 15) + @ApiModelProperty(value = "邮寄地址") + private java.lang.String address; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.Integer state; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java new file mode 100644 index 0000000..3ac3e78 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonUser.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonUser.entity.CommonUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 审核表 + * @Author: jeecg-boot + * @Date: 2024-12-15 + * @Version: V1.0 + */ +public interface CommonUserMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml new file mode 100644 index 0000000..e906f37 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java b/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java new file mode 100644 index 0000000..7e798b9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonUser.service; + +import org.jeecg.modules.commonUser.entity.CommonUser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 审核表 + * @Author: jeecg-boot + * @Date: 2024-12-15 + * @Version: V1.0 + */ +public interface ICommonUserService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java new file mode 100644 index 0000000..eddc5a5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonUser.service.impl; + +import org.jeecg.modules.commonUser.entity.CommonUser; +import org.jeecg.modules.commonUser.mapper.CommonUserMapper; +import org.jeecg.modules.commonUser.service.ICommonUserService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 审核表 + * @Author: jeecg-boot + * @Date: 2024-12-15 + * @Version: V1.0 + */ +@Service +public class CommonUserServiceImpl extends ServiceImpl implements ICommonUserService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue new file mode 100644 index 0000000..028571e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue @@ -0,0 +1,227 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue new file mode 100644 index 0000000..acb334d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue @@ -0,0 +1,144 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue new file mode 100644 index 0000000..cee5347 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue new file mode 100644 index 0000000..acfd257 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts new file mode 100644 index 0000000..899e5a6 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonUser/commonUser/list', + save='/commonUser/commonUser/add', + edit='/commonUser/commonUser/edit', + deleteOne = '/commonUser/commonUser/delete', + deleteBatch = '/commonUser/commonUser/deleteBatch', + importExcel = '/commonUser/commonUser/importExcel', + exportXls = '/commonUser/commonUser/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}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts new file mode 100644 index 0000000..3353848 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts @@ -0,0 +1,112 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '类型', + align:"center", + dataIndex: 'type' + }, + { + title: '身份证或者营业执照', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '身份证号或者公=企业编码', + align:"center", + dataIndex: 'no' + }, + { + title: '性别', + align:"center", + dataIndex: 'sex' + }, + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '邮寄地址', + align:"center", + dataIndex: 'address' + }, + { + title: '状态', + align:"center", + dataIndex: 'state' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '类型', + field: 'type', + component: 'InputNumber', + }, + { + label: '身份证或者营业执照', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '身份证号或者公=企业编码', + field: 'no', + component: 'Input', + }, + { + label: '性别', + field: 'sex', + component: 'Input', + }, + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '电话', + field: 'phone', + component: 'Input', + }, + { + label: '邮寄地址', + field: 'address', + component: 'Input', + }, + { + label: '状态', + field: 'state', + component: 'InputNumber', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue new file mode 100644 index 0000000..fcd3ad4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue new file mode 100644 index 0000000..7dd5ed1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file