From 5501c7983e1265435d958a88e0b06f078e9f1636 Mon Sep 17 00:00:00 2001 From: hwj Date: Fri, 5 Jun 2026 10:37:56 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=BB=84-?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mold/moldrepair/index.ts | 4 + src/locales/en.ts | 16 +++- src/views/erp/mold/detail/brand.vue | 115 ++++++++++++++++++---------- 3 files changed, 91 insertions(+), 44 deletions(-) diff --git a/src/api/mold/moldrepair/index.ts b/src/api/mold/moldrepair/index.ts index 9f6f6ec7..c23584fe 100644 --- a/src/api/mold/moldrepair/index.ts +++ b/src/api/mold/moldrepair/index.ts @@ -62,6 +62,10 @@ export const MoldRepairApi = { return await request.get({ url: `/mes/mold-repair/getRepairListByMoldId`, params }) }, + getMoldRepairList: async (params: any) => { + return await request.get({ url: `/mes/mold-repair/list`, params }) + }, + exportRepairExcel: async (params: { moldId: number; startTime?: string; endTime?: string }) => { return await request.download({ url: `/mes/mold-repair/export-repair-excel`, params }) } diff --git a/src/locales/en.ts b/src/locales/en.ts index 6a48b50c..5f530f97 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2573,6 +2573,20 @@ export default { repairResult: 'Repair Result', finishDate: 'Finish Date', totalItems: '{count} items in total', + repairCode: 'Repair Code', + repairName: 'Repair Order', + moldCode: 'Mold Code', + repairStatus: 'Status', + repairStatusPending: 'Pending', + repairStatusDone: 'Completed', + repairResultPending: 'Pending Repair', + repairResultOk: 'Pass', + repairResultNg: 'Fail', + placeholderRepairCode: 'Please enter repair code', + selectRepairStatus: 'Please select status', + requireDate: 'Require Date', + finishDate: 'Finish Date', + acceptUser: 'Repair User', maintainMethod: 'Maintenance Method', maintainTime: 'Maintenance Time', mold: 'Mold', @@ -5059,6 +5073,4 @@ export default { empty: 'Please configure energy types first', exportSuccess: 'Export started' } -} - } } diff --git a/src/views/erp/mold/detail/brand.vue b/src/views/erp/mold/detail/brand.vue index 812d57a3..913ba66a 100644 --- a/src/views/erp/mold/detail/brand.vue +++ b/src/views/erp/mold/detail/brand.vue @@ -119,6 +119,17 @@
+ + + + + + + + + {{ t('MoldManagement.MoldBrandDetail.export') }} - + - +
-
-
- {{ row.subjectCode ?? '-' }} - {{ row.subjectName ?? '-' }} -
+
{{ t('MoldManagement.MoldBrandDetail.projectContent') }}{{ row.subjectContent ?? '-' }}
+ class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.moldCode') }}{{ row.moldCode ?? '-' }}
{{ t('MoldManagement.MoldBrandDetail.repairResult') }}{{ t('MoldManagement.MoldBrandDetail.repairStatus') }}{{ - getResultLabel(row.repairResult ?? - row.result) }}
+ :type="getRepairStatusTagType(row.status)">{{ + getRepairStatusLabel(row.status) }}
{{ t('MoldManagement.MoldBrandDetail.finishDate') }}{{ - String(formatHistoryTime(row.finishDate)).split(' ')[0] - }}
+ class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.repairStatus') }}{{ + getRepairResultLabel(row.repairStatus) }}
+
{{ t('MoldManagement.MoldBrandDetail.requireDate') }}{{ formatHistoryTime(row.requireDate) }}
{{ t('MoldManagement.MoldBrandDetail.remark') }}{{ - row.remark ?? '-' }}
+ class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.finishDate') }}{{ formatHistoryTime(row.finishDate) }}
@@ -232,7 +238,7 @@
@@ -263,10 +269,10 @@ - - + + >(new Set(['molds'])) const inspectionHistory = ref([]) const maintainHistory = ref([]) const repairList = ref([]) +const repairQueryCode = ref() +const repairQueryStatus = ref() const installRecords = ref([]) const installTotal = ref(0) const installPageNo = ref(1) @@ -316,6 +324,7 @@ const installMoldId = ref() const installRemark = ref() const installDateRange = ref() const installOperateType = ref() +const moldList = ref([]) const repairActiveNames = ref([]) const inspectionDateRange = ref() const maintainDateRange = ref() @@ -384,6 +393,36 @@ const getResultTagType = (value: any) => { return 'info' } +const getRepairStatusLabel = (value: any) => { + const v = value === '' || value === null || value === undefined ? undefined : String(value) + if (v === '0') return t('MoldManagement.MoldBrandDetail.repairStatusPending') + if (v === '1') return t('MoldManagement.MoldBrandDetail.repairStatusDone') + return '-' +} + +const getRepairStatusTagType = (value: any) => { + const v = value === '' || value === null || value === undefined ? undefined : String(value) + if (v === '1') return 'success' + if (v === '0') return 'warning' + return 'info' +} + +const getRepairResultLabel = (value: any) => { + const v = value === '' || value === null || value === undefined ? undefined : String(value) + if (v === '0') return t('MoldManagement.MoldBrandDetail.repairResultPending') + if (v === '1') return t('MoldManagement.MoldBrandDetail.repairResultOk') + if (v === '2') return t('MoldManagement.MoldBrandDetail.repairResultNg') + return '-' +} + +const getRepairResultTagType = (value: any) => { + const v = value === '' || value === null || value === undefined ? undefined : String(value) + if (v === '1') return 'success' + if (v === '2') return 'danger' + if (v === '0') return 'info' + return 'info' +} + type HistoryStepItem = { key: string name: string @@ -449,18 +488,6 @@ const maintainStepGroups = computed(() => }) ) -const repairGroups = computed(() => { - const groupsMap = new Map() - for (const row of repairList.value ?? []) { - const key = String(row.repairCode ?? row.repairId ?? row.subjectName ?? '-') - if (!groupsMap.has(key)) { - groupsMap.set(key, { key, name: String(row.repairName ?? row.repairCode ?? key), items: [] }) - } - groupsMap.get(key)!.items.push(row) - } - return Array.from(groupsMap.values()) -}) - const getQrcodeRefreshUrl = () => { if (!detailData.value?.id || !detailData.value?.code) return '' return `/erp/mold-brand/regenerate-code?id=${detailData.value.id}&code=${encodeURIComponent(String(detailData.value.code))}` @@ -561,13 +588,14 @@ const fetchRepairHistory = async () => { repairLoading.value = true try { const params: any = { moldId: brandId.value } + if (repairQueryCode.value) params.repairCode = repairQueryCode.value + if (repairQueryStatus.value) params.status = repairQueryStatus.value if (repairDateRange.value && repairDateRange.value.length === 2) { - params.startTime = repairDateRange.value[0] - params.endTime = repairDateRange.value[1] + params.requireDate = [repairDateRange.value[0], repairDateRange.value[1]] } - const data = await MoldRepairApi.getRepairListByMoldId(params) + const data = await MoldRepairApi.getMoldRepairList(params) repairList.value = Array.isArray(data) ? data : [] - repairActiveNames.value = repairGroups.value.map((item) => item.key) + repairActiveNames.value = repairList.value.map((row: any) => String(row.id ?? row.repairCode)) } finally { repairLoading.value = false } @@ -577,6 +605,7 @@ const fetchInstallRecords = async () => { if (!brandId.value) return installLoading.value = true try { + moldList.value = await MoldBrandApi.getBrandList() const params: any = { pageNo: installPageNo.value, pageSize: installPageSize.value, brandId: brandId.value } if (installMoldId.value) params.moldId = installMoldId.value if (installRemark.value) params.remark = installRemark.value @@ -641,6 +670,8 @@ const handleQueryRepair = async () => { } const handleResetRepair = async () => { + repairQueryCode.value = undefined + repairQueryStatus.value = undefined repairDateRange.value = undefined await fetchRepairHistory() }