diff --git a/src/api/mes/dvrepair/index.ts b/src/api/mes/dvrepair/index.ts
index edbe9d93..d5b9e2f3 100644
--- a/src/api/mes/dvrepair/index.ts
+++ b/src/api/mes/dvrepair/index.ts
@@ -53,6 +53,10 @@ export const DvRepairApi = {
return await request.download({ url: `/mes/dv-repair/export-excel`, params })
},
+ updateDvRepairStatus: async (data: any) => {
+ return await request.put({ url: `/mes/dv-repair/updateDvRepairStatus`, data })
+ },
+
// ==================== 子表（设备维修记录行） ====================
// 获得设备维修记录行列表
diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue
index 79e0301f..2401e22d 100644
--- a/src/views/mes/dvrepair/DvRepairForm.vue
+++ b/src/views/mes/dvrepair/DvRepairForm.vue
@@ -102,7 +102,7 @@ v-model="formData.confirmBy" filterable clearable placeholder="请选择验收
-
+
@@ -406,24 +406,41 @@ const submitForm = async () => {
formLoading.value = true
try {
const data = { ...(formData.value as any) } as DvRepairVO & { deviceId?: number; componentId?: number }
- ; (data as any).acceptedBy = normalizeUserId((data as any).acceptedBy)
- ; (data as any).confirmBy = normalizeUserId((data as any).confirmBy)
+ ;(data as any).acceptedBy = normalizeUserId((data as any).acceptedBy)
+ ;(data as any).confirmBy = normalizeUserId((data as any).confirmBy)
if (formType.value === 'repair') {
;(data as any).status = 1
}
if (typeof formData.value.deviceId === 'number') {
data.machineryId = formData.value.deviceId as any
}
- ; (data as any).deviceId = formData.value.deviceId
- ; (data as any).componentId = formData.value.machineryTypeId === 2 ? formData.value.componentId : undefined
- // 拼接子表的数据
- data.dvRepairLines = dvRepairLineFormRef.value.getData()
- if (formType.value === 'create') {
- await DvRepairApi.createDvRepair(data)
- message.success(t('common.createSuccess'))
- } else {
- await DvRepairApi.updateDvRepair(data)
+ ;(data as any).deviceId = formData.value.deviceId
+ ;(data as any).componentId = formData.value.machineryTypeId === 2 ? formData.value.componentId : undefined
+ const lineList = dvRepairLineFormRef.value.getData() || []
+ if (formType.value === 'repair') {
+ const requireDate = data.requireDate
+ const finishDate = data.finishDate
+ const confirmDate = data.confirmDate
+ const repairResult = data.repairResult
+ const updateReqVOList = lineList
+ await DvRepairApi.updateDvRepairStatus({
+ id: data.id,
+ requireDate,
+ finishDate,
+ confirmDate,
+ repairResult,
+ updateReqVOList,
+ })
message.success(t('common.updateSuccess'))
+ } else {
+ ;(data as any).dvRepairLines = lineList
+ if (formType.value === 'create') {
+ await DvRepairApi.createDvRepair(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await DvRepairApi.updateDvRepair(data)
+ message.success(t('common.updateSuccess'))
+ }
}
dialogVisible.value = false
// 发送操作成功的事件
diff --git a/src/views/mes/dvrepair/components/DvRepairLineForm.vue b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
index fe4a4adf..faed1640 100644
--- a/src/views/mes/dvrepair/components/DvRepairLineForm.vue
+++ b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
@@ -44,6 +44,21 @@
+
+
+
+
+
+
+
+
+
+
+ 通过
+ 不通过
+
+
+
{
return 'info'
}
+const getResultLabel = (value: any) => {
+ const v = value === '' || value === null || value === undefined ? undefined : String(value)
+ if (v == '0') return '待维修'
+ if (v == '1') return '通过'
+ if (v == '2') return '不通过'
+ return '-'
+}
+
+const getResultTagType = (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'
+}
+
const tableRef = ref()
const selectedIds = ref([])
const handleSelectionChange = (rows: any[]) => {