Browse Source

Merge branch 'qhse_fix' of shuzhihua/pms-iot-vue into master

yanghao 15 giờ trước cách đây
mục cha
commit
f0a9a9302b
1 tập tin đã thay đổi với 48 bổ sung36 xóa
  1. 48 36
      src/views/pms/qhse/faultReport/index.vue

+ 48 - 36
src/views/pms/qhse/faultReport/index.vue

@@ -108,7 +108,7 @@
               v-hasPermi="['rq:iot-accident-report:query']"
               >详情</el-button
             >
-            <!-- <el-button link type="primary" @click="openApprovalDialog(row)"> 流转信息 </el-button> -->
+            <el-button link type="primary" @click="openApprovalDialog(row)"> 流转信息 </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -228,6 +228,9 @@ import { formatDate } from '@/utils/formatTime'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { IotApprovalApi } from '@/api/pms/qhse/index'
 import QhseFaultReportForm from './QhseFaultReportForm.vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
 
 // Data
 const loading = ref(false)
@@ -544,43 +547,52 @@ const getNodeStatusColor = (status) => {
   return colorMap[status] || '#90939'
 }
 
-const openApprovalDialog = async (row) => {
-  approvalDialogVisible.value = true
-  approvalDialogTitle.value = `审批流程详情`
-  approvalSuggestion.value = '' // 清空审批建议
+// const openApprovalDialog = async (row) => {
+//   approvalDialogVisible.value = true
+//   approvalDialogTitle.value = `审批流程详情`
+//   approvalSuggestion.value = '' // 清空审批建议
+
+//   try {
+//     const response = await IotApprovalApi.getApprovalProcess(row.id)
+//     const processList = response.list || []
+
+//     // 按 createTime 升序排序(时间正序)
+//     approvalProcessList.value = processList.sort((a, b) => a.createTime - b.createTime)
+
+//     // 如果没有数据,添加一条默认的“发起人”记录
+//     if (approvalProcessList.value.length === 0) {
+//       approvalProcessList.value.push({
+//         createTime: Date.now(),
+//         operator: '系统管理员',
+//         status: '提交上报',
+//         description: '发起事故事件上报申请',
+//         nodeName: '上报发起',
+//         opinion: ''
+//       })
+//     }
+//   } catch (error) {
+//     ElMessage.error('获取审批流程失败')
+//     // 即使出错也显示一个基本记录
+//     approvalProcessList.value = [
+//       {
+//         createTime: Date.now(),
+//         operator: '系统',
+//         status: '错误',
+//         description: '无法获取审批流程信息',
+//         nodeName: '系统通知',
+//         opinion: ''
+//       }
+//     ]
+//   }
+// }
 
-  try {
-    const response = await IotApprovalApi.getApprovalProcess(row.id)
-    const processList = response.list || []
-
-    // 按 createTime 升序排序(时间正序)
-    approvalProcessList.value = processList.sort((a, b) => a.createTime - b.createTime)
-
-    // 如果没有数据,添加一条默认的“发起人”记录
-    if (approvalProcessList.value.length === 0) {
-      approvalProcessList.value.push({
-        createTime: Date.now(),
-        operator: '系统管理员',
-        status: '提交上报',
-        description: '发起事故事件上报申请',
-        nodeName: '上报发起',
-        opinion: ''
-      })
+const openApprovalDialog = async (row) => {
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstanceId
     }
-  } catch (error) {
-    ElMessage.error('获取审批流程失败')
-    // 即使出错也显示一个基本记录
-    approvalProcessList.value = [
-      {
-        createTime: Date.now(),
-        operator: '系统',
-        status: '错误',
-        description: '无法获取审批流程信息',
-        nodeName: '系统通知',
-        opinion: ''
-      }
-    ]
-  }
+  })
 }
 
 // 监听窗口大小变化