审核流转记录显示调整

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/AuditCheckRecord.vue

@@ -783,7 +783,7 @@ const canSubmitMainReportType = ()=>{
         if(getRouteName.value === 'BoilerCheckerRecordCheck')
           return PressureCheckerMyTaskStatusMap[process]
         else 
-          return PressureTaskOrderStatusMap[process]
+          return row.processName + "-" + PressureTaskOrderStatusMap[process]
       }
     },
     {
@@ -839,9 +839,9 @@ const canSubmitMainReportType = ()=>{
   // 结果格式化
   const formatResult = (result) => {
     switch (result) {
-      case 100:
+      case '100':
         return '通过'
-      case 200:
+      case '200':
         return '拒绝'
       default:
         return result || '-'

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

@@ -1699,7 +1699,7 @@ const supportingDocsAuditColumns = ref([
         case PressureTaskOrderStatus['REJECTED']:
           return <div>
             <p>当前流程：{row?.currentNode || '-'}</p>
-            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.id}）拒绝`}</p>
+            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
           </div>
         default:
           return '-'
@@ -2446,7 +2446,8 @@ const handleResubmitDocs = async (row) => {
       reportId: row.id,
       templateId: row.templateId,
       orderId: taskOrderDetail.value.id,
-      prepareJson: row.prepareJson || ''
+      prepareJson: row.prepareJson || '',
+      isSelfType: row.tbType === 500 && row.pjType === 5,
     }
     inspectionplanDetail.value = row
     isEdit.value = 'edit'

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/AuditCheckRecord.vue

@@ -744,7 +744,7 @@ const canSubmitMainReportType = ()=>{
         if(getRouteName.value === 'PipeCheckerRecordCheck')
           return PressureCheckerMyTaskStatusMap[process]
         else 
-          return PressureTaskOrderStatusMap[process]
+          return row.processName + "-" + PressureTaskOrderStatusMap[process]
       }
     },
     {
@@ -819,9 +819,9 @@ const canSubmitMainReportType = ()=>{
   // 结果格式化
   const formatResult = (result) => {
     switch (result) {
-      case 100:
+      case '100':
         return '通过'
-      case 200:
+      case '200':
         return '拒绝'
       default:
         return result || '-'

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

@@ -1796,7 +1796,7 @@ const supportingDocsAuditColumns = ref([
         case PressureTaskOrderStatus['REJECTED']:
           return <div>
             <p>当前流程：{row?.currentNode || '-'}</p>
-            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.id}）拒绝`}</p>
+            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
           </div>
         default:
           return '-'
@@ -2511,7 +2511,8 @@ const handleResubmitDocs = async (row) => {
       reportId: row.id,
       templateId: row.templateId,
       orderId: taskOrderDetail.value.id,
-      prepareJson: row.prepareJson || ''
+      prepareJson: row.prepareJson || '',
+      isSelfType: row.tbType === 500 && row.pjType === 5,
     }
     inspectionplanDetail.value = row
     isEdit.value = 'edit'