From 6aa15b1829797d04e5f8aca84b0268c8da68983c Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Wed, 3 Jul 2024 11:57:13 +0800 Subject: [PATCH] fix work report --- src/api/mes/producereport/index.ts | 2 +- src/api/mes/workreportplan/index.ts | 37 ++++++++++++++++++- src/utils/dict.ts | 1 + .../producereport/ProduceReportDetailForm.vue | 4 +- .../ProduceReportDetailIndex.vue | 5 +++ .../mes/tasksummary/components/PlanForm.vue | 18 ++------- src/views/mes/workreportplan/index.vue | 33 +++++++++++++---- 7 files changed, 74 insertions(+), 26 deletions(-) diff --git a/src/api/mes/producereport/index.ts b/src/api/mes/producereport/index.ts index 4d5a9b7b..e2baea22 100644 --- a/src/api/mes/producereport/index.ts +++ b/src/api/mes/producereport/index.ts @@ -91,7 +91,7 @@ export interface ProduceReportDetailVO { wasteNumber: number // 废品数量 totalNumber: number // 总数量 reportDate: Date // 报工日期 - reportTime: string // 计件时间 + reportTime: number // 计件时间 reportStatus: number // 报工状态 groupType: number //班别 reportType: string diff --git a/src/api/mes/workreportplan/index.ts b/src/api/mes/workreportplan/index.ts index 4597d982..de87ba1e 100644 --- a/src/api/mes/workreportplan/index.ts +++ b/src/api/mes/workreportplan/index.ts @@ -11,7 +11,35 @@ export interface WorkReportPlanVO { reportTimePlan: string // 计件时间 totalTimePlan: number // 总时长 } +export interface ReportPlanViewVO { + id: number // id + reportId: number // 报工单id + planId: number // 计划id + productId: number // 产品ID + qualityNumberPlan: number // 成品数量 + wasteNumberPlan: number // 废品数量 + reportTimePlan: string // 计件时间 + totalTimePlan: number // 总时长 + userId: number // 用户ID + orgId: number // 组织ID + qualityRate: number // 成品率 + wasteReason: string // 备注 + totalTime: number // 总时长 + packageNumber: number // 打包数量 + remark: string // 备注 + isEnable: boolean // 是否启用 + qualityNumber: number // 成品数量 + wasteNumber: number // 废品数量 + totalNumber: number // 总数量 + reportDate: Date // 报工日期 + reportTime: string // 计件时间 + reportStatus: number // 报工状态 + groupType: number //班别 + reportType: string + orgType: string + reportDateString: string +} // 报工分配计划 API export const WorkReportPlanApi = { // 查询报工分配计划分页 @@ -42,5 +70,10 @@ export const WorkReportPlanApi = { // 导出报工分配计划 Excel exportWorkReportPlan: async (params) => { return await request.download({ url: `/mes/work-report-plan/export-excel`, params }) - } -} \ No newline at end of file + }, + // 查询报工分配计划视图分页 + getReportPlanViewPage: async (params: any) => { + return await request.get({ url: `/mes/work-report-plan/pageView`, params }) + }, + +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 763ca98f..d1f8a91f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -246,6 +246,7 @@ export enum DICT_TYPE { MES_FEEDING_PIPELINE = "mes_feeding_pipeline", MES_STOCK_WORKSHOP_DETAIL_TYPE = "mes_stock_workshop_detail_type", MES_STOCK_OUT_TYPE = "mes_stock_out_type", + MES_PRODUCE_REPORT_TYPE = "mes_product_report_type", //====iot IOT_SIEMENS_TYPE = "iot_siemens_type", IOT_MODBUS_TYPE = "iot_modbus_type", diff --git a/src/views/mes/producereport/ProduceReportDetailForm.vue b/src/views/mes/producereport/ProduceReportDetailForm.vue index ef2bcbb3..71cd6d26 100644 --- a/src/views/mes/producereport/ProduceReportDetailForm.vue +++ b/src/views/mes/producereport/ProduceReportDetailForm.vue @@ -200,6 +200,7 @@ const formData = ref({ reportTime: undefined, reportStatus: undefined, reportDateString: undefined, + reportType: undefined }) const formRules = reactive({ reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }], @@ -257,13 +258,14 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 -const submitForm = async () => { +const submitForm = async (reportType?:string) => { // 校验表单 await formRef.value.validate() // 提交请求 formLoading.value = true try { formData.value.reportDateString = formData.value.reportDate + formData.value.reportType = reportType const data = formData.value as unknown as ProduceReportDetailVO if (formType.value === 'create' || formType.value === 'replace') { await ProduceReportDetailApi.createProduceReportDetail(data) diff --git a/src/views/mes/producereport/ProduceReportDetailIndex.vue b/src/views/mes/producereport/ProduceReportDetailIndex.vue index c39ae5f0..1553a46b 100644 --- a/src/views/mes/producereport/ProduceReportDetailIndex.vue +++ b/src/views/mes/producereport/ProduceReportDetailIndex.vue @@ -122,6 +122,11 @@ + + + - - - - - - - - - - - - - - - +