Browse Source

重大问题线索显示调整

xy 3 weeks ago
parent
commit
cc3f5d9a1e

+ 10 - 3
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()
+  }
 }
 
 // 历史记录版本查询参数

+ 11 - 1
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 '-'

+ 11 - 3
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()
+  }
 }
 
 // 历史记录版本查询参数

+ 11 - 1
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 '-'