From acf673d2d2cf35cee660d00e6cc7b92b18a952bd Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 2 Apr 2026 23:50:24 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E7=82=B9=E6=A3=80=E3=80=81?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=92=8C=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/cal/holiday/HolidayForm.vue | 6 +- src/views/mes/cal/plan/CalPlanForm.vue | 6 +- src/views/mes/cal/plan/index.vue | 4 +- .../dv/machinery/MachineryCheckRecordList.vue | 77 +++++++++++++++ src/views/mes/dv/machinery/MachineryForm.vue | 78 +++++++-------- .../machinery/MachineryMaintenRecordList.vue | 77 +++++++++++++++ .../mes/dv/machinery/MachineryRepairList.vue | 94 +++++++++++++++++++ src/views/mes/dv/machinery/index.vue | 10 +- .../type/components/DvMachineryTypeSelect.vue | 67 +++++++++++++ 9 files changed, 364 insertions(+), 55 deletions(-) create mode 100644 src/views/mes/dv/machinery/MachineryCheckRecordList.vue create mode 100644 src/views/mes/dv/machinery/MachineryMaintenRecordList.vue create mode 100644 src/views/mes/dv/machinery/MachineryRepairList.vue create mode 100644 src/views/mes/dv/machinery/type/components/DvMachineryTypeSelect.vue diff --git a/src/views/mes/cal/holiday/HolidayForm.vue b/src/views/mes/cal/holiday/HolidayForm.vue index 7edfeea9c..9d8dcfbfc 100644 --- a/src/views/mes/cal/holiday/HolidayForm.vue +++ b/src/views/mes/cal/holiday/HolidayForm.vue @@ -39,6 +39,7 @@ import { formatDate } from '@/utils/formatTime' import { HolidayType } from '@/views/mes/utils/constants' defineOptions({ name: 'HolidayForm' }) +const emit = defineEmits(['success']) const message = useMessage() @@ -73,10 +74,7 @@ const open = async (day: string) => { formLoading.value = false } } -defineExpose({ open }) - /** 提交表单 */ -const emit = defineEmits(['success']) const submitForm = async () => { // 校验表单 if (!formRef) return @@ -105,4 +103,6 @@ const resetForm = () => { dayDisplay.value = '' formRef.value?.resetFields() } + +defineExpose({ open }) diff --git a/src/views/mes/cal/plan/CalPlanForm.vue b/src/views/mes/cal/plan/CalPlanForm.vue index 564385eff..6d9b3c8cc 100644 --- a/src/views/mes/cal/plan/CalPlanForm.vue +++ b/src/views/mes/cal/plan/CalPlanForm.vue @@ -151,6 +151,7 @@ import CalShiftList from './CalShiftList.vue' import CalPlanTeamList from './CalPlanTeamList.vue' defineOptions({ name: 'CalPlanForm' }) +const emit = defineEmits(['success']) const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -211,10 +212,7 @@ const open = async (type: string, id?: number) => { } } } -defineExpose({ open }) - /** 提交表单 */ -const emit = defineEmits(['success']) const submitForm = async () => { await formRef.value.validate() formLoading.value = true @@ -271,4 +269,6 @@ const resetForm = () => { } formRef.value?.resetFields() } + +defineExpose({ open }) diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue index b4e339c65..bcf91afe9 100644 --- a/src/views/mes/cal/plan/index.vue +++ b/src/views/mes/cal/plan/index.vue @@ -201,6 +201,7 @@ const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 const total = ref(0) // 列表的总页数 +const exportLoading = ref(false) // 导出的加载中 const queryParams = reactive({ pageNo: 1, pageSize: 10, @@ -212,7 +213,7 @@ const queryParams = reactive({ status: undefined }) const queryFormRef = ref() // 搜索的表单 -const exportLoading = ref(false) // 导出的加载中 +const formRef = ref() // 表单弹窗 /** 查询列表 */ const getList = async () => { @@ -239,7 +240,6 @@ const resetQuery = () => { } /** 添加/修改操作 */ -const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } diff --git a/src/views/mes/dv/machinery/MachineryCheckRecordList.vue b/src/views/mes/dv/machinery/MachineryCheckRecordList.vue new file mode 100644 index 000000000..a6e4bad1a --- /dev/null +++ b/src/views/mes/dv/machinery/MachineryCheckRecordList.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/mes/dv/machinery/MachineryForm.vue b/src/views/mes/dv/machinery/MachineryForm.vue index 6d81d4c2d..53695da72 100644 --- a/src/views/mes/dv/machinery/MachineryForm.vue +++ b/src/views/mes/dv/machinery/MachineryForm.vue @@ -7,17 +7,14 @@ :rules="formRules" label-width="120px" v-loading="formLoading" + :disabled="isDetail" > - + @@ -37,17 +34,8 @@ - - + @@ -74,25 +62,22 @@ - - + - + - - - - - + + + + - - - + + - - - + + @@ -133,10 +117,11 @@ diff --git a/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue b/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue new file mode 100644 index 000000000..866110f5d --- /dev/null +++ b/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/mes/dv/machinery/MachineryRepairList.vue b/src/views/mes/dv/machinery/MachineryRepairList.vue new file mode 100644 index 000000000..b11c86cc8 --- /dev/null +++ b/src/views/mes/dv/machinery/MachineryRepairList.vue @@ -0,0 +1,94 @@ + + + + diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue index 0bb792d7b..f2c779997 100644 --- a/src/views/mes/dv/machinery/index.vue +++ b/src/views/mes/dv/machinery/index.vue @@ -80,7 +80,6 @@ > 新增 - - - + + + diff --git a/src/views/mes/dv/machinery/type/components/DvMachineryTypeSelect.vue b/src/views/mes/dv/machinery/type/components/DvMachineryTypeSelect.vue new file mode 100644 index 000000000..fbf2113a9 --- /dev/null +++ b/src/views/mes/dv/machinery/type/components/DvMachineryTypeSelect.vue @@ -0,0 +1,67 @@ + + + +