Compare commits

...

21 Commits

Author SHA1 Message Date
62366e8e1e 修改登录界面展示
Some checks failed
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2025-11-24 15:48:03 +08:00
183717afa5 修改系统名称
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-21 17:42:31 +08:00
4b648233d2 修改redis密码配置 2025-11-21 17:42:08 +08:00
9570378f92 修改首页内容展示 2025-11-21 17:41:49 +08:00
70cc5a8ce6 二次修改部门管理模块,前端代码
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-21 16:58:03 +08:00
180d689171 Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-21 16:48:37 +08:00
16d8f06652 部门管理模块,前端代码 2025-11-21 16:48:07 +08:00
LYX
6c99758916 1121删除仓库管理的一个mapper文件
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-21 16:32:08 +08:00
LYX
575751db37 1121人力资源部门管理开发
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-21 16:30:34 +08:00
LYX
4f761c3c3b 1119数据库新增以及修改了字段重新生成代码修复器械分类新增bug
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 17:37:24 +08:00
22b51843c1 Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
Java CI with Maven / build (11) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 16:59:31 +08:00
LYX
8dc367968b 1119数据库更新
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 16:57:19 +08:00
1a49d40a40 二次修改器械分类子页面选项 2025-11-19 16:02:42 +08:00
LYX
888ff98ed6 1119器械分类
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 15:17:58 +08:00
b07fa17f1e 修改器械分类主页面和子页面展示
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 14:58:13 +08:00
374e9311c6 修改本地从库配置
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-19 14:48:37 +08:00
LYX
bd85e08a3c Merge branch 'master' of https://gitea.gentronhealth.com/wslyx/ERP
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-11-18 17:04:39 +08:00
LYX
ab5cc9331b 器械分类后端错误码修改new 2025-11-18 16:49:30 +08:00
LYX
53789734c3 器械分类后端错误码修改new 2025-11-18 16:48:55 +08:00
LYX
da3c891bf0 器械分类后端错误码修改 2025-11-18 16:41:28 +08:00
LYX
25c050225b 器械分类后端 2025-11-18 16:32:39 +08:00
34 changed files with 1487 additions and 177 deletions

View File

