diff --git a/src/api/mes/tm/tool/index.ts b/src/api/mes/tm/tool/index.ts
index 227b00b99..48a775d86 100644
--- a/src/api/mes/tm/tool/index.ts
+++ b/src/api/mes/tm/tool/index.ts
@@ -10,7 +10,7 @@ export interface TmToolVO {
toolTypeId: number // 工具类型编号
toolTypeName: string // 工具类型名称
quantity: number // 数量
- quantityAvailable: number // 可用数量
+ availableQuantity: number // 可用数量
maintenType: number // 保养维护类型
nextMaintenPeriod: number // 下次保养周期（次数）
nextMaintenDate: Date // 下次保养日期
diff --git a/src/views/mes/tm/tool/ToolForm.vue b/src/views/mes/tm/tool/ToolForm.vue
index e4def0b32..f8b56b5b8 100644
--- a/src/views/mes/tm/tool/ToolForm.vue
+++ b/src/views/mes/tm/tool/ToolForm.vue
@@ -7,12 +7,13 @@
:rules="formRules"
label-width="120px"
v-loading="formLoading"
+ :disabled="isDetail"
>
-
-
+
+
生成
@@ -55,17 +56,18 @@
:min="1"
:disabled="selectedToolType?.codeFlag === true"
class="!w-1/1"
+ @change="handleQuantityChange"
/>
-
-
+
+
-
+
-
+
- 确 定
+ 确 定
取 消
@@ -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 = {
+ 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() // 当前选中的工具类型
@@ -175,10 +185,9 @@ const selectedToolType = 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 {
@@ -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,
diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue
index be77b9312..d32f23289 100644
--- a/src/views/mes/tm/tool/index.vue
+++ b/src/views/mes/tm/tool/index.vue
@@ -85,19 +85,25 @@
-
+
+
+
+ {{ scope.row.code }}
+
+
+
-
-
+
+
-
+
{{ scope.row.nextMaintenDate ? formatDate(scope.row.nextMaintenDate) : '-' }}
@@ -108,7 +114,7 @@
-
-
+
@@ -183,6 +189,7 @@ const queryParams = reactive({
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
+
/** 查询列表 */
const getList = async () => {
loading.value = true
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index cdc4ff988..37f65c107 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -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', // 装箱单编码