yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 更新工具编码及可用数量字段，添加校验逻辑 

将工具编码字段设置为必填，并添加相应的校验逻辑。更新可用数量字段名称为更具描述性的名称，确保代码一致性和可读性。同时，调整相关逻辑以支持新的字段名称。
pull/871/MERGE
YunaiV 2026-03-29 10:04:59 +08:00
parent d264c06830
commit efd463893e
4 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/mes/tm/tool/index.ts
View File

@ -10,7 +10,7 @@ export interface TmToolVO {
toolTypeId: number // 工具类型编号
toolTypeName: string // 工具类型名称
quantity: number // 数量
quantityAvailable: number // 可用数量
availableQuantity: number // 可用数量
maintenType: number // 保养维护类型
nextMaintenPeriod: number // 下次保养周期（次数）
nextMaintenDate: Date // 下次保养日期

57
src/views/mes/tm/tool/ToolForm.vue
View File

@ -7,12 +7,13 @@
:rules="formRules"
label-width="120px"
v-loading="formLoading"
:disabled="isDetail"
>
<el-row>
<el-col :span="12">
<el-form-item label="工具编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入工具编码">
<template #append>
<el-input v-model="formData.code" placeholder="请输入工具编码" :disabled="formType !== 'create'">
<template v-if="formType === 'create'" #append>
<el-button @click="generateCode">
生成
</el-button>
@ -55,17 +56,18 @@
:min="1"
:disabled="selectedToolType?.codeFlag === true"
class="!w-1/1"
@change="handleQuantityChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="可用数量" prop="quantityAvailable">
<el-input-number v-model="formData.quantityAvailable" :min="0" class="!w-1/1" />
<el-form-item label="可用数量" prop="availableQuantity">
<el-input-number v-model="formData.availableQuantity" :min="0" disabled class="!w-1/1" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择状态" class="!w-1/1">
<el-select v-model="formData.status" placeholder="请选择状态" disabled class="!w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_TM_TOOL_STATUS)"
:key="dict.value"
@ -124,9 +126,9 @@
</el-col>
</el-row>
</el-form>
<!-- TODO @芋艿：这里要有个 barcodeimg，后续在搞 -->
<!-- TODO @AI：条码相关，先忽略，后续加 -->
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
@ -135,9 +137,9 @@
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { TmToolApi, TmToolVO } from '@/api/mes/tm/tool'
import { TmToolTypeVO } from '@/api/mes/tm/tool/type'
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
import TmToolTypeSelect from '@/views/mes/tm/tool/components/TmToolTypeSelect.vue'
import { MesToolStatusEnum, MesMaintenTypeEnum } from '@/views/mes/utils/constants'
import { generateRandomStr } from '@/utils'
import { MesToolStatusEnum, MesMaintenTypeEnum, MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
defineOptions({ name: 'ToolForm' })
@ -145,9 +147,17 @@ const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const dialogTitle = computed(() => {
const titles: Record<string, string> = {
create: '新增工具',
update: '修改工具',
detail: '查看工具'
}
return titles[formType.value] || formType.value
})
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
const isDetail = computed(() => formType.value === 'detail') // 是否详情模式（只读）
const formData = ref({
id: undefined,
code: undefined,
@ -156,7 +166,7 @@ const formData = ref({
spec: undefined,
toolTypeId: undefined,
quantity: 1,
quantityAvailable: 1,
availableQuantity: 1,
maintenType: undefined,
nextMaintenPeriod: undefined,
nextMaintenDate: undefined,
@ -164,10 +174,10 @@ const formData = ref({
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '工具编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '工具名称不能为空', trigger: 'blur' }],
toolTypeId: [{ required: true, message: '工具类型不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const selectedToolType = ref<TmToolTypeVO>() // 当前选中的工具类型
@ -175,10 +185,9 @@ const selectedToolType = ref<TmToolTypeVO>() // 当前选中的工具类型
/** 打开弹窗 */
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 {
@ -191,9 +200,15 @@ const open = async (type: string, id?: number) => {
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 生成工具编码 */
const generateCode = () => {
// TODO @芋艿：后续对接后端编码生成接口
formData.value.code = 'TL' + generateRandomStr(12)
const generateCode = async () => {
formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.TM_TOOL_CODE)
}
/** 库存数量变更：新增时联动同步可用数量 */
const handleQuantityChange = (val: number) => {
if (formType.value === 'create') {
formData.value.availableQuantity = val
}
}
/** 工具类型变更 */
@ -202,7 +217,7 @@ const handleToolTypeChange = (item: TmToolTypeVO | undefined) => {
// 如果是编码管理，数量锁定为 1
if (item?.codeFlag === true) {
formData.value.quantity = 1
formData.value.quantityAvailable = 1
formData.value.availableQuantity = 1
}
}
@ -240,7 +255,7 @@ const resetForm = () => {
spec: undefined,
toolTypeId: undefined,
quantity: 1,
quantityAvailable: 1,
availableQuantity: 1,
maintenType: undefined,
nextMaintenPeriod: undefined,
nextMaintenDate: undefined,

17
src/views/mes/tm/tool/index.vue
View File

@ -85,19 +85,25 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="工具编码" align="center" prop="code" width="120" />
<el-table-column label="工具编码" align="center" prop="code" width="120">
<template #default="scope">
<el-link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-link>
</template>
</el-table-column>
<el-table-column label="工具名称" align="center" prop="name" min-width="150" />
<el-table-column label="品牌" align="center" prop="brand" width="100" />
<el-table-column label="型号规格" align="center" prop="spec" width="120" />
<el-table-column label="工具类型" align="center" prop="toolTypeName" width="120" />
<el-table-column label="库存数量" align="center" prop="quantity" width="100" />
<el-table-column label="可用数量" align="center" prop="quantityAvailable" width="100" />
<el-table-column label="保养维护类型" align="center" prop="maintenType" width="120">
<el-table-column label="可用数量" align="center" prop="availableQuantity" width="100" />
<el-table-column label="保养维护类型" align="center" prop="maintenType" width="130">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_TM_MAINTEN_TYPE" :value="scope.row.maintenType" />
</template>
</el-table-column>
<el-table-column label="下次保养" align="center" width="150">
<el-table-column label="下次保养" align="center" width="200">
<template #default="scope">
<span v-if="scope.row.maintenType === MesMaintenTypeEnum.REGULAR">
{{ scope.row.nextMaintenDate ? formatDate(scope.row.nextMaintenDate) : '-' }}
@ -108,7 +114,7 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="80">
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_TM_TOOL_STATUS" :value="scope.row.status" />
</template>
@ -183,6 +189,7 @@ const queryParams = reactive({
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true

1
src/views/mes/utils/constants.ts
View File

@ -417,6 +417,7 @@ export const MesAutoCodeRuleCode = {
MD_VENDOR_CODE: 'MD_VENDOR_CODE', // 供应商编码
MD_CLIENT_CODE: 'MD_CLIENT_CODE', // 客户编码
MD_WORKSTATION_CODE: 'MD_WORKSTATION_CODE', // 工作站编码
TM_TOOL_CODE: 'TM_TOOL_CODE', // 工具编码
TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE', // 工具类型编码
WM_SN_CODE: 'WM_SN_CODE', // SN 码
WM_PACKAGE_CODE: 'WM_PACKAGE_CODE', // 装箱单编码