检测录入提交报告功能

src/api/boiler/boilerTaskOrder.ts

@@ -75,6 +75,11 @@ export const getBoilerPendingPreparationListApi = (params: any) => {
   return httpGet('/pressure2/boiler-task-order/order-item/prepare-report/page', params)
 }
 
+// 提交报告
+export const submitBoilerReport = (data: any) => {
+  return httpPUT('/pressure2/boiler-task-order/order-item/report/prepare/submit', data)
+}
+
 // 查询任务单详情，审核列表
 export const getBoilerMajorIssuesAuditList = (params: any) => {
   return httpGet('/pressure2/boiler-task-order/order-item/major-issues/page', params)

src/api/pipe/pipeTaskOrder.ts

@@ -75,6 +75,11 @@ export const getPipePendingPreparationListApi = (params: any) => {
   return httpGet('/pressure2/pipe-task-order/order-item/prepare-report/page', params)
 }
 
+// 提交报告
+export const submitPipeReport = (data: any) => {
+  return httpPUT('/pressure2/pipe-task-order/order-item/report/prepare/submit', data)
+}
+
 // 查询任务单详情，审核列表
 export const getPipeMajorIssuesAuditList = (params: any) => {
   return httpGet('/pressure2/pipe-task-order/order-item/major-issues/page', params)

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

@@ -563,7 +563,7 @@ import {
   getUserGroupUserList,
   pressure2NotVerifyPageApi,
 } from '@/api/task'
-import { cancelBoilerInSpectProject, addBoilerMajorIssues } from '@/api/boiler/boilerTaskOrder'
+import { cancelBoilerInSpectProject, addBoilerMajorIssues, submitBoilerReport } from '@/api/boiler/boilerTaskOrder'
 
 import { updateBoilerTaskOrderItemReportConclusion } from '@/api/boiler/boilerTaskOrderReport'
 import TipsPopup from './inspectProjectComponent/TipsPopup.vue'
@@ -571,6 +571,7 @@ import CalcCheckItemPopup from './inspectProject/component/calcCheckItemPopup.vu
 import ExchangeChecker from './inspectProject/component/ExchangeChecker.vue'
 import UpdateConclusionPopup from './inspectProject/component/UpdateConclusionPopup.vue'
 import eventBus from '@/utils/eventBus'
+import { useUserStore } from '@/store/user.js'
 
 interface CheckConclusionItem {
   value: string
@@ -680,7 +681,7 @@ const showSelectTemplatePopup = ref(false)
 const templateList = ref<any[]>([])
 const selectedTemplate = ref<any>(null)
 
-const userInfo = computed(() => uni.getStorageSync('APP_USER_INFO'))
+const userInfo = computed(() => useUserStore().userInfo)
 
 const canModifyChecker = computed(() => {
   return props.canModifyAssignments && props.isMainChecker
@@ -688,7 +689,6 @@ const canModifyChecker = computed(() => {
 
 const isNetworkConnected = ref(true)
 onMounted(() => {
-  console.log('datasource.......', props.dataSource)
   checkNetworkStatus()
   initSelected()
   setupEventListeners()
@@ -1080,10 +1080,10 @@ const onReportUserChange = (e: any) => {
 }
 
 const handleSubmitReport = async () => {
-  if (!currentReckUser.value) {
-    uni.showToast({ title: '请选择审核人', icon: 'error' })
-    return
-  }
+  // if (!currentReckUser.value) {
+  //   uni.showToast({ title: '请选择审核人', icon: 'error' })
+  //   return
+  // }
 
   if (!currentReportItem.value) {
     uni.showToast({ title: '报告信息丢失，请重试', icon: 'error' })
@@ -1095,12 +1095,11 @@ const handleSubmitReport = async () => {
 
     const params = {
       id: currentReportItem.value.id,
-      approveId: currentReckUser.value?.id,
+      approveId: userInfo.value?.id,
       reportType: currentReportItem.value.reportType,
     }
 
-    const { submitReportApi } = await import('@/api/task')
-    const result: any = await submitReportApi(params)
+    const result: any = await submitBoilerReport(params)
 
     uni.hideLoading()
 

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

@@ -324,7 +324,7 @@ import {
   getUserGroupUserList,
   pressure2NotVerifyPageApi,
 } from '@/api/task'
-import { cancelPipeInSpectProject, addPipeMajorIssues } from '@/api/pipe/pipeTaskOrder'
+import { cancelPipeInSpectProject, addPipeMajorIssues, submitPipeReport } from '@/api/pipe/pipeTaskOrder'
 import { updatePipeTaskOrderItemReportConclusion } from '@/api/pipe/pipeTaskOrderReport'
 
 import TipsPopup from './inspectProjectComponent/TipsPopup.vue'
@@ -332,6 +332,7 @@ import CalcCheckItemPopup from './inspectProject/component/calcCheckItemPopup.vu
 import ExchangeChecker from './inspectProject/component/ExchangeChecker.vue'
 import UpdateConclusionPopup from './inspectProject/component/UpdateConclusionPopup.vue'
 import eventBus from '@/utils/eventBus'
+import { useUserStore } from '@/store/user.js'
 
 interface CheckConclusionItem {
   value: string
@@ -406,7 +407,7 @@ const showSelectTemplatePopup = ref(false)
 const templateList = ref<any[]>([])
 const selectedTemplate = ref<any>(null)
 
-const userInfo = computed(() => uni.getStorageSync('APP_USER_INFO'))
+const userInfo = computed(() => useUserStore().userInfo)
 
 const canModifyChecker = computed(() => {
   return props.canModifyAssignments && props.isMainChecker
@@ -810,10 +811,10 @@ const onReportUserChange = (e: any) => {
 }
 
 const handleSubmitReport = async () => {
-  if (!currentReckUser.value) {
-    uni.showToast({ title: '请选择审核人', icon: 'error' })
-    return
-  }
+  // if (!currentReckUser.value) {
+  //   uni.showToast({ title: '请选择审核人', icon: 'error' })
+  //   return
+  // }
 
   if (!currentReportItem.value) {
     uni.showToast({ title: '报告信息丢失，请重试', icon: 'error' })
@@ -825,12 +826,11 @@ const handleSubmitReport = async () => {
 
     const params = {
       id: currentReportItem.value.id,
-      approveId: currentReckUser.value?.id,
+      approveId: userInfo.value?.id,
       reportType: currentReportItem.value.reportType,
     }
 
-    const { submitReportApi } = await import('@/api/task')
-    const result: any = await submitReportApi(params)
+    const result: any = await submitPipeReport(params)
 
     uni.hideLoading()