diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml index 4bd24c2..d5ef35d 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml @@ -110,6 +110,7 @@ gateway: - /api/permission/Organize - /api/permission/Organize/POST - /api/permission/Organize/check + - /api/permission/Users/Actions/ResetPasswordForget exclude-url: # # 配置示例 diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/UserController.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/UserController.java index 36789c3..cd985b3 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/UserController.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/UserController.java @@ -25,6 +25,7 @@ import jnpf.permission.entity.*; import jnpf.permission.model.user.UserIdListVo; import jnpf.permission.model.user.WorkHandoverModel; import jnpf.permission.model.user.form.UserCrForm; +import jnpf.permission.model.user.form.UserResetPasswordForgeForm; import jnpf.permission.model.user.form.UserResetPasswordForm; import jnpf.permission.model.user.form.UserUpForm; import jnpf.permission.model.user.mod.*; @@ -721,6 +722,43 @@ public class UserController extends SuperController { return ActionResult.success("操作失败,用户不存在"); } + + /** + * 首页修改用户密码 + * + * @param + * @param + * @return ignore + */ + @UserPermission + @Operation(summary = "首页修改用户密码") + @Parameters({ + @Parameter(name = "userResetPasswordForm", description = "修改密码模型", required = true) + }) + @SaCheckPermission("permission.user") + @PostMapping("/Actions/ResetPasswordForget") + public ActionResult modifyPasswordForget( @RequestBody @Valid UserResetPasswordForgeForm userResetPasswordForgeForm) { + + QueryWrapper userEntityQueryWrapper = new QueryWrapper<>(); + userEntityQueryWrapper.lambda().eq(UserEntity::getAccount,userResetPasswordForgeForm.getAccount()); +// userEntityQueryWrapper.lambda().eq(UserEntity::getOrganizeId,userResetPasswordForgeForm.id); +// userEntityQueryWrapper.lambda().select(UserEntity::getId); +// List useList = userService.listObjs(userEntityQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + List userEntityList = userService.list(userEntityQueryWrapper); + if (userEntityList.size()>0){ + UserEntity entity = userService.getInfo(userEntityList.get(0).getId()); + if (entity != null) { + entity.setPassword(userResetPasswordForgeForm.getUserPassword()); + userService.updatePassword(entity); + userService.delCurUser(entity.getId()); + PullUserUtil.syncUser(entity, "modifyPassword", userProvider.get().getTenantId()); + return ActionResult.success(MsgCode.SU005.get()); + } + } + + return ActionResult.success("操作失败,用户不存在"); + } + /** * 更新用户状态 * diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/user/form/UserResetPasswordForgeForm.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/user/form/UserResetPasswordForgeForm.java new file mode 100644 index 0000000..a353fdc --- /dev/null +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/user/form/UserResetPasswordForgeForm.java @@ -0,0 +1,29 @@ +package jnpf.permission.model.user.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * + * @author JNPF开发平台组 + * @version V3.1.0 + * @copyright 引迈信息技术有限公司 + * @date 2021/3/12 15:31 + */ +@Data +public class UserResetPasswordForgeForm { + + @Schema(description = "用户id") + private String id; + + @Schema(description = "新密码,需要 MD5 加密后传输") + private String account; + @Schema(description = "新密码,需要 MD5 加密后传输") + private String userPassword; + + + @Schema(description = "重复新密码") + private String validatePassword; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriseAccountBillServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriseAccountBillServiceImpl.java index 027a08a..b45bfa7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriseAccountBillServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriseAccountBillServiceImpl.java @@ -330,26 +330,31 @@ public class EnterpriseAccountBillServiceImpl extends ServiceImpl { }) } +// 修改用户密码 +export const resetUserPasswordForge = (data) => { + return request({ + url: `/api/permission/Users/Actions/ResetPasswordForget`, + method: 'POST', + data + }) +} + // 更新用户状态 export const updateUserState = (id) => { return request({ diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/columnList.js b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/columnList.js index 0242936..8dd434e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/columnList.js @@ -1,2 +1,2 @@ -const columnList = [{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"流水编号","label":"流水编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"流水编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515186554,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"billNumber","showWordLimit":false,"width":0,"__vModel__":"billNumber","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":true,"id":"billNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"订单编号","label":"订单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515187830,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"orderNumber","showWordLimit":false,"width":0,"__vModel__":"orderNumber","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"orderNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"订单类型","label":"订单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"520193298627825989","tipLabel":"","dragDisabled":false,"className":[],"label":"订单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515212697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"orderTypeId","width":0,"options":[{"enCode":"sanhuxiadan","children":null,"hasChildren":false,"fullName":"散户下单","id":"520193382480351557","parentId":"0"},{"enCode":"dingshihuishou","children":null,"hasChildren":false,"fullName":"定时回收","id":"520193458267230533","parentId":"0"},{"enCode":"daozhanhuishou","children":null,"hasChildren":false,"fullName":"到站回收","id":"520193532170867013","parentId":"0"}],"__vModel__":"orderTypeId","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"orderTypeId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据状态","label":"单据状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"521683590119955205","tipLabel":"","dragDisabled":false,"className":[],"label":"单据状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515249983,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"billStatusId","width":0,"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"已出账","id":"521683695132744453","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"已入账","id":"521683739554618117","parentId":"0"}],"__vModel__":"billStatusId","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"billStatusId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"收入(元)","label":"收入(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"收入(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515274161,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"incomeAmount","showWordLimit":false,"width":0,"__vModel__":"incomeAmount","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"incomeAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"支出(元)","label":"支出(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"支出(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515279552,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"payoutAmount","showWordLimit":false,"width":0,"__vModel__":"payoutAmount","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"payoutAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"余额(元)","label":"余额(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"余额(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515285680,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"accountBalance","showWordLimit":false,"width":0,"__vModel__":"accountBalance","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"accountBalance","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"备注","label":"备注","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515310817,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"remark","showWordLimit":true,"width":0,"__vModel__":"remark","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"创建用户","label":"创建用户","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031018298,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"creatorUserId","showWordLimit":false,"width":0,"__vModel__":"creatorUserId","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"creatorUserId","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd HH:mm:ss","fullName":"创建时间","label":"创建时间","sortable":false,"align":"left","type":"datetime","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031041308,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":117,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"创建时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"creatorTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +const columnList = [{"jnpfKey":"billRule","fullName":"流水编号","label":"流水编号","sortable":false,"align":"left","__config__":{"formId":118,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"QBGL","className":[],"label":"流水编号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1709861783050,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"钱包管理编码","tag":"JnpfInput","span":8},"readonly":true,"prop":"billNumber","width":0,"__vModel__":"billNumber","fixed":"none","style":{"width":"100%"},"id":"billNumber","placeholder":"系统自动生成"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"订单编号","label":"订单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515187830,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"orderNumber","showWordLimit":false,"width":0,"__vModel__":"orderNumber","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"orderNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"订单类型","label":"订单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"520193298627825989","tipLabel":"","dragDisabled":false,"className":[],"label":"订单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515212697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"orderTypeId","width":0,"options":[{"enCode":"sanhuxiadan","children":null,"hasChildren":false,"fullName":"散户下单","id":"520193382480351557","parentId":"0"},{"enCode":"dingshihuishou","children":null,"hasChildren":false,"fullName":"定时回收","id":"520193458267230533","parentId":"0"},{"enCode":"daozhanhuishou","children":null,"hasChildren":false,"fullName":"到站回收","id":"520193532170867013","parentId":"0"}],"__vModel__":"orderTypeId","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"orderTypeId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据状态","label":"单据状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"521683590119955205","tipLabel":"","dragDisabled":false,"className":[],"label":"单据状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515249983,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"billStatusId","width":0,"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"已出账","id":"521683695132744453","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"已入账","id":"521683739554618117","parentId":"0"}],"__vModel__":"billStatusId","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"billStatusId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"收入(元)","label":"收入(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"收入(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515274161,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"incomeAmount","showWordLimit":false,"width":0,"__vModel__":"incomeAmount","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"incomeAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"支出(元)","label":"支出(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"支出(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515279552,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"payoutAmount","showWordLimit":false,"width":0,"__vModel__":"payoutAmount","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"payoutAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"余额(元)","label":"余额(元)","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"余额(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515285680,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"accountBalance","showWordLimit":false,"width":0,"__vModel__":"accountBalance","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"accountBalance","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"备注","label":"备注","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515310817,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"remark","showWordLimit":true,"width":0,"__vModel__":"remark","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"创建用户","label":"创建用户","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031018298,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"creatorUserId","showWordLimit":false,"width":0,"__vModel__":"creatorUserId","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"creatorUserId","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd HH:mm:ss","fullName":"创建时间","label":"创建时间","sortable":false,"align":"left","type":"datetime","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031041308,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":117,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"创建时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"creatorTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] export default columnList \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue index 4182120..dcc2adc 100644 --- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue @@ -5,85 +5,148 @@
- +
- + 更 多 - - {{!dataForm.id ?'确定并新增':'确定并继续'}} + + {{ + !dataForm.id ? "确定并新增" : "确定并继续" + }} - 保 存 + + 保 存 取 消
- - + + - +
@@ -124,14 +199,20 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue index 6fd6cc0..a95f423 100644 --- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue @@ -12,49 +12,85 @@ - + + - + + - + - 查询 - 重置 - + 查询 + 重置 + 展开 - + 收起 @@ -64,22 +100,40 @@
- 新增 + 新增
- + - - + +
- + @@ -90,83 +144,118 @@ - + - - + - +
- - - + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/superQueryJson.js index 0c8bf69..9b3e0a2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/superQueryJson.js +++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/superQueryJson.js @@ -1,2 +1,2 @@ -const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"流水编号","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"流水编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515186554,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"showWordLimit":false,"__vModel__":"billNumber","showPassword":false,"style":{"width":"100%"},"disabled":true,"id":"billNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"订单编号","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515187830,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"orderNumber","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"orderNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"订单类型","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"520193298627825989","tipLabel":"","dragDisabled":false,"className":[],"label":"订单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515212697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"enCode":"sanhuxiadan","children":null,"hasChildren":false,"fullName":"散户下单","id":"520193382480351557","parentId":"0"},{"enCode":"dingshihuishou","children":null,"hasChildren":false,"fullName":"定时回收","id":"520193458267230533","parentId":"0"},{"enCode":"daozhanhuishou","children":null,"hasChildren":false,"fullName":"到站回收","id":"520193532170867013","parentId":"0"}],"__vModel__":"orderTypeId","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"orderTypeId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"单据状态","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"521683590119955205","tipLabel":"","dragDisabled":false,"className":[],"label":"单据状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515249983,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"已出账","id":"521683695132744453","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"已入账","id":"521683739554618117","parentId":"0"}],"__vModel__":"billStatusId","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"billStatusId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"收入(元)","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"收入(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515274161,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"incomeAmount","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"incomeAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"支出(元)","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"支出(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515279552,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"payoutAmount","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"payoutAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"余额(元)","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"余额(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515285680,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"accountBalance","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"accountBalance","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"创建用户","addonAfter":"","__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031018298,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"creatorUserId","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"creatorUserId","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"format":"yyyy-MM-dd HH:mm:ss","fullName":"创建时间","type":"datetime","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031041308,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":117,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"创建时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"__vModel__":"creatorTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"creatorTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"fullName":"备注","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515310817,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"remark","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +const superQueryJson = [{"__config__":{"formId":118,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"QBGL","className":[],"label":"流水编号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1709861783050,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"钱包管理编码","tag":"JnpfInput","span":8},"readonly":true,"__vModel__":"billNumber","fullName":"流水编号","style":{"width":"100%"},"id":"billNumber","placeholder":"系统自动生成"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"订单编号","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单编号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515187830,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"orderNumber","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"orderNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"订单类型","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"520193298627825989","tipLabel":"","dragDisabled":false,"className":[],"label":"订单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515212697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"enCode":"sanhuxiadan","children":null,"hasChildren":false,"fullName":"散户下单","id":"520193382480351557","parentId":"0"},{"enCode":"dingshihuishou","children":null,"hasChildren":false,"fullName":"定时回收","id":"520193458267230533","parentId":"0"},{"enCode":"daozhanhuishou","children":null,"hasChildren":false,"fullName":"到站回收","id":"520193532170867013","parentId":"0"}],"__vModel__":"orderTypeId","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"orderTypeId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"单据状态","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"521683590119955205","tipLabel":"","dragDisabled":false,"className":[],"label":"单据状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515249983,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"已出账","id":"521683695132744453","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"已入账","id":"521683739554618117","parentId":"0"}],"__vModel__":"billStatusId","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"billStatusId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"收入(元)","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"收入(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515274161,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"incomeAmount","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"incomeAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"支出(元)","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"支出(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515279552,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"payoutAmount","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"payoutAmount","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"余额(元)","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"余额(元)","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515285680,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"accountBalance","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"accountBalance","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"创建用户","addonAfter":"","__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031018298,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"creatorUserId","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"creatorUserId","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"format":"yyyy-MM-dd HH:mm:ss","fullName":"创建时间","type":"datetime","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1707031041308,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":117,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"创建时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"__vModel__":"creatorTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"creatorTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"fullName":"备注","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_enterprise_account_bill","renderKey":1706515310817,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"remark","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] export default superQueryJson \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/login/forget.vue b/jnpf-java-boot/jnpf-web/src/views/login/forget.vue index da0172a..5ee0762 100644 --- a/jnpf-java-boot/jnpf-web/src/views/login/forget.vue +++ b/jnpf-java-boot/jnpf-web/src/views/login/forget.vue @@ -6,83 +6,139 @@ :show-close="false" :modal="false" :close-on-click-modal="false" - :visible="dialogVisible"> + :visible="dialogVisible" + >
- - - - - - - - - - - + + + + + + + + + + + +
- 确认修改 + + 确认修改 -
Copyright © 上海长江云息数字科技有限公司 © 2012 - 2023 All Rights Reserved 专业的数字信息解决方案专家
+
+ Copyright © 上海长江云息数字科技有限公司 © 2012 - 2023 All Rights Reserved + 专业的数字信息解决方案专家 +
diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/AuthorizeForm.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/AuthorizeForm.vue new file mode 100644 index 0000000..b18e180 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/AuthorizeForm.vue @@ -0,0 +1,346 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/Form.vue new file mode 100644 index 0000000..165b0d1 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/Form.vue @@ -0,0 +1,103 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/index.vue new file mode 100644 index 0000000..a1b62d2 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/index.vue @@ -0,0 +1,208 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/permissionGroup.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/permissionGroup.vue new file mode 100644 index 0000000..76890f2 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/authorize/permissionGroup.vue @@ -0,0 +1,415 @@ + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/Form.vue new file mode 100644 index 0000000..768e4aa --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/Form.vue @@ -0,0 +1,461 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/GradeUserSelect.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/GradeUserSelect.vue new file mode 100644 index 0000000..b060b95 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/GradeUserSelect.vue @@ -0,0 +1,388 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/index.vue new file mode 100644 index 0000000..1fb00d9 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/gradeManage/index.vue @@ -0,0 +1,139 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/Form.vue new file mode 100644 index 0000000..d83a658 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/Form.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/index.vue new file mode 100644 index 0000000..e4c9c7c --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/group/index.vue @@ -0,0 +1,172 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/Form.vue new file mode 100644 index 0000000..ff4d11b --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/Form.vue @@ -0,0 +1,264 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/checkUser.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/checkUser.vue new file mode 100644 index 0000000..33e05d6 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/checkUser.vue @@ -0,0 +1,142 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/depForm.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/depForm.vue new file mode 100644 index 0000000..8f1f3a9 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/depForm.vue @@ -0,0 +1,123 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/index.vue new file mode 100644 index 0000000..60e51ca --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/organize/index.vue @@ -0,0 +1,228 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/Form.vue new file mode 100644 index 0000000..4ed783e --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/Form.vue @@ -0,0 +1,133 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/index.vue new file mode 100644 index 0000000..d35f870 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/index.vue @@ -0,0 +1,263 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/userRelation.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/userRelation.vue new file mode 100644 index 0000000..860fa58 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/position/userRelation.vue @@ -0,0 +1,152 @@ + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/Form.vue new file mode 100644 index 0000000..352d03b --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/Form.vue @@ -0,0 +1,121 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/index.vue new file mode 100644 index 0000000..88cc55e --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/index.vue @@ -0,0 +1,287 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/userRelation.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/userRelation.vue new file mode 100644 index 0000000..9003f98 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/role/userRelation.vue @@ -0,0 +1,174 @@ + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Diagram.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Diagram.vue new file mode 100644 index 0000000..9bb835a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Diagram.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ExportForm.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ExportForm.vue new file mode 100644 index 0000000..9907280 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ExportForm.vue @@ -0,0 +1,106 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Form.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Form.vue new file mode 100644 index 0000000..e45265a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/Form.vue @@ -0,0 +1,431 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ImportForm.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ImportForm.vue new file mode 100644 index 0000000..9e5f960 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ImportForm.vue @@ -0,0 +1,326 @@ + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ResetPassword.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ResetPassword.vue new file mode 100644 index 0000000..407a234 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/ResetPassword.vue @@ -0,0 +1,116 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/SocialsBind.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/SocialsBind.vue new file mode 100644 index 0000000..d07852c --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/SocialsBind.vue @@ -0,0 +1,116 @@ + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/WorkHandoverForm.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/WorkHandoverForm.vue new file mode 100644 index 0000000..acf3de0 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/WorkHandoverForm.vue @@ -0,0 +1,199 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/index.vue new file mode 100644 index 0000000..9ffc77e --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/user/index.vue @@ -0,0 +1,379 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userOnline/index.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userOnline/index.vue new file mode 100644 index 0000000..c8cc760 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userOnline/index.vue @@ -0,0 +1,144 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userRelation/Selector.vue b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userRelation/Selector.vue new file mode 100644 index 0000000..226659a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/permissionMerchant/userRelation/Selector.vue @@ -0,0 +1,76 @@ + + \ No newline at end of file