From 8b59fc7dc34cd672db4abc34992d3428941c9f1d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 04 三月 2025 22:00:29 +0800
Subject: [PATCH] 日志展示bug

---
 src/views/projectProcess/detail/index.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 545c0f1..95a42ab 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -23,7 +23,7 @@
         <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
         <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></div>
         <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
-        <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>
+<!--        <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>-->
         <div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫e姙浜嬮」锛�0锛�</div>
       </div>
       <div style="display: flex;justify-content: center;align-items: center;margin-top: 20px; position: relative">
@@ -329,7 +329,7 @@
       this.superviseForm.content ='';
       this.superviseForm.taskId = row.taskId;
       this.superviseForm.projectId = this.$route.query.projectId;
-      this.superviseForm.processInsId = row.taskId;
+      this.superviseForm.processInsId = row.processInsId;
       this.superviseForm.superviseType = "SUPERVISE";
       this.superviseForm.receiverType = row.handlerType;
       if (row.handlerType === 'USER') {
@@ -491,9 +491,19 @@
         this.total = res.total
       })
     },
+    isProject(id) {
+      const numericPattern = /^\d+(\.\d+)?$/;
+      return numericPattern.test(id)
+    },
     // 鏌ヨ璇︽儏
     getProjectProcessInfo() {
-      getProjectProcessDetail(this.queryParams.projectId, this.queryParams.processDefId).then(res => {
+      const projectType = this.isProject(this.queryParams.projectId) ? "PROJECT" : "ENGINEERING"
+      const param = {
+        projectId: this.queryParams.projectId,
+        processDefId: this.queryParams.processDefId,
+        projectType: projectType
+      }
+      getProjectProcessDetail(param).then(res => {
         this.detailData = res.data
         this.taskList = res.taskList
         this.total = res.total

--
Gitblit v1.8.0