From 967e797a3d31877ba8197cbf00dbfa1772552c09 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 29 Aug 2024 08:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E6=94=B9=E7=9A=84=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=86=B3=E7=AD=96=E5=92=8C=E5=8F=91=E5=B8=83=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=88=B0=E4=B9=8B=E5=89=8D=E7=89=88=E6=9C=AC=EF=BC=8C?= =?UTF-8?q?=E8=BF=99=E4=B8=A4=E5=A4=A9=E7=9A=84=E6=9B=B4=E6=94=B90828?= =?UTF-8?q?=E7=9A=84=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 6 ++---- src/views/qms/inspectionRecord/useAddForm.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index a5b9daf2c..1c810b044 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1,接收时候,使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -430,9 +430,7 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false - if (!data.isPublished) { handleOrderPub(rowData.value) - } // 刷新当前列表 getList() } finally { diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index b533dfcf7..c430495c8 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision =row.useDecision||'' + data.value.useDecision ='' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){