xzc 4 napja
szülő
commit
6f775d0c6c

+ 3 - 5
yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/boilerInspectionOpinion.vue

@@ -822,13 +822,11 @@ const batchRePush = async () => {
 /**
  * 重新推送
  */
-const handleRePush = async (row) => {
+const handleRePush = (row) => {
   recipientRow.value = row
   recipientType.value = 'single'
-  // 调用接口获取任务单默认联系人信息
-  const result = await BoilerTaskOrderApi.exportCheckBookDetail({ id: row.reportId })
-  recipientFormData.recipient = result?.defaultRecipient || ''
-  recipientFormData.recipientPhone = result?.defaultRecipientPhone || ''
+  recipientFormData.recipient = row.defaultRecipient || ''
+  recipientFormData.recipientPhone = row.defaultRecipientPhone || ''
   recipientDialogVisible.value = true
 }
 

+ 9 - 13
yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexBoilerTab.vue

@@ -894,19 +894,15 @@ const handleRePush = async (row) => {
   recipientDialogVisible.value = true
 
 }
-const fiePreviewEmitFn = async (row) => {
-  const result = await BoilerTaskOrderApi.exportCheckBookDetail({id: row.reportId})
-  if (result) {
-
-    recipientRow.value = row
-    recipientType.value = 'single'
-    currentReportId.value = row.opinionReportedUrl
-    currentPreviewId.value = row.id
-
-    recipientFormData.recipient = result.correspondName
-    recipientFormData.recipientPhone = result.correspondPhone
-    recipientDialogVisible.value = true
-  }
+const fiePreviewEmitFn = (row) => {
+  recipientRow.value = row
+  recipientType.value = 'single'
+  currentReportId.value = row.opinionReportedUrl
+  currentPreviewId.value = row.id
+
+  recipientFormData.recipient = row.defaultRecipient || ''
+  recipientFormData.recipientPhone = row.defaultRecipientPhone || ''
+  recipientDialogVisible.value = true
 }
 const handleFilePreview = (row) => {
   currentReport.value = row

+ 9 - 13
yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexPipeTab.vue

@@ -894,19 +894,15 @@ const handleRePush = async (row) => {
   recipientDialogVisible.value = true
 
 }
-const fiePreviewEmitFn = async (row) => {
-  const result = await PipeTaskOrderApi.exportCheckBookDetail({id: row.reportId})
-  if (result) {
-
-    recipientRow.value = row
-    recipientType.value = 'single'
-    currentReportId.value = row.opinionReportedUrl
-    currentPreviewId.value = row.id
-
-    recipientFormData.recipient = result.correspondName
-    recipientFormData.recipientPhone = result.correspondPhone
-    recipientDialogVisible.value = true
-  }
+const fiePreviewEmitFn = (row) => {
+  recipientRow.value = row
+  recipientType.value = 'single'
+  currentReportId.value = row.opinionReportedUrl
+  currentPreviewId.value = row.id
+
+  recipientFormData.recipient = row.defaultRecipient || ''
+  recipientFormData.recipientPhone = row.defaultRecipientPhone || ''
+  recipientDialogVisible.value = true
 }
 const handleFilePreview = (row) => {
   currentReport.value = row

+ 5 - 5
yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/pipeInspectionOpinion.vue

@@ -822,13 +822,13 @@ const batchRePush = async () => {
 /**
  * 重新推送
  */
-const handleRePush = async (row) => {
+const handleRePush = (row) => {
   recipientRow.value = row
   recipientType.value = 'single'
-  // 调用接口获取任务单默认联系人信息
-  const result = await PipeTaskOrderApi.exportCheckBookDetail({ id: row.reportId })
-  recipientFormData.recipient = result?.defaultRecipient || ''
-  recipientFormData.recipientPhone = result?.defaultRecipientPhone || ''
+  console.log('defaultRecipient',row.defaultRecipient);
+  
+  recipientFormData.recipient = row.defaultRecipient || ''
+  recipientFormData.recipientPhone = row.defaultRecipientPhone || ''
   recipientDialogVisible.value = true
 }