From 62f5ab1071ab2fda028c9a6be460fd4dcd1a2c49 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 26 Jul 2024 11:42:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionRecordMain/index.ts | 8 ++++++- src/views/qms/inspectionRecord/detail.vue | 18 +++++++++++++--- .../qms/inspectionRecordFirst/addForm.vue | 19 ++++++++++------- .../qms/inspectionRecordFirst/detail.vue | 21 +++++++++++++++++-- src/views/qms/inspectionRecordFirst/index.vue | 4 ++-- .../inspectionRecordFirstMain.data.ts | 13 +----------- 6 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index 2f5215b03..ef179509a 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts @@ -56,7 +56,12 @@ export const deleteInspectionRecordMain = async (id: number) => { // 导出检验申请 Excel export const exportInspectionRecordMain = async (params) => { - return await request.download({ url: `/qms/inspection-record-main/export-excel`, params }) + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/qms/inspection-record-main/export-excel`, params }) + } } // 下载用户导入模板 @@ -67,3 +72,4 @@ export const importTemplate = () => { export const publishInspectionRecordMain = async (id) => { return await request.put({ url: `/qms/inspection-record-main/publish?id=`+id }) } + diff --git a/src/views/qms/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue index 857ac62bd..4b27eddbf 100644 --- a/src/views/qms/inspectionRecord/detail.vue +++ b/src/views/qms/inspectionRecord/detail.vue @@ -256,7 +256,7 @@ - + @@ -276,7 +276,18 @@ - + + + @@ -366,7 +377,8 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id) list.forEach((item, index) => { editableTabsValue.value = index + 1 - item.name = index + 1 + item.name = index + 1 + item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList }) data.value.subList = list } finally { diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index c424f330b..394e2036c 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -76,7 +76,14 @@ - + + @@ -729,9 +736,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any allSamplePieceSize.value = 0 //打开时候归0 if (row) { data.value = JSON.parse(JSON.stringify(row)) - // nextTick(() => { - // formMainRef.value.setValues(row) - // }) let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id) await processList( data.value,list) } else { @@ -758,7 +762,7 @@ const processList =async (InspectionSchemeObj,list) => { editableTabsValue.value = 1 list.forEach((item, index) => { item.name = index + 1 - item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO + item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionRecordCharacteristicsRespVO item.isPass = '' //判断是否显示对号错误图标 // 总数量值是 样品份数 乘 每份样品量 allSamplePieceSize.value += parseFloat( @@ -768,6 +772,8 @@ const processList =async (InspectionSchemeObj,list) => { ).toFixed(6) ) rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1 ? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList : item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList + if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { // 单个录入时 if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { @@ -933,14 +939,13 @@ const validateForm = (formRef) => { } const submitForm = async () => { try { - await formMainRef.value.validate() - const bol2 = await validateForm(formFeaturesRef.value) if (!bol2) { message.error(`模板中有检验工序和检验特性未填写完全`) return } + debugger // 判断数组是否有未填的选项 let arrBol = [] let isOutweigh = [] //结束时间是否大于开始时间 diff --git a/src/views/qms/inspectionRecordFirst/detail.vue b/src/views/qms/inspectionRecordFirst/detail.vue index 857ac62bd..ac7889043 100644 --- a/src/views/qms/inspectionRecordFirst/detail.vue +++ b/src/views/qms/inspectionRecordFirst/detail.vue @@ -256,7 +256,7 @@ - + @@ -276,7 +276,18 @@ - + + + @@ -286,6 +297,11 @@ + + + + + @@ -367,6 +383,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: list.forEach((item, index) => { editableTabsValue.value = index + 1 item.name = index + 1 + item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList }) data.value.subList = list } finally { diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index d2b7ecee3..617cc1aec 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -238,11 +238,11 @@ const buttonBaseClick = (val, item) => { await InspectionRecordMainApi.updateInspectionRecordMain(data) message.success(t('common.updateSuccess')) } - formRef.value.dialogVisible = false + basicFormRef.value.dialogVisible = false // 刷新当前列表 getList() } finally { - formRef.value.formLoading = false + basicFormRef.value.formLoading = false } } // 筛选提交 diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts index 90947001d..d13d90c05 100644 --- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts +++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts @@ -105,11 +105,10 @@ export const InspectionRecordMain = useCrudSchemas( }, { label: '检验时间', - field: 'updateTime', + field: 'inspectionTime', sort: 'custom', isDetail: true, isForm: false, - isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -127,16 +126,6 @@ export const InspectionRecordMain = useCrudSchemas( } } }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, { label: '操作', field: 'action',