From 1f8235093818e85188aac183dc6f82ddd51906c5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Aug 2024 19:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BD=BF=E7=94=A8=E5=86=B3=E7=AD=96=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B5=B7=E6=8B=89?=
 =?UTF-8?q?=E4=B9=9F=E6=8F=90=E8=BF=87=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecord/index.vue      | 9 ++++++---
 src/views/qms/inspectionRecord/useAddForm.vue | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index a9765dd5b..56351c3b2 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) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
         }
       })
     } else if (row.estimateCode == 2) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
         }
@@ -430,7 +430,10 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
-    handleOrderPub(rowData.value)
+    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 c430495c8..d6e9dbd82 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 =''
+      data.value.useDecision =row.useDecision?row.useDecision:''
     }
     // 全部合格时合格数量==数量
     if(data.value.useDecision == 1){