From a0c5768efa34bc3510c793df52992ca4145077e3 Mon Sep 17 00:00:00 2001 From: hwj Date: Tue, 14 Apr 2026 18:24:52 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8E=92=E4=BA=A7-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8F=8A=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/plan/PlanForm.vue | 50 +++++++++++-------- src/views/mes/plan/components/PlanDetail.vue | 38 ++++++++++---- .../tasksummary/components/TaskDetailList.vue | 3 +- src/views/mes/tasksummary/index.vue | 2 +- 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue index 4152741a..91182959 100644 --- a/src/views/mes/plan/PlanForm.vue +++ b/src/views/mes/plan/PlanForm.vue @@ -88,7 +88,7 @@ - + { - if (!formData.value.finishDate) return '' - const value = dayjs(formData.value.finishDate) - if (!value.isValid()) return String(formData.value.finishDate) + const sourceValue = formData.value.finishDate || formData.value.deliveryDate + if (!sourceValue) return '' + const value = dayjs(sourceValue) + if (!value.isValid()) return String(sourceValue) return value.format('YYYY-MM-DD') }) const deviceDisplayText = computed(() => { @@ -234,7 +236,7 @@ const deviceDisplayText = computed(() => { .map((item: any) => item.deviceName || item.name || item.code || `ID:${item.id}`) .join('、') } - if (formData.value.feedingPipelineName) return String(formData.value.feedingPipelineName) + if (formData.value.deviceName) return String(formData.value.deviceName) return '' }) const deviceColumns = [ @@ -317,7 +319,7 @@ const formRules = reactive({ { required: true, message: t('ProductionPlan.Plan.validatorPlanEndRequired'), trigger: 'blur' }, { validator: validatePlanEndTime, trigger: 'change' } ], - feedingPipeline: [{ required: true, message: '请选择设备', trigger: 'change' }], + deviceId: [{ required: true, message: '请选择设备', trigger: 'change' }], isPreProduction: [{ required: true, message: t('ProductionPlan.Plan.validatorPreProductionRequired'), trigger: 'blur' }], latestStartTime: [ { required: true, message: '请选择最晚开工时间', trigger: 'blur' }, @@ -338,11 +340,11 @@ const fetchDeviceLedgerPage = (params: Record) => { const openDeviceSelectDialog = () => { const rows = selectedDeviceRows.value.length ? selectedDeviceRows.value.map((item: any) => ({ ...item, id: Number(item.id) })) - : formData.value.feedingPipeline + : formData.value.deviceId ? [ { - id: Number(formData.value.feedingPipeline), - deviceName: formData.value.feedingPipelineName + id: Number(formData.value.deviceId), + deviceName: formData.value.deviceName } ] : [] @@ -354,8 +356,8 @@ const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: an if (!row) return const deviceId = Number(row.id) if (!Number.isFinite(deviceId)) return - formData.value.feedingPipeline = deviceId - formData.value.feedingPipelineName = row.deviceName || row.name || row.code || `设备ID:${deviceId}` + formData.value.deviceId = deviceId + formData.value.deviceName = row.deviceName || row.name || row.code || `设备ID:${deviceId}` selectedDeviceRows.value = [row] } @@ -366,11 +368,13 @@ const syncFinishDateByTaskDetail = () => { /** 打开弹窗 */ const open = async (type: string, id?: number, - taskId?: number, productId?: number, number?: number, taskDetailId?:string) => { + taskId?: number, productId?: number, number?: number, taskDetailId?:string, + taskDeliveryDate?: string | number) => { dialogVisible.value = true dialogTitle.value = t('action.' + type) formType.value = type resetForm() + formData.value.deliveryDate = taskDeliveryDate || undefined if(taskId) { formData.value.taskId = taskId taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId) @@ -378,7 +382,8 @@ const open = async (type: string, id?: number, const taskDetails = taskDetailList.value.filter(item => item.id === taskDetailId) if(taskDetails && taskDetails.length > 0 && taskDetails[0].id) { formData.value.taskDetailId = taskDetails[0].id - formData.value.finishDate = (taskDetails[0] as any).finishDate || (taskDetails[0] as any).deliveryDate || undefined + formData.value.finishDate = (taskDetails[0] as any).finishDate || undefined + formData.value.deliveryDate = (taskDetails[0] as any).deliveryDate || taskDeliveryDate || undefined } } } @@ -393,11 +398,11 @@ const open = async (type: string, id?: number, formLoading.value = true try { formData.value = await PlanApi.getPlan(id) - if (formData.value.feedingPipeline) { + if (formData.value.deviceId) { selectedDeviceRows.value = [ { - id: Number(formData.value.feedingPipeline), - deviceName: formData.value.feedingPipelineName + id: Number(formData.value.deviceId), + deviceName: formData.value.deviceName } as DeviceLedgerVO ] } @@ -452,12 +457,13 @@ const resetForm = () => { remark: undefined, groupType: undefined, isEnable: undefined, - feedingPipeline: undefined, - feedingPipelineName: undefined, + deviceId: undefined, + deviceName: undefined, isPreProduction: 0, isCode: true, latestStartTime: undefined, - finishDate: undefined + finishDate: undefined, + deliveryDate: undefined } selectedDeviceRows.value = [] formRef.value?.resetFields() diff --git a/src/views/mes/plan/components/PlanDetail.vue b/src/views/mes/plan/components/PlanDetail.vue index ea713f8f..a54004ce 100644 --- a/src/views/mes/plan/components/PlanDetail.vue +++ b/src/views/mes/plan/components/PlanDetail.vue @@ -7,11 +7,24 @@ label-width="100px" v-loading="formLoading" > - - + + - + + +