@@ -0,0 +1,95 @@
package cn.iocoder.yudao.module.erp.controller.admin.department;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.erp.controller.admin.department.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.department.PeopleDepartmentDO;
import cn.iocoder.yudao.module.erp.service.department.PeopleDepartmentService;
@Tag(name = "管理后台 - 部门管理")
@RestController
@RequestMapping("/erp/people-department")
@Validated
public class PeopleDepartmentController {
@Resource
private PeopleDepartmentService peopleDepartmentService;
@PostMapping("/create")
@Operation(summary = "创建部门管理")
@PreAuthorize("@ss.hasPermission('erp:people-department:create')")
public CommonResult<Integer> createPeopleDepartment(@Valid @RequestBody PeopleDepartmentSaveReqVO createReqVO) {
return success(peopleDepartmentService.createPeopleDepartment(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新部门管理")
@PreAuthorize("@ss.hasPermission('erp:people-department:update')")
public CommonResult<Boolean> updatePeopleDepartment(@Valid @RequestBody PeopleDepartmentSaveReqVO updateReqVO) {
peopleDepartmentService.updatePeopleDepartment(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除部门管理")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('erp:people-department:delete')")
public CommonResult<Boolean> deletePeopleDepartment(@RequestParam("id") Integer id) {
peopleDepartmentService.deletePeopleDepartment(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得部门管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('erp:people-department:query')")
public CommonResult<PeopleDepartmentRespVO> getPeopleDepartment(@RequestParam("id") Integer id) {
PeopleDepartmentDO peopleDepartment = peopleDepartmentService.getPeopleDepartment(id);
return success(BeanUtils.toBean(peopleDepartment, PeopleDepartmentRespVO.class));
}
@GetMapping("/list")
@Operation(summary = "获得部门管理列表")
@PreAuthorize("@ss.hasPermission('erp:people-department:query')")
public CommonResult<List<PeopleDepartmentRespVO>> getPeopleDepartmentList(@Valid PeopleDepartmentListReqVO listReqVO) {
List<PeopleDepartmentDO> list = peopleDepartmentService.getPeopleDepartmentList(listReqVO);
return success(BeanUtils.toBean(list, PeopleDepartmentRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出部门管理 Excel")
@PreAuthorize("@ss.hasPermission('erp:people-department:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportPeopleDepartmentExcel(@Valid PeopleDepartmentListReqVO listReqVO,
HttpServletResponse response) throws IOException {
List<PeopleDepartmentDO> list = peopleDepartmentService.getPeopleDepartmentList(listReqVO);
// 导出 Excel
ExcelUtils.write(response, "部门管理.xls", "数据", PeopleDepartmentRespVO.class,
BeanUtils.toBean(list, PeopleDepartmentRespVO.class));
}
}

View File

@@ -0,0 +1,38 @@
package cn.iocoder.yudao.module.erp.controller.admin.department.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 部门管理列表 Request VO")
@Data
public class PeopleDepartmentListReqVO {
@Schema(description = "上级部门 ID", example = "30109")
private Integer parentDepartmentId;
@Schema(description = "部门名称(如\"人力资源部\"", example = "王五")
private String departmentName;
@Schema(description = "部门地址")
private String address;
@Schema(description = "部门电话")
private String phone;
@Schema(description = "部门备注")
private String remarks;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "开启状态", example = "2")
private Integer status;
}

View File

@@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.erp.controller.admin.department.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import cn.idev.excel.annotation.*;
@Schema(description = "管理后台 - 部门管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PeopleDepartmentRespVO {
@Schema(description = "部门唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "7994")
@ExcelProperty("部门唯一标识")
private Integer id;
@Schema(description = "上级部门 ID", example = "30109")
@ExcelProperty("上级部门 ID")
private Integer parentDepartmentId;
@Schema(description = "部门名称(如\"人力资源部\"", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("部门名称(如\"人力资源部\"")
private String departmentName;
@Schema(description = "部门地址")
@ExcelProperty("部门地址")
private String address;
@Schema(description = "部门电话")
@ExcelProperty("部门电话")
private String phone;
@Schema(description = "部门备注")
@ExcelProperty("部门备注")
private String remarks;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("开启状态")
private Integer status;
}

View File

@@ -0,0 +1,35 @@
package cn.iocoder.yudao.module.erp.controller.admin.department.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 部门管理新增/修改 Request VO")
@Data
public class PeopleDepartmentSaveReqVO {
@Schema(description = "部门唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "7994")
private Integer id;
@Schema(description = "上级部门 ID", example = "30109")
private Integer parentDepartmentId;
@Schema(description = "部门名称(如\"人力资源部\"", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@NotEmpty(message = "部门名称(如\"人力资源部\")不能为空")
private String departmentName;
@Schema(description = "部门地址")
private String address;
@Schema(description = "部门电话")
private String phone;
@Schema(description = "部门备注")
private String remarks;
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotNull(message = "开启状态不能为空")
private Integer status;
}

View File

@@ -0,0 +1,104 @@
package cn.iocoder.yudao.module.erp.controller.admin.devicecategory;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO;
import cn.iocoder.yudao.module.erp.service.devicecategory.DeviceCategoryService;
@Tag(name = "管理后台 - 进销存系统 - 器械分类")
@RestController
@RequestMapping("/erp/device-category")
@Validated
public class DeviceCategoryController {
@Resource
private DeviceCategoryService deviceCategoryService;
@PostMapping("/create")
@Operation(summary = "创建进销存系统 - 器械分类")
@PreAuthorize("@ss.hasPermission('erp:device-category:create')")
public CommonResult<Integer> createDeviceCategory(@Valid @RequestBody DeviceCategorySaveReqVO createReqVO) {
return success(deviceCategoryService.createDeviceCategory(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新进销存系统 - 器械分类")
@PreAuthorize("@ss.hasPermission('erp:device-category:update')")
public CommonResult<Boolean> updateDeviceCategory(@Valid @RequestBody DeviceCategorySaveReqVO updateReqVO) {
deviceCategoryService.updateDeviceCategory(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除进销存系统 - 器械分类")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('erp:device-category:delete')")
public CommonResult<Boolean> deleteDeviceCategory(@RequestParam("id") Integer id) {
deviceCategoryService.deleteDeviceCategory(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除进销存系统 - 器械分类")
@PreAuthorize("@ss.hasPermission('erp:device-category:delete')")
public CommonResult<Boolean> deleteDeviceCategoryList(@RequestParam("ids") List<Integer> ids) {
deviceCategoryService.deleteDeviceCategoryListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得进销存系统 - 器械分类")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('erp:device-category:query')")
public CommonResult<DeviceCategoryRespVO> getDeviceCategory(@RequestParam("id") Integer id) {
DeviceCategoryDO deviceCategory = deviceCategoryService.getDeviceCategory(id);
return success(BeanUtils.toBean(deviceCategory, DeviceCategoryRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得进销存系统 - 器械分类分页")
@PreAuthorize("@ss.hasPermission('erp:device-category:query')")
public CommonResult<PageResult<DeviceCategoryRespVO>> getDeviceCategoryPage(@Valid DeviceCategoryPageReqVO pageReqVO) {
PageResult<DeviceCategoryDO> pageResult = deviceCategoryService.getDeviceCategoryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DeviceCategoryRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出进销存系统 - 器械分类 Excel")
@PreAuthorize("@ss.hasPermission('erp:device-category:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportDeviceCategoryExcel(@Valid DeviceCategoryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<DeviceCategoryDO> list = deviceCategoryService.getDeviceCategoryPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "进销存系统 - 器械分类.xls", "数据", DeviceCategoryRespVO.class,
BeanUtils.toBean(list, DeviceCategoryRespVO.class));
}
}

View File

@@ -0,0 +1,35 @@
package cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 进销存系统 - 器械分类分页 Request VO")
@Data
public class DeviceCategoryPageReqVO extends PageParam {
@Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", example = "赵六")
private String categoryName;
@Schema(description = "分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)")
private String categoryCode;
@Schema(description = "类别(如 \"一类\"\"二类\"\"三类\"),通过下拉选择,必填", example = "1")
private String deviceType;
@Schema(description = "品名举例(如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"),可选填")
private String exampleNames;
@Schema(description = "记录创建时间,自动生成,用于数据审计")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "状态", example = "1")
private Integer status;
}

View File

@@ -0,0 +1,43 @@
package cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import cn.idev.excel.annotation.*;
@Schema(description = "管理后台 - 进销存系统 - 器械分类 Response VO")
@Data
@ExcelIgnoreUnannotated
public class DeviceCategoryRespVO {
@Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11049")
@ExcelProperty("记录唯一标识,系统自动生成,用于数据关联和查询")
private Integer id;
@Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("分类名称(如 \"01 有源手术器械\"),业务核心字段,必填")
private String categoryName;
@Schema(description = "分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)")
private String categoryCode;
@Schema(description = "类别(如 \"一类\"\"二类\"\"三类\"),通过下拉选择,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("类别(如 \"一类\"\"二类\"\"三类\"),通过下拉选择,必填")
private String deviceType;
@Schema(description = "品名举例(如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"),可选填")
@ExcelProperty("品名举例(如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"),可选填")
private String exampleNames;
@Schema(description = "记录创建时间,自动生成,用于数据审计")
@ExcelProperty("记录创建时间,自动生成,用于数据审计")
private LocalDateTime createTime;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态")
private Integer status;
}

View File

@@ -0,0 +1,34 @@
package cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO")
@Data
public class DeviceCategorySaveReqVO {
@Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11049")
private Integer id;
@Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填不能为空")
private String categoryName;
@Schema(description = "分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)不能为空")
private String categoryCode;
@Schema(description = "类别(如 \"一类\"\"二类\"\"三类\"),通过下拉选择,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "类别(如 \"一类\"\"二类\"\"三类\"),通过下拉选择,必填不能为空")
private String deviceType;
@Schema(description = "品名举例(如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"),可选填")
private String exampleNames;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空")
private Integer status;
}

View File

@@ -21,4 +21,5 @@ public class ErpWarehousePageReqVO extends PageParam {
@InEnum(CommonStatusEnum.class)
private Integer status;
}

View File

@@ -0,0 +1,57 @@
package cn.iocoder.yudao.module.erp.dal.dataobject.department;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* 部门管理 DO
*
* @author 芋道源码
*/
@TableName("erp_department")
@KeySequence("erp_department_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PeopleDepartmentDO extends BaseDO {
public static final Integer PARENT_DEPARTMENT_ID_ROOT = 0;
/**
* 部门唯一标识
*/
@TableId
private Integer id;
/**
* 上级部门 ID
*/
private Integer parentDepartmentId;
/**
* 部门名称(如"人力资源部""销售部"
*/
private String departmentName;
/**
* 部门地址
*/
private String address;
/**
* 部门电话
*/
private String phone;
/**
* 部门备注
*/
private String remarks;
/**
* 开启状态
*/
private Integer status;
}

View File

@@ -0,0 +1,52 @@
package cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* 进销存系统 - 器械分类 DO
*
* @author 芋道源码
*/
@TableName("erp_device_category")
@KeySequence("erp_device_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DeviceCategoryDO extends BaseDO {
/**
* 记录唯一标识,系统自动生成,用于数据关联和查询
*/
@TableId
private Integer id;
/**
* 分类名称(如 "01 有源手术器械"),业务核心字段,必填
*/
private String categoryName;
/**
* 分类编号(如 "1-8-8.2""1-10-10.4"),业务唯一标识(页面标*必填)
*/
private String categoryCode;
/**
* 类别(如 "一类""二类""三类"),通过下拉选择,必填
*/
private String deviceType;
/**
* 品名举例(如 "移动式 LED 手术照明灯、LED 手术照明灯..."),可选填
*/
private String exampleNames;
/**
* 状态
*/
private Integer status;
}

View File

@@ -0,0 +1,40 @@
package cn.iocoder.yudao.module.erp.dal.mysql.department;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.erp.dal.dataobject.department.PeopleDepartmentDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.erp.controller.admin.department.vo.*;
/**
* 部门管理 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface PeopleDepartmentMapper extends BaseMapperX<PeopleDepartmentDO> {
default List<PeopleDepartmentDO> selectList(PeopleDepartmentListReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PeopleDepartmentDO>()
.eqIfPresent(PeopleDepartmentDO::getParentDepartmentId, reqVO.getParentDepartmentId())
.likeIfPresent(PeopleDepartmentDO::getDepartmentName, reqVO.getDepartmentName())
.eqIfPresent(PeopleDepartmentDO::getAddress, reqVO.getAddress())
.eqIfPresent(PeopleDepartmentDO::getPhone, reqVO.getPhone())
.eqIfPresent(PeopleDepartmentDO::getRemarks, reqVO.getRemarks())
.betweenIfPresent(PeopleDepartmentDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PeopleDepartmentDO::getStatus, reqVO.getStatus())
.orderByDesc(PeopleDepartmentDO::getId));
}
default PeopleDepartmentDO selectByParentDepartmentIdAndDepartmentName(Integer parentDepartmentId, String departmentName) {
return selectOne(PeopleDepartmentDO::getParentDepartmentId, parentDepartmentId, PeopleDepartmentDO::getDepartmentName, departmentName);
}
default Long selectCountByParentDepartmentId(Integer parentDepartmentId) {
return selectCount(PeopleDepartmentDO::getParentDepartmentId, parentDepartmentId);
}
}

View File

@@ -0,0 +1,31 @@
package cn.iocoder.yudao.module.erp.dal.mysql.devicecategory;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*;
/**
* 进销存系统 - 器械分类 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface DeviceCategoryMapper extends BaseMapperX<DeviceCategoryDO> {
default PageResult<DeviceCategoryDO> selectPage(DeviceCategoryPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceCategoryDO>()
.likeIfPresent(DeviceCategoryDO::getCategoryName, reqVO.getCategoryName())
.eqIfPresent(DeviceCategoryDO::getCategoryCode, reqVO.getCategoryCode())
.eqIfPresent(DeviceCategoryDO::getDeviceType, reqVO.getDeviceType())
.eqIfPresent(DeviceCategoryDO::getExampleNames, reqVO.getExampleNames())
.betweenIfPresent(DeviceCategoryDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(DeviceCategoryDO::getStatus, reqVO.getStatus())
.orderByDesc(DeviceCategoryDO::getId));
}
}

View File

@@ -145,6 +145,9 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00
ErrorCode PRODUCT_UNIT_NAME_DUPLICATE = new ErrorCode(1_030_502_001, "已存在该名字的产品单位");
ErrorCode PRODUCT_UNIT_EXITS_PRODUCT = new ErrorCode(1_030_502_002, "存在产品使用该单位,无法删除");
// ========== 进销存系统 - 器械分类 1-030-503-000 ==========
ErrorCode DEVICE_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_503_000, "进销存系统 - 器械分类不存在");
// ========== ERP 结算账户 1-030-600-000 ==========
ErrorCode ACCOUNT_NOT_EXISTS = new ErrorCode(1_030_600_000, "结算账户不存在");
ErrorCode ACCOUNT_NOT_ENABLE = new ErrorCode(1_030_600_001, "结算账户({})未启用");
@@ -165,4 +168,12 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00
ErrorCode FINANCE_RECEIPT_NO_EXISTS = new ErrorCode(1_030_602_004, "生成收款单号失败,请重新提交");
ErrorCode FINANCE_RECEIPT_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_602_005, "收款单({})已审核,无法修改");
// ========== ERP 部门管理 1-030-700-000 ==========
ErrorCode PEOPLE_DEPARTMENT_NOT_EXISTS = new ErrorCode(1_030_700_000, "部门管理不存在");
ErrorCode PEOPLE_DEPARTMENT_EXITS_CHILDREN = new ErrorCode(1_030_700_001, "存在子部门管理,无法删除");
ErrorCode PEOPLE_DEPARTMENT_PARENT_NOT_EXITS = new ErrorCode(1_030_700_002,"父级部门管理不存在");
ErrorCode PEOPLE_DEPARTMENT_PARENT_ERROR = new ErrorCode(1_030_700_003, "不能设置自己为父部门管理");
ErrorCode PEOPLE_DEPARTMENT_DEPARTMENT_NAME_DUPLICATE = new ErrorCode(1_030_700_004, "已经存在该部门名称(如\"人力资源部\"\"销售部\")的部门管理");
ErrorCode PEOPLE_DEPARTMENT_PARENT_IS_CHILD = new ErrorCode(1_030_700_005, "不能设置自己的子PeopleDepartment为父PeopleDepartment");
}

View File

@@ -0,0 +1,56 @@
package cn.iocoder.yudao.module.erp.service.department;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.erp.controller.admin.department.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.department.PeopleDepartmentDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 部门管理 Service 接口
*
* @author 芋道源码
*/
public interface PeopleDepartmentService {
/**
* 创建部门管理
*
* @param createReqVO 创建信息
* @return 编号
*/
Integer createPeopleDepartment(@Valid PeopleDepartmentSaveReqVO createReqVO);
/**
* 更新部门管理
*
* @param updateReqVO 更新信息
*/
void updatePeopleDepartment(@Valid PeopleDepartmentSaveReqVO updateReqVO);
/**
* 删除部门管理
*
* @param id 编号
*/
void deletePeopleDepartment(Integer id);
/**
* 获得部门管理
*
* @param id 编号
* @return 部门管理
*/
PeopleDepartmentDO getPeopleDepartment(Integer id);
/**
* 获得部门管理列表
*
* @param listReqVO 查询条件
* @return 部门管理列表
*/
List<PeopleDepartmentDO> getPeopleDepartmentList(PeopleDepartmentListReqVO listReqVO);
}

View File

@@ -0,0 +1,141 @@
package cn.iocoder.yudao.module.erp.service.department;
import cn.hutool.core.collection.CollUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.erp.controller.admin.department.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.department.PeopleDepartmentDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.dal.mysql.department.PeopleDepartmentMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
/**
* 部门管理 Service 实现类
*
* @author 芋道源码
*/
@Service
@Validated
public class PeopleDepartmentServiceImpl implements PeopleDepartmentService {
@Resource
private PeopleDepartmentMapper peopleDepartmentMapper;
@Override
public Integer createPeopleDepartment(PeopleDepartmentSaveReqVO createReqVO) {
// 校验上级部门 ID的有效性
validateParentPeopleDepartment(null, createReqVO.getParentDepartmentId());
// 校验部门名称(如"人力资源部""销售部")的唯一性
validatePeopleDepartmentDepartmentNameUnique(null, createReqVO.getParentDepartmentId(), createReqVO.getDepartmentName());
// 插入
PeopleDepartmentDO peopleDepartment = BeanUtils.toBean(createReqVO, PeopleDepartmentDO.class);
peopleDepartmentMapper.insert(peopleDepartment);
// 返回
return peopleDepartment.getId();
}
@Override
public void updatePeopleDepartment(PeopleDepartmentSaveReqVO updateReqVO) {
// 校验存在
validatePeopleDepartmentExists(updateReqVO.getId());
// 校验上级部门 ID的有效性
validateParentPeopleDepartment(updateReqVO.getId(), updateReqVO.getParentDepartmentId());
// 校验部门名称(如"人力资源部""销售部")的唯一性
validatePeopleDepartmentDepartmentNameUnique(updateReqVO.getId(), updateReqVO.getParentDepartmentId(), updateReqVO.getDepartmentName());
// 更新
PeopleDepartmentDO updateObj = BeanUtils.toBean(updateReqVO, PeopleDepartmentDO.class);
peopleDepartmentMapper.updateById(updateObj);
}
@Override
public void deletePeopleDepartment(Integer id) {
// 校验存在
validatePeopleDepartmentExists(id);
// 校验是否有子部门管理
if (peopleDepartmentMapper.selectCountByParentDepartmentId(id) > 0) {
throw exception(PEOPLE_DEPARTMENT_EXITS_CHILDREN);
}
// 删除
peopleDepartmentMapper.deleteById(id);
}
private void validatePeopleDepartmentExists(Integer id) {
if (peopleDepartmentMapper.selectById(id) == null) {
throw exception(PEOPLE_DEPARTMENT_NOT_EXISTS);
}
}
private void validateParentPeopleDepartment(Integer id, Integer parentDepartmentId) {
if (parentDepartmentId == null || PeopleDepartmentDO.PARENT_DEPARTMENT_ID_ROOT.equals(parentDepartmentId)) {
return;
}
// 1. 不能设置自己为父部门管理
if (Objects.equals(id, parentDepartmentId)) {
throw exception(PEOPLE_DEPARTMENT_PARENT_ERROR);
}
// 2. 父部门管理不存在
PeopleDepartmentDO parentPeopleDepartment = peopleDepartmentMapper.selectById(parentDepartmentId);
if (parentPeopleDepartment == null) {
throw exception(PEOPLE_DEPARTMENT_PARENT_NOT_EXITS);
}
// 3. 递归校验父部门管理,如果父部门管理是自己的子部门管理,则报错,避免形成环路
if (id == null) { // id 为空,说明新增,不需要考虑环路
return;
}
for (int i = 0; i < Short.MAX_VALUE; i++) {
// 3.1 校验环路
parentDepartmentId = parentPeopleDepartment.getParentDepartmentId();
if (Objects.equals(id, parentDepartmentId)) {
throw exception(PEOPLE_DEPARTMENT_PARENT_IS_CHILD);
}
// 3.2 继续递归下一级父部门管理
if (parentDepartmentId == null || PeopleDepartmentDO.PARENT_DEPARTMENT_ID_ROOT.equals(parentDepartmentId)) {
break;
}
parentPeopleDepartment = peopleDepartmentMapper.selectById(parentDepartmentId);
if (parentPeopleDepartment == null) {
break;
}
}
}
private void validatePeopleDepartmentDepartmentNameUnique(Integer id, Integer parentDepartmentId, String departmentName) {
PeopleDepartmentDO peopleDepartment = peopleDepartmentMapper.selectByParentDepartmentIdAndDepartmentName(parentDepartmentId, departmentName);
if (peopleDepartment == null) {
return;
}
// 如果 id 为空,说明不用比较是否为相同 id 的部门管理
if (id == null) {
throw exception(PEOPLE_DEPARTMENT_DEPARTMENT_NAME_DUPLICATE);
}
if (!Objects.equals(peopleDepartment.getId(), id)) {
throw exception(PEOPLE_DEPARTMENT_DEPARTMENT_NAME_DUPLICATE);
}
}
@Override
public PeopleDepartmentDO getPeopleDepartment(Integer id) {
return peopleDepartmentMapper.selectById(id);
}
@Override
public List<PeopleDepartmentDO> getPeopleDepartmentList(PeopleDepartmentListReqVO listReqVO) {
return peopleDepartmentMapper.selectList(listReqVO);
}
}

View File

@@ -0,0 +1,62 @@
package cn.iocoder.yudao.module.erp.service.devicecategory;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 进销存系统 - 器械分类 Service 接口
*
* @author 芋道源码
*/
public interface DeviceCategoryService {
/**
* 创建进销存系统 - 器械分类
*
* @param createReqVO 创建信息
* @return 编号
*/
Integer createDeviceCategory(@Valid DeviceCategorySaveReqVO createReqVO);
/**
* 更新进销存系统 - 器械分类
*
* @param updateReqVO 更新信息
*/
void updateDeviceCategory(@Valid DeviceCategorySaveReqVO updateReqVO);
/**
* 删除进销存系统 - 器械分类
*
* @param id 编号
*/
void deleteDeviceCategory(Integer id);
/**
* 批量删除进销存系统 - 器械分类
*
* @param ids 编号
*/
void deleteDeviceCategoryListByIds(List<Integer> ids);
/**
* 获得进销存系统 - 器械分类
*
* @param id 编号
* @return 进销存系统 - 器械分类
*/
DeviceCategoryDO getDeviceCategory(Integer id);
/**
* 获得进销存系统 - 器械分类分页
*
* @param pageReqVO 分页查询
* @return 进销存系统 - 器械分类分页
*/
PageResult<DeviceCategoryDO> getDeviceCategoryPage(DeviceCategoryPageReqVO pageReqVO);
}

View File

@@ -0,0 +1,85 @@
package cn.iocoder.yudao.module.erp.service.devicecategory;
import cn.hutool.core.collection.CollUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.dal.mysql.devicecategory.DeviceCategoryMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
/**
* 进销存系统 - 器械分类 Service 实现类
*
* @author 芋道源码
*/
@Service
@Validated
public class DeviceCategoryServiceImpl implements DeviceCategoryService {
@Resource
private DeviceCategoryMapper deviceCategoryMapper;
@Override
public Integer createDeviceCategory(DeviceCategorySaveReqVO createReqVO) {
// 插入
DeviceCategoryDO deviceCategory = BeanUtils.toBean(createReqVO, DeviceCategoryDO.class);
deviceCategoryMapper.insert(deviceCategory);
// 返回
return deviceCategory.getId();
}
@Override
public void updateDeviceCategory(DeviceCategorySaveReqVO updateReqVO) {
// 校验存在
validateDeviceCategoryExists(updateReqVO.getId());
// 更新
DeviceCategoryDO updateObj = BeanUtils.toBean(updateReqVO, DeviceCategoryDO.class);
deviceCategoryMapper.updateById(updateObj);
}
@Override
public void deleteDeviceCategory(Integer id) {
// 校验存在
validateDeviceCategoryExists(id);
// 删除
deviceCategoryMapper.deleteById(id);
}
@Override
public void deleteDeviceCategoryListByIds(List<Integer> ids) {
// 删除
deviceCategoryMapper.deleteByIds(ids);
}
private void validateDeviceCategoryExists(Integer id) {
if (deviceCategoryMapper.selectById(id) == null) {
throw exception(DEVICE_CATEGORY_NOT_EXISTS);
}
}
@Override
public DeviceCategoryDO getDeviceCategory(Integer id) {
return deviceCategoryMapper.selectById(id);
}
@Override
public PageResult<DeviceCategoryDO> getDeviceCategoryPage(DeviceCategoryPageReqVO pageReqVO) {
return deviceCategoryMapper.selectPage(pageReqVO);
}
}

View File

@@ -0,0 +1,12 @@
<?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="cn.iocoder.yudao.module.erp.dal.mysql.devicecategory.DeviceCategoryMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

View File

@@ -13,7 +13,7 @@
<if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
</if>
AND deleted = 0) -
AND deleted = 0) -
(SELECT IFNULL(SUM(total_price), 0)
FROM erp_purchase_return
WHERE return_time >= #{beginTime}

View File

@@ -168,4 +168,5 @@ public interface ErrorCodeConstants {
// ========== 站内信发送 1-002-028-000 ==========
ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1_002_028_000, "模板参数({})缺失");
}

View File

@@ -66,9 +66,9 @@ spring:
# password: Yudao@2024 # OpenGauss 连接的示例
slave: # 模拟从库,可根据自己需要修改
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://47.116.196.11:33306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
username: root
password: 123456
password: Jchl1528~!
# tdengine: # IoT 数据库(需要 IoT 物联网再开启噢!)
# url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro
# driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -82,7 +82,7 @@ spring:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: dev # 密码,建议生产环境开启
# password: abc123456 # 密码,根据实际情况填写或者保持注释状态(如果不需要密码)
--- #################### 定时任务相关配置 ####################

View File

@@ -1,5 +1,5 @@
# 标题
VITE_APP_TITLE=芋道管理系统
VITE_APP_TITLE=医疗器械管理系统
# 项目本地运行端口号
VITE_PORT=80

View File

@@ -0,0 +1,48 @@
import request from '@/config/axios'
import type { Dayjs } from 'dayjs';
/** 部门管理信息 */
export interface PeopleDepartment {
id: number; // 部门唯一标识
parentDepartmentId: number; // 上级部门 ID
departmentName?: string; // 部门名称(如"人力资源部""销售部"
address: string; // 部门地址
phone: string; // 部门电话
remarks: string; // 部门备注
status?: number; // 开启状态
children?: PeopleDepartment[];
}
// 部门管理 API
export const PeopleDepartmentApi = {
// 查询部门管理列表
getPeopleDepartmentList: async (params) => {
return await request.get({ url: `/erp/people-department/list`, params })
},
// 查询部门管理详情
getPeopleDepartment: async (id: number) => {
return await request.get({ url: `/erp/people-department/get?id=` + id })
},
// 新增部门管理
createPeopleDepartment: async (data: PeopleDepartment) => {
return await request.post({ url: `/erp/people-department/create`, data })
},
// 修改部门管理
updatePeopleDepartment: async (data: PeopleDepartment) => {
return await request.put({ url: `/erp/people-department/update`, data })
},
// 删除部门管理
deletePeopleDepartment: async (id: number) => {
return await request.delete({ url: `/erp/people-department/delete?id=` + id })
},
// 导出部门管理 Excel
exportPeopleDepartment: async (params) => {
return await request.download({ url: `/erp/people-department/export-excel`, params })
}
}

View File

@@ -1,5 +1,4 @@
import request from '@/config/axios'
import type { Dayjs } from 'dayjs';
/** 进销存系统 - 器械分类信息 */
export interface DeviceCategory {
@@ -49,4 +48,4 @@ export const DeviceCategoryApi = {
exportDeviceCategory: async (params) => {
return await request.download({ url: `/erp/device-category/export-excel`, params })
}
}
}

View File

@@ -10,7 +10,7 @@
</el-avatar>
<div>
<div class="text-20px">
{{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
{{ t('workplace.welcome') }}, {{ t('workplace.happyDay') }}
</div>
<div class="mt-10px text-14px text-gray-500">
{{ t('workplace.toady') }}20 - 32
@@ -56,129 +56,6 @@
</el-card>
</div>
<el-row class="mt-8px" :gutter="8" justify="space-between">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.project') }}</span>
<el-link
type="primary"
:underline="false"
href="https://github.com/yudaocode"
target="_blank"
>
{{ t('action.more') }}
</el-link>
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col
v-for="(item, index) in projects"
:key="`card-${index}`"
:xl="8"
:lg="8"
:md="8"
:sm="24"
:xs="24"
>
<el-card
shadow="hover"
class="mr-5px mt-5px cursor-pointer"
@click="handleProjectClick(item.message)"
>
<div class="flex items-center">
<Icon
:icon="item.icon"
:size="25"
class="mr-8px"
:style="{ color: item.color }"
/>
<span class="text-16px">{{ item.name }}</span>
</div>
<div class="mt-12px text-12px text-gray-400">{{ t(item.message) }}</div>
<div class="mt-12px flex justify-between text-12px text-gray-400">
<span>{{ item.personal }}</span>
<span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
</div>
</el-card>
</el-col>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<el-skeleton :loading="loading" animated>
<el-row :gutter="20" justify="space-between">
<el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="pieOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
<el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="barOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
</el-row>
</el-skeleton>
</el-card>
</el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.shortcutOperation') }}</span>
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">
<div class="flex items-center">
<Icon :icon="item.icon" class="mr-8px" :style="{ color: item.color }" />
<el-link type="default" :underline="false" @click="handleShortcutClick(item.url)">
{{ item.name }}
</el-link>
</div>
</el-col>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.notice') }}</span>
<el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>
</div>
</template>
<el-skeleton :loading="loading" animated>
<div v-for="(item, index) in notice" :key="`dynamics-${index}`">
<div class="flex items-center">
<el-avatar :src="avatar" :size="35" class="mr-16px">
<img src="@/assets/imgs/avatar.gif" alt="" />
</el-avatar>
<div>
<div class="text-14px">
<Highlight :keys="item.keys.map((v) => t(v))">
{{ item.type }} : {{ item.title }}
</Highlight>
</div>
<div class="mt-16px text-12px text-gray-400">
{{ formatTime(item.date, 'yyyy-MM-dd') }}
</div>
</div>
</div>
<el-divider />
</div>
</el-skeleton>
</el-card>
</el-col>
</el-row>
</template>
<script lang="ts" setup>
import { set } from 'lodash-es'

View File

@@ -20,10 +20,10 @@
tag="div"
>
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
<!-- <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
<div key="3" class="mt-5 text-14px font-normal text-white">
{{ t('login.message') }}
</div>
</div> -->
</TransitionGroup>
</div>
</div>

View File

@@ -15,7 +15,7 @@
<LoginFormTitle class="w-full" />
</el-form-item>
</el-col>
<el-col :span="24" class="px-10px">
<el-col v-show=false :span="24" class="px-10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"
@@ -113,8 +113,8 @@
</el-row>
</el-form-item>
</el-col>
<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>
<el-col :span="24" class="px-10px">
<!-- <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider> -->
<!-- <el-col :span="24" class="px-10px">
<el-form-item>
<div class="w-full flex justify-between">
<Icon
@@ -128,9 +128,9 @@
/>
</div>
</el-form-item>
</el-col>
<el-divider content-position="center">萌新必读</el-divider>
<el-col :span="24" class="px-10px">
</el-col> -->
<!-- <el-divider content-position="center">萌新必读</el-divider> -->
<!-- <el-col :span="24" class="px-10px">
<el-form-item>
<div class="w-full flex justify-between">
<el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
@@ -143,7 +143,7 @@
</el-link>
</div>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
</template>

View File

@@ -11,12 +11,12 @@
>
<el-row class="mx-[-10px]">
<!-- 租户名 -->
<el-col :span="24" class="px-10px">
<el-col :span="24" class="px-10px">
<el-form-item>
<LoginFormTitle class="w-full" />
</el-form-item>
</el-col>
<el-col :span="24" class="px-10px">
<el-col v-show="false" :span="24" class="px-10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"

View File

@@ -15,7 +15,7 @@
<LoginFormTitle class="w-full" />
</el-form-item>
</el-col>
<el-col :span="24" class="px-10px">
<el-col v-show="false" :span="24" class="px-10px">
<el-form-item v-if="registerData.tenantEnable === 'true'" prop="tenantName">
<el-input
v-model="registerData.registerForm.tenantName"

View File

@@ -0,0 +1,139 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="上级部门 ID" prop="parentDepartmentId">
<el-tree-select
v-model="formData.parentDepartmentId"
:data="peopleDepartmentTree"
:props="{...defaultProps, label: 'departmentName'}"
check-strictly
default-expand-all
placeholder="请选择上级部门 ID"
/>
</el-form-item>
<el-form-item label="部门名称" prop="departmentName">
<el-input v-model="formData.departmentName" placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="部门地址" prop="address">
<el-input v-model="formData.address" placeholder="请输入部门地址" />
</el-form-item>
<el-form-item label="部门电话" prop="phone">
<el-input v-model="formData.phone" placeholder="请输入部门电话" />
</el-form-item>
<el-form-item label="部门备注" prop="remarks">
<el-input v-model="formData.remarks" placeholder="请输入部门备注" />
</el-form-item>
<el-form-item label="开启状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio value="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { PeopleDepartmentApi, PeopleDepartment } from '@/api/erp/department'
import { defaultProps, handleTree } from '@/utils/tree'
/** 部门管理 表单 */
defineOptions({ name: 'PeopleDepartmentForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中1修改时的数据加载2提交的按钮禁用
const formType = ref('') // 表单的类型create - 新增update - 修改
const formData = ref({
id: undefined,
parentDepartmentId: undefined,
departmentName: undefined,
address: undefined,
phone: undefined,
remarks: undefined,
status: undefined
})
const formRules = reactive({
departmentName: [{ required: true, message: '部门名称(如"人力资源部""销售部")不能为空', trigger: 'blur' }],
status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const peopleDepartmentTree = ref() // 树形结构
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 修改时,设置数据
if (id) {
formLoading.value = true
try {
formData.value = await PeopleDepartmentApi.getPeopleDepartment(id)
} finally {
formLoading.value = false
}
}
await getPeopleDepartmentTree()
}
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as PeopleDepartment
if (formType.value === 'create') {
await PeopleDepartmentApi.createPeopleDepartment(data)
message.success(t('common.createSuccess'))
} else {
await PeopleDepartmentApi.updatePeopleDepartment(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
parentDepartmentId: undefined,
departmentName: undefined,
address: undefined,
phone: undefined,
remarks: undefined,
status: undefined
}
formRef.value?.resetFields()
}
/** 获得部门管理树 */
const getPeopleDepartmentTree = async () => {
peopleDepartmentTree.value = []
const data = await PeopleDepartmentApi.getPeopleDepartmentList()
const root: Tree = { id: 0, name: '顶级部门管理', children: [] }
root.children = handleTree(data, 'id', 'parentDepartmentId')
peopleDepartmentTree.value.push(root)
}
</script>

View File

@@ -0,0 +1,264 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="上级部门 ID" prop="parentDepartmentId">
<el-input
v-model="queryParams.parentDepartmentId"
placeholder="请输入上级部门 ID"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label=部门名称 prop="departmentName">
<el-input
v-model="queryParams.departmentName"
placeholder="请输入部门名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门地址" prop="address">
<el-input
v-model="queryParams.address"
placeholder="请输入部门地址"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门电话" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入部门电话"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门备注" prop="remarks">
<el-input
v-model="queryParams.remarks"
placeholder="请输入部门备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="开启状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择开启状态"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['erp:people-department:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['erp:people-department:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
<el-button type="danger" plain @click="toggleExpandAll">
<Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
row-key="id"
:default-expand-all="isExpandAll"
v-if="refreshTable"
>
<el-table-column label="部门唯一标识" align="center" prop="id" />
<el-table-column label="上级部门 ID" align="center" prop="parentDepartmentId" />
<el-table-column label="部门名称" align="center" prop="departmentName" />
<el-table-column label="部门地址" align="center" prop="address" />
<el-table-column label="部门电话" align="center" prop="phone" />
<el-table-column label="部门备注" align="center" prop="remarks" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="开启状态" align="center" prop="status" />
<el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:people-department:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['erp:people-department:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<PeopleDepartmentForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { isEmpty } from '@/utils/is'
import { dateFormatter } from '@/utils/formatTime'
import { handleTree } from '@/utils/tree'
import download from '@/utils/download'
import { PeopleDepartmentApi, PeopleDepartment } from '@/api/erp/department'
import PeopleDepartmentForm from './PeopleDepartmentForm.vue'
/** 部门管理 列表 */
defineOptions({ name: 'PeopleDepartment' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<PeopleDepartment[]>([]) // 列表的数据
const queryParams = reactive({
parentDepartmentId: undefined,
departmentName: undefined,
address: undefined,
phone: undefined,
remarks: undefined,
createTime: [],
status: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await PeopleDepartmentApi.getPeopleDepartmentList(queryParams)
list.value = handleTree(data, 'id', 'parentDepartmentId')
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await PeopleDepartmentApi.deletePeopleDepartment(id)
message.success(t('common.delSuccess'))
currentRow.value = {}
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await PeopleDepartmentApi.exportPeopleDepartment(queryParams)
download.excel(data, '部门管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 展开/折叠操作 */
const isExpandAll = ref(true) // 是否展开,默认全部展开
const refreshTable = ref(true) // 重新渲染表格状态
const toggleExpandAll = async () => {
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
await nextTick()
refreshTable.value = true
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@@ -7,29 +7,32 @@
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="分类名称(如 '01 有源手术器械'),业务核心字段,必填" prop="categoryName">
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="formData.categoryName" placeholder="请输入分类名称(如 '01 有源手术器械'),业务核心字段,必填" />
</el-form-item>
<el-form-item label="分类编号(如 '1-8-8.2''1-10-10.4'),业务唯一标识(页面标*必填)" prop="categoryCode">
<el-input v-model="formData.categoryCode" placeholder="请输入分类编号(如 '1-8-8.2''1-10-10.4'),业务唯一标识(页面标*必填)" />
<el-form-item label="分类编号" prop="categoryCode">
<el-input v-model="formData.categoryCode" placeholder="请输入分类编号" />
</el-form-item>
<el-form-item label="类别(如 '一类''二类''三类'),通过下拉选择,必填" prop="deviceType">
<el-select v-model="formData.deviceType" placeholder="请选择类别(如 '一类''二类''三类'),通过下拉选择,必填">
<el-option label="请选择字典生成" value="" />
<el-form-item label="类别" prop="deviceType">
<el-select v-model="formData.deviceType" placeholder="请选择类别">
<el-option label="一类" value="1" />
<el-option label="二类" value="2" />
<el-option label="三类" value="3" />
</el-select>
</el-form-item>
<el-form-item label="品名举例(如 '移动式 LED 手术照明灯、LED 手术照明灯...'),可选填" prop="exampleNames">
<el-input v-model="formData.exampleNames" placeholder="请输入品名举例(如 '移动式 LED 手术照明灯、LED 手术照明灯...'),可选填" />
<el-form-item label="品名" prop="exampleNames">
<el-input v-model="formData.exampleNames" placeholder="请输入品名" />
</el-form-item>
<el-form-item label="记录创建人(如 'admin'),用于追溯操作人" prop="createUser">
<el-input v-model="formData.createUser" placeholder="请输入记录创建人(如 'admin'),用于追溯操作人" />
<el-form-item label="创建人" prop="createUser">
<el-input v-model="formData.createUser" placeholder="请输入记录创建人" />
</el-form-item>
<el-form-item label="记录最后更新人,数据首次创建时可为空,修改后自动填充" prop="updateUser">
<el-input v-model="formData.updateUser" placeholder="请输入记录最后更新人,数据首次创建时可为空,修改后自动填充" />
<el-form-item label="更新人" prop="updateUser">
<el-input v-model="formData.updateUser" placeholder="请输入记录最后更新人" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio value="1">请选择字典生成</el-radio>
<el-radio value="1">开启</el-radio>
<el-radio value="2">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

View File

@@ -8,28 +8,28 @@
:inline="true"
label-width="68px"
>
<el-form-item label="分类名称(如 '01 有源手术器械'),业务核心字段,必填" prop="categoryName">
<el-form-item label="分类名称" prop="categoryName">
<el-input
v-model="queryParams.categoryName"
placeholder="请输入分类名称(如 '01 有源手术器械'),业务核心字段,必填"
placeholder="请输入分类名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="分类编号(如 '1-8-8.2''1-10-10.4'),业务唯一标识(页面标*必填)" prop="categoryCode">
<el-form-item label="分类编号" prop="categoryCode">
<el-input
v-model="queryParams.categoryCode"
placeholder="请输入分类编号(如 '1-8-8.2''1-10-10.4'),业务唯一标识(页面标*必填)"
placeholder="请输入分类编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="类别(如 '一类''二类''三类'),通过下拉选择,必填" prop="deviceType">
<el-form-item label="类别" prop="deviceType">
<el-select
v-model="queryParams.deviceType"
placeholder="请选择类别(如 '一类''二类''三类'),通过下拉选择,必填"
placeholder="请选择类别"
clearable
class="!w-240px"
>
@@ -38,16 +38,16 @@
<el-option label="三类" value="三类" />
</el-select>
</el-form-item>
<el-form-item label="品名举例(如 '移动式 LED 手术照明灯、LED 手术照明灯...'),可选填" prop="exampleNames">
<el-form-item label="品名" prop="exampleNames">
<el-input
v-model="queryParams.exampleNames"
placeholder="请输入品名举例(如 '移动式 LED 手术照明灯、LED 手术照明灯...'),可选填"
placeholder="请输入品名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="记录创建时间,自动生成,用于数据审计" prop="createTime">
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -58,19 +58,19 @@
class="!w-220px"
/>
</el-form-item>
<el-form-item label="记录创建人(如 'admin'),用于追溯操作人" prop="createUser">
<el-form-item label="创建人" prop="createUser">
<el-input
v-model="queryParams.createUser"
placeholder="请输入记录创建人(如 'admin'),用于追溯操作人"
placeholder="请输入记录创建人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="记录最后更新人,数据首次创建时可为空,修改后自动填充" prop="updateUser">
<el-form-item label="更新人" prop="updateUser">
<el-input
v-model="queryParams.updateUser"
placeholder="请输入记录最后更新人,数据首次创建时可为空,修改后自动填充"
placeholder="请输入记录最后更新人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -131,20 +131,20 @@
@selection-change="handleRowCheckboxChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="记录唯一标识,系统自动生成,用于数据关联和查询" align="center" prop="id" />
<el-table-column label="分类名称(如 '01 有源手术器械'),业务核心字段,必填" align="center" prop="categoryName" />
<el-table-column label="分类编号(如 '1-8-8.2''1-10-10.4'),业务唯一标识(页面标*必填)" align="center" prop="categoryCode" />
<el-table-column label="类别(如 '一类''二类''三类'),通过下拉选择,必填" align="center" prop="deviceType" />
<el-table-column label="品名举例(如 '移动式 LED 手术照明灯、LED 手术照明灯...'),可选填" align="center" prop="exampleNames" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="分类名称" align="center" prop="categoryName" />
<el-table-column label="分类编号" align="center" prop="categoryCode" />
<el-table-column label="类别" align="center" prop="deviceType" />
<el-table-column label="品名" align="center" prop="exampleNames" />
<el-table-column
label="记录创建时间,自动生成,用于数据审计"
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="记录创建人(如 'admin'),用于追溯操作人" align="center" prop="createUser" />
<el-table-column label="记录最后更新人,数据首次创建时可为空,修改后自动填充" align="center" prop="updateUser" />
<el-table-column label="创建人" align="center" prop="createUser" />
<el-table-column label="最后更新人" align="center" prop="updateUser" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">