调整管道检测录入按钮逻辑

src/pages/equipment/detail/components/BoilerInspectProject.vue

@@ -557,20 +557,20 @@ import {
   PressureCheckerMyTaskStatusMap,
 } from '@/utils/dictMap'
 import { isCheckItemEditable, isAssignedToOthers } from '@/utils/equipmentPermissions'
+
 import {
   getApprovalDetail,
   getUserGroupUserList,
   pressure2NotVerifyPageApi,
 } from '@/api/task'
-import { getReportTemplateDetail, getPressure2ReportTemplateDetail } from '@/api'
 import { cancelBoilerInSpectProject, addBoilerMajorIssues } from '@/api/boiler/boilerTaskOrder'
+
 import { updateBoilerTaskOrderItemReportConclusion } from '@/api/boiler/boilerTaskOrderReport'
 import TipsPopup from './inspectProjectComponent/TipsPopup.vue'
 import CalcCheckItemPopup from './inspectProject/component/calcCheckItemPopup.vue'
 import ExchangeChecker from './inspectProject/component/ExchangeChecker.vue'
 import UpdateConclusionPopup from './inspectProject/component/UpdateConclusionPopup.vue'
 import eventBus from '@/utils/eventBus'
-import dayjs from 'dayjs'
 
 interface CheckConclusionItem {
   value: string

src/pages/equipment/detail/components/PipeInspectProject.vue

@@ -322,18 +322,16 @@ import { isCheckItemEditable, isAssignedToOthers } from '@/utils/equipmentPermis
 import {
   getApprovalDetail,
   getUserGroupUserList,
-  notVerifyPageApi,
-  addMajorIssuesApi,
+  pressure2NotVerifyPageApi,
 } from '@/api/task'
-import { cancelPipeInSpectProject } from '@/api/pipe/pipeTaskOrder'
+import { cancelPipeInSpectProject, addPipeMajorIssues } from '@/api/pipe/pipeTaskOrder'
 import { updatePipeTaskOrderItemReportConclusion } from '@/api/pipe/pipeTaskOrderReport'
-import { getReportTemplateDetail } from '@/api'
+
 import TipsPopup from './inspectProjectComponent/TipsPopup.vue'
 import CalcCheckItemPopup from './inspectProject/component/calcCheckItemPopup.vue'
 import ExchangeChecker from './inspectProject/component/ExchangeChecker.vue'
 import UpdateConclusionPopup from './inspectProject/component/UpdateConclusionPopup.vue'
 import eventBus from '@/utils/eventBus'
-import dayjs from 'dayjs'
 
 interface CheckConclusionItem {
   value: string
@@ -892,10 +890,10 @@ const handleAssociationOperation = (item: CheckItem) => {
 
 const showAddWorkInstructionPopup = async () => {
   try {
-    const result = await notVerifyPageApi({ type: '5', status: 200, pageNo: 1, pageSize: 9999 })
-    const list = (result?.data?.list || []).map((item: any) => ({
+    const result = await pressure2NotVerifyPageApi({ reportType: PressureReportType.WORKINSTRUCTION, status: 200, pageNo: 1, pageSize: 9999 })
+    const list = (result?.data || []).map((item: any) => ({
       ...item,
-      label: item.name || '',
+      label: item.tbName || '',
       value: item.id || '',
     }))
 
@@ -931,30 +929,15 @@ const handleConfirmTemplate = async () => {
 
   try {
     uni.showLoading({ title: '添加中...' })
-
-    const templateResult = await getReportTemplateDetail({ id: selectedTemplate.value.value })
-    const initTemplateJson = templateResult?.data?.reportDefaultJson
-      ? JSON.parse(templateResult?.data?.reportDefaultJson || '{}')
-      : {}
-
-    const defaultDataSource: Record<string, any> = {
-      ...initTemplateJson,
-      ...props.equipment,
-      prepareName: userInfo.value?.nickname || '',
-      prepareDate: dayjs().format('YYYY年MM月DD日'),
-    }
-
     const params = {
       orderId: props.orderId,
       orderItemId: props.orderItemId,
-      userGroupCategory: selectedTemplate.value?.userGroupCategory || '',
       templateId: selectedTemplate.value.value,
       prepareId: userInfo.value?.id || '',
       prepareName: userInfo.value?.nickname || '',
-      prepareJson: JSON.stringify(defaultDataSource),
     }
 
-    const result = await addMajorIssuesApi(params)
+    const result = await addPipeMajorIssues(params)
 
     if (result.code !== 0) {
       uni.hideLoading()
@@ -969,17 +952,17 @@ const handleConfirmTemplate = async () => {
       return
     }
 
-    uni.hideLoading()
-    closeSelectTemplatePopup()
-    props.refreshDetail?.()
-
     uni.navigateTo({
-      url: `/pages/equipment/detail/equipTestRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.id}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
+      url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.value}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
     })
   } catch (error) {
     uni.hideLoading()
     console.error('添加指导书失败:', error)
     uni.showToast({ title: '添加指导书失败', icon: 'error' })
+  } finally {
+    uni.hideLoading()
+    closeSelectTemplatePopup()
+    props.refreshDetail?.()
   }
 }
 

src/pages/equipment/detail/equipCheckRecordEditor.vue

@@ -11,6 +11,7 @@
 
 <template>
   <view>
+    <!-- 相比于 SpreadDesignerGeneric 悬浮输入框，有拍摄图片，但是导航栏没有扩展性 -->
     <SpreadDesigner
       ref="spreadDesignerRef"
       :checkItemData="checkItemData"