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

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

@@ -1698,10 +1698,14 @@ const supportingDocsAuditColumns = ref([
         case PressureTaskOrderStatus['APPROVED']:
           return '审核通过'
         case PressureTaskOrderStatus['AUDITING']:
-        case PressureTaskOrderStatus['REJECTED']:
           return <div>
             <p>当前流程：{row?.currentNode || '-'}</p>
-            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
+            <p>状态：审核中</p>
+          </div>
+        case PressureTaskOrderStatus['REJECTED']:
+          return <div>
+            <p>当前流程：已退回</p>
+            <p>状态：{`${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
           </div>
         default:
           return '-'

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

@@ -1795,10 +1795,14 @@ const supportingDocsAuditColumns = ref([
         case PressureTaskOrderStatus['APPROVED']:
           return '审核通过'
         case PressureTaskOrderStatus['AUDITING']:
-        case PressureTaskOrderStatus['REJECTED']:
           return <div>
             <p>当前流程：{row?.currentNode || '-'}</p>
-            <p>状态：{row.status === PressureTaskOrderStatus['AUDITING'] ? '审核中' : `${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
+            <p>状态：审核中</p>
+          </div>
+        case PressureTaskOrderStatus['REJECTED']:
+          return <div>
+            <p>当前流程：已退回</p>
+            <p>状态：{`${row?.currentAuditor?.nickname}（${row?.currentAuditor?.employeeNo}）拒绝`}</p>
           </div>
         default:
           return '-'