调整

yudao-ui-admin-vue3/src/views/pressure2/reportArchivingBoiler/detail.vue

@@ -63,10 +63,9 @@ import ReportAndRecordPdfDialog from './components/reportAndRecordPdfDialog.vue'
 import AssociationOperationManual from './components/AssociationOperationManual.vue'
 import { formatDate } from '@/utils/formatTime'
 import { PressureCheckerMyTaskStatusMap, PressureReportType } from '@/utils/constants'
-import nonTaxQueryApi from '@/views/pressure/nonTaxQuery/index.api'
+import nonTaxQueryApi from '@/views/pressure2/nonTaxQuery/index.api'
 import FetchApis, { DetailData } from './index.api'
 import { useRoute, useRouter } from 'vue-router'
-import { BoilerTaskOrderApi } from '@/api/pressure2/boilertaskorder'
 import { buildFileUrl } from '@/utils'
 import request from '@/config/axios'
 import {PipeInputApi} from "@/api/pressure2/pipeInput";
@@ -476,7 +475,7 @@ const openModalConfig: ModelConfig = {
     modalTitle: '流转记录'
   },
   nonTaxQuery: {
-    modalUrl: '/pressure2/boiler-task-order-non-tax-record/page',
+    modalUrl: '/pressure2/task-order-non-tax-record/page',
     columns: [
       {
         type: 'operation',
@@ -498,13 +497,13 @@ const openModalConfig: ModelConfig = {
         }
       },
       {
-        prop: 'handledByUser',
+        prop: 'handledByName',
         label: '开单人',
         fieldProps: {
           align: 'center'
         },
         render: (_row, value) => {
-          return value?.nickname || ''
+          return value || ''
         }
       },
       {

yudao-ui-admin-vue3/src/views/pressure2/reportArchivingPipe/detail.vue

@@ -63,7 +63,7 @@ import ReportAndRecordPdfDialog from './components/reportAndRecordPdfDialog.vue'
 import AssociationOperationManual from './components/AssociationOperationManual.vue'
 import { formatDate } from '@/utils/formatTime'
 import { PressureCheckerMyTaskStatusMap, PressureReportType } from '@/utils/constants'
-import nonTaxQueryApi from '@/views/pressure/nonTaxQuery/index.api'
+import nonTaxQueryApi from '@/views/pressure2/nonTaxQuery/index.api'
 import FetchApis, { DetailData } from './index.api'
 import { useRoute, useRouter } from 'vue-router'
 import { buildFileUrl } from '@/utils'
@@ -475,7 +475,7 @@ const openModalConfig: ModelConfig = {
     modalTitle: '流转记录'
   },
   nonTaxQuery: {
-    modalUrl: '/pressure2/pipe-task-order-non-tax-record/page',
+    modalUrl: '/pressure2/task-order-non-tax-record/page',
     columns: [
       {
         type: 'operation',
@@ -497,13 +497,13 @@ const openModalConfig: ModelConfig = {
         }
       },
       {
-        prop: 'handledByUser',
+        prop: 'handledByName',
         label: '开单人',
         fieldProps: {
           align: 'center'
         },
         render: (_row, value) => {
-          return value?.nickname || ''
+          return value || ''
         }
       },
       {