Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/api/pressure2/standard/template.ts

@@ -162,6 +162,19 @@ export const getPDFByInspection = (data) => {
   })
 }
 
+// 检验方案获取需要拼接附件 - 本地测试环境
+export const getPDFByInspectionLocal = (data) => {
+  return request.download2({
+    url: '/pressure2/standard-file/getPDFByInspectionLocal',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data',
+      'Accept': 'application/pdf'
+    },
+    responseType: 'blob'
+  })
+}
+
 // 获取文件流
 export const getFile = ( url) => {
   return request.download({

yudao-ui-admin-vue3/src/components/DynamicReport/SpreadViewer.vue

@@ -93,6 +93,7 @@ import {
   getPDF
 } from '@/api/laboratory/standard/template';
 import {
+  getPDFByInspectionLocal,
   getStandardTemplateInfo,
 } from '@/api/pressure2/standard/template'
 import {ref, onMounted,onUnmounted} from "vue";
@@ -296,6 +297,7 @@ const openPdf = async () => {
  await previewSpread.save(async function (blob) {
     formData.append('file', blob)
    let response = null
+   //uat环境葡萄城pdf接口
    if (nodeEnv == 'uat') {
      if (props.initData.manualUrl){
        formData.append('manualUrl', props.initData.manualUrl)
@@ -304,9 +306,10 @@ const openPdf = async () => {
        response = await getPDF2(formData)
      }
    } else {
+     //本地测试环境葡萄城pdf接口
      if (props.initData.manualUrl){
        formData.append('manualUrl', props.initData.manualUrl)
-       response = await getPDFByInspection(formData)
+       response = await getPDFByInspectionLocal(formData)
      }else{
        response = await getPDF(formData)
      }

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/ServiceRecordList.vue

@@ -9,10 +9,12 @@
 <template>
   <section v-loading="pageLoading">
     <ContentWrap :title="getTitle" class="check-record-wrapper">
-      <div class="designer-inner">
+      <div class="designer-inner" v-if="['add', 'edit'].includes(isAddMainquestion)">
 <!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
         <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
-
+      </div>
+      <div class="designer-inner" v-else>
+        <SpreadViewer :initData="initData" ref="spreadRef" />
       </div>
       <div class="operation-inner">
         <div class="btn-list">
@@ -533,7 +535,12 @@ const handleRefresh = async () => {
   historyVersionParams.value.pageNo = 1
   await fetchHisVersionPage(true)
   // initPreview()
-  editPreview()
+  // editPreview()
+  if (['add', 'edit'].includes(props.isAddMainquestion)){
+    editPreview()
+  }else{
+    initPreview()
+  }
 }
 
 // 历史记录版本查询参数

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -1674,12 +1674,22 @@ const supportingDocsAuditColumns = ref([
   {
     label: '状态',
     prop: 'status',
-    render: (row, status) => !status ? '-' : PressureTaskOrderStatusMap[status]
+    render: (row, status) => {
+      // 如果 reportType=600 且 tbType=900，显示 -
+      if ((row.reportType === 600 && row.tbType === 900) || row.reportType === 500) {
+        return '-'
+      }
+      return !status ? '-' : PressureTaskOrderStatusMap[status]
+    }
   },
   {
     label: '当前流程',
     prop: 'currentNode',
     render: (row) => {
+      // 如果 reportType=600 且 tbType=900，显示 -
+      if ((row.reportType === 600 && row.tbType === 900) || row.reportType === 500) {
+        return '-'
+      }
       switch(row.status) {
         case PressureTaskOrderStatus['CANCELLED']:
           return '-'

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/ServiceRecordList.vue

@@ -9,10 +9,13 @@
 <template>
   <section v-loading="pageLoading">
     <ContentWrap :title="getTitle" class="check-record-wrapper">
-      <div class="designer-inner">
-<!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
+      <div class="designer-inner" v-if="['add', 'edit'].includes(isAddMainquestion)">
+        <!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
         <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
       </div>
+      <div class="designer-inner" v-else>
+        <SpreadViewer :initData="initData" ref="spreadRef" />
+      </div>
       <div class="operation-inner">
         <div class="btn-list">
           <el-dropdown
@@ -517,7 +520,12 @@ const handleRefresh = async () => {
   historyVersionParams.value.pageNo = 1
   await fetchHisVersionPage(true)
   // initPreview()
-  editPreview()
+  // editPreview()
+  if (['add', 'edit'].includes(props.isAddMainquestion)){
+    editPreview()
+  }else{
+    initPreview()
+  }
 }
 
 // 历史记录版本查询参数

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -1771,12 +1771,22 @@ const supportingDocsAuditColumns = ref([
   {
     label: '状态',
     prop: 'status',
-    render: (row, status) => !status ? '-' : PressureTaskOrderStatusMap[status]
+    render: (row, status) => {
+      // 如果 reportType=600 且 tbType=900，显示 -
+      if ((row.reportType === 600 && row.tbType === 900) || row.reportType === 500) {
+        return '-'
+      }
+      return !status ? '-' : PressureTaskOrderStatusMap[status]
+    }
   },
   {
     label: '当前流程',
     prop: 'currentNode',
     render: (row) => {
+      // 如果 reportType=600 且 tbType=900，显示 -
+      if ((row.reportType === 600 && row.tbType === 900) || row.reportType === 500) {
+        return '-'
+      }
       switch(row.status) {
         case PressureTaskOrderStatus['CANCELLED']:
           return '-'