【基础信息-模块类型】初步完成，统一系统内置表状态展示

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java

@@ -23,5 +23,6 @@ public interface ErrorCodeConstants {
     /*********组织架构************/
     ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_002_001, "车间不存在");
     ErrorCode CLASSES_NOT_EXISTS = new ErrorCode(1_002_002, "生产班组不存在");
+    ErrorCode MOULD_TYPE_NOT_EXISTS = new ErrorCode(1_002_003, "模具类型不存在");
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/mouldtype/MouldTypeController.java

@@ -0,0 +1,95 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype;
+
+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 com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.mouldtype.MouldTypeDO;
+import com.chanko.yunxi.mes.module.heli.service.mouldtype.MouldTypeService;
+
+@Tag(name = "管理后台 - 模具类型")
+@RestController
+@RequestMapping("/heli/mould-type")
+@Validated
+public class MouldTypeController {
+
+    @Resource
+    private MouldTypeService mouldTypeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建模具类型")
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:create')")
+    public CommonResult<Long> createMouldType(@Valid @RequestBody MouldTypeSaveReqVO createReqVO) {
+        return success(mouldTypeService.createMouldType(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新模具类型")
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:update')")
+    public CommonResult<Boolean> updateMouldType(@Valid @RequestBody MouldTypeSaveReqVO updateReqVO) {
+        mouldTypeService.updateMouldType(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除模具类型")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:delete')")
+    public CommonResult<Boolean> deleteMouldType(@RequestParam("id") Long id) {
+        mouldTypeService.deleteMouldType(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得模具类型")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:query')")
+    public CommonResult<MouldTypeRespVO> getMouldType(@RequestParam("id") Long id) {
+        MouldTypeDO mouldType = mouldTypeService.getMouldType(id);
+        return success(BeanUtils.toBean(mouldType, MouldTypeRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得模具类型分页")
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:query')")
+    public CommonResult<PageResult<MouldTypeRespVO>> getMouldTypePage(@Valid MouldTypePageReqVO pageReqVO) {
+        PageResult<MouldTypeDO> pageResult = mouldTypeService.getMouldTypePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MouldTypeRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出模具类型 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:mould-type:export')")
+    @OperateLog(type = EXPORT)
+    public void exportMouldTypeExcel(@Valid MouldTypePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MouldTypeDO> list = mouldTypeService.getMouldTypePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "模具类型.xls", "数据", MouldTypeRespVO.class,
+                        BeanUtils.toBean(list, MouldTypeRespVO.class));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/mouldtype/vo/MouldTypePageReqVO.java

@@ -0,0 +1,28 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 模具类型分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MouldTypePageReqVO extends PageParam {
+
+    @Schema(description = "类型名称 唯一", example = "李四")
+    private String name;
+
+    @Schema(description = "状态,1表示正常，2表示禁用，默认是1", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/mouldtype/vo/MouldTypeRespVO.java

@@ -0,0 +1,35 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
+import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 模具类型 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MouldTypeRespVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "27590")
+    @ExcelProperty("自增字段，唯一")
+    private Long id;
+
+    @Schema(description = "类型名称 唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("类型名称 唯一")
+    private String name;
+
+    @Schema(description = "状态,1表示正常，2表示禁用，默认是1", example = "2")
+    @ExcelProperty(value = "状态,1表示正常，2表示禁用，默认是1", converter = DictConvert.class)
+    @DictFormat("heli_common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/mouldtype/vo/MouldTypeSaveReqVO.java

@@ -0,0 +1,23 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+
+@Schema(description = "管理后台 - 模具类型新增/修改 Request VO")
+@Data
+public class MouldTypeSaveReqVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "27590")
+    private Long id;
+
+    @Schema(description = "类型名称 唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotEmpty(message = "类型名称 唯一不能为空")
+    private String name;
+
+    @Schema(description = "状态,1表示正常，2表示禁用，默认是1", example = "2")
+    private Integer status;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/mouldtype/MouldTypeDO.java

@@ -0,0 +1,41 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.mouldtype;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 模具类型 DO
+ *
+ * @author 管理员
+ */
+@TableName("base_mould_type")
+@KeySequence("base_mould_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MouldTypeDO extends BaseDO {
+
+    /**
+     * 自增字段，唯一
+     */
+    @TableId
+    private Long id;
+    /**
+     * 类型名称 唯一
+     */
+    private String name;
+    /**
+     * 状态,1表示正常，2表示禁用，默认是1
+     *
+     * 枚举 {@link TODO heli_common_status 对应的类}
+     */
+    private Integer status;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/mouldtype/MouldTypeMapper.java

@@ -0,0 +1,28 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.mouldtype;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.mouldtype.MouldTypeDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo.*;
+
+/**
+ * 模具类型 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface MouldTypeMapper extends BaseMapperX<MouldTypeDO> {
+
+    default PageResult<MouldTypeDO> selectPage(MouldTypePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MouldTypeDO>()
+                .likeIfPresent(MouldTypeDO::getName, reqVO.getName())
+                .eqIfPresent(MouldTypeDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(MouldTypeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(MouldTypeDO::getId));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/mouldtype/MouldTypeService.java

@@ -0,0 +1,55 @@
+package com.chanko.yunxi.mes.module.heli.service.mouldtype;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.mouldtype.MouldTypeDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 模具类型 Service 接口
+ *
+ * @author 管理员
+ */
+public interface MouldTypeService {
+
+    /**
+     * 创建模具类型
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createMouldType(@Valid MouldTypeSaveReqVO createReqVO);
+
+    /**
+     * 更新模具类型
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateMouldType(@Valid MouldTypeSaveReqVO updateReqVO);
+
+    /**
+     * 删除模具类型
+     *
+     * @param id 编号
+     */
+    void deleteMouldType(Long id);
+
+    /**
+     * 获得模具类型
+     *
+     * @param id 编号
+     * @return 模具类型
+     */
+    MouldTypeDO getMouldType(Long id);
+
+    /**
+     * 获得模具类型分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 模具类型分页
+     */
+    PageResult<MouldTypeDO> getMouldTypePage(MouldTypePageReqVO pageReqVO);
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/mouldtype/MouldTypeServiceImpl.java

@@ -0,0 +1,74 @@
+package com.chanko.yunxi.mes.module.heli.service.mouldtype;
+
+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 com.chanko.yunxi.mes.module.heli.controller.admin.mouldtype.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.mouldtype.MouldTypeDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.mouldtype.MouldTypeMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 模具类型 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class MouldTypeServiceImpl implements MouldTypeService {
+
+    @Resource
+    private MouldTypeMapper mouldTypeMapper;
+
+    @Override
+    public Long createMouldType(MouldTypeSaveReqVO createReqVO) {
+        // 插入
+        MouldTypeDO mouldType = BeanUtils.toBean(createReqVO, MouldTypeDO.class);
+        mouldTypeMapper.insert(mouldType);
+        // 返回
+        return mouldType.getId();
+    }
+
+    @Override
+    public void updateMouldType(MouldTypeSaveReqVO updateReqVO) {
+        // 校验存在
+        validateMouldTypeExists(updateReqVO.getId());
+        // 更新
+        MouldTypeDO updateObj = BeanUtils.toBean(updateReqVO, MouldTypeDO.class);
+        mouldTypeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteMouldType(Long id) {
+        // 校验存在
+        validateMouldTypeExists(id);
+        // 删除
+        mouldTypeMapper.deleteById(id);
+    }
+
+    private void validateMouldTypeExists(Long id) {
+        if (mouldTypeMapper.selectById(id) == null) {
+            throw exception(MOULD_TYPE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public MouldTypeDO getMouldType(Long id) {
+        return mouldTypeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<MouldTypeDO> getMouldTypePage(MouldTypePageReqVO pageReqVO) {
+        return mouldTypeMapper.selectPage(pageReqVO);
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/mouldtype/MouldTypeMapper.xml

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

mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts

@@ -0,0 +1,37 @@
+import request from '@/config/axios'
+
+export interface MouldTypeVO {
+  id: number
+  name: string
+  status: number
+}
+
+// 查询模具类型分页
+export const getMouldTypePage = async (params) => {
+  return await request.get({ url: `/heli/mould-type/page`, params })
+}
+
+// 查询模具类型详情
+export const getMouldType = async (id: number) => {
+  return await request.get({ url: `/heli/mould-type/get?id=` + id })
+}
+
+// 新增模具类型
+export const createMouldType = async (data: MouldTypeVO) => {
+  return await request.post({ url: `/heli/mould-type/create`, data })
+}
+
+// 修改模具类型
+export const updateMouldType = async (data: MouldTypeVO) => {
+  return await request.put({ url: `/heli/mould-type/update`, data })
+}
+
+// 删除模具类型
+export const deleteMouldType = async (id: number) => {
+  return await request.delete({ url: `/heli/mould-type/delete?id=` + id })
+}
+
+// 导出模具类型 Excel
+export const exportMouldType = async (params) => {
+  return await request.download({ url: `/heli/mould-type/export-excel`, params })
+}

mes-ui/mes-ui-admin-vue3/src/utils/dict.ts

@@ -206,5 +206,7 @@ export enum DICT_TYPE {
   CRM_PRODUCT_STATUS = 'crm_product_status',
   CRM_PERMISSION_LEVEL = 'crm_permission_level', // CRM 数据权限的级别
 
-  HELI_COMMON_STATUS = 'heli_common_status'
+  // ============== HELI ================
+  HELI_COMMON_STATUS = 'heli_common_status',
+  HELI_SYSTEM_COMMON_STATUS = 'heli_system_common_status'
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue

@@ -48,10 +48,10 @@
       <el-form-item label="邮箱" prop="email">
         <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
       </el-form-item>-->
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
-        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+        <el-select v-model="formData.status" clearable placeholder="请选择启用状态">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -101,7 +101,7 @@ const formRules = reactive<FormRules>({
   phone: [
     { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
   ],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构

mes-ui/mes-ui-admin-vue3/src/views/heli/dept/index.vue

@@ -16,15 +16,15 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
         <el-select
           v-model="queryParams.status"
-          placeholder="请选择部门状态"
+          placeholder="请选择部门启用状态"
           clearable
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -65,9 +65,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="sort" label="排序" />
-      <el-table-column prop="status" label="状态">
+      <el-table-column prop="status" label="启用状态">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.HELI_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column
@@ -126,7 +126,7 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const isExpandAll = ref(true) // 是否展开，默认全部展开
-const refreshTable = ref(true) // 重新渲染表格状态
+const refreshTable = ref(true) // 重新渲染表格启用状态
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 查询部门列表 */

mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/MouldTypeForm.vue

@@ -0,0 +1,104 @@
+<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="模具类型" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入模具类型" />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </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 { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as MouldTypeApi from '@/api/heli/mouldtype'
+
+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,
+  name: undefined,
+  status: undefined,
+})
+const formRules = reactive({
+  name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 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 MouldTypeApi.getMouldType(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+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 MouldTypeApi.MouldTypeVO
+    if (formType.value === 'create') {
+      await MouldTypeApi.createMouldType(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MouldTypeApi.updateMouldType(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    status: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue

@@ -0,0 +1,197 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="模具类型" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入模具类型"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择启用状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.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="['heli:mould-type:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+<!--        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:mould-type:export']"
+        >
+          <Icon icon="ep:download" 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">
+      <el-table-column label="序号" type="index" width="100" />
+      <el-table-column label="模具类型" align="center" prop="name" />
+      <el-table-column label="启用状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:mould-type:update']"
+          >
+            编辑
+          </el-button>
+<!--          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:mould-type: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MouldTypeForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as MouldTypeApi from '@/api/heli/mouldtype'
+import MouldTypeForm from './MouldTypeForm.vue'
+
+defineOptions({ name: 'MouldType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  status: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MouldTypeApi.getMouldTypePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } 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 MouldTypeApi.deleteMouldType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MouldTypeApi.exportMouldType(queryParams)
+    download.excel(data, '模具类型.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/post/PostForm.vue

@@ -16,10 +16,10 @@
       <el-form-item label="岗位顺序" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入岗位顺序" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
-        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+        <el-select v-model="formData.status" clearable placeholder="请选择启用状态">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -61,7 +61,7 @@ const formData = ref({
 const formRules = reactive({
   name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '岗位启用状态不能为空', trigger: 'change' }],
   remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref

mes-ui/mes-ui-admin-vue3/src/views/heli/post/index.vue

@@ -24,10 +24,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable>
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -66,9 +66,9 @@
       <el-table-column label="岗位编码" align="center" prop="code" />
       <el-table-column label="岗位顺序" align="center" prop="sort" />
       <el-table-column label="岗位备注" align="center" prop="remark" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="启用状态" align="center" prop="status">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.HELI_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column

mes-ui/mes-ui-admin-vue3/src/views/heli/role/RoleForm.vue

@@ -16,10 +16,10 @@
       <el-form-item label="显示顺序" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
-        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+        <el-select v-model="formData.status" clearable placeholder="请选择启用状态">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -62,7 +62,7 @@ const formRules = reactive({
   name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
   sort: [{ required: true, message: '岗位顺序不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '岗位启用状态不能为空', trigger: 'change' }],
   remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref

mes-ui/mes-ui-admin-vue3/src/views/heli/role/index.vue

@@ -26,27 +26,16 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="启用状态" prop="status">
-        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择启用状态">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_SYSTEM_COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -88,9 +77,9 @@
       <el-table-column align="center" label="角色标识" prop="code" />
       <el-table-column align="center" label="显示顺序" prop="sort" />
       <el-table-column align="center" label="备注" prop="remark" />
-      <el-table-column align="center" label="状态" prop="status">
+      <el-table-column align="center" label="启用状态" prop="status">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.HELI_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column