From 2cd8b0ca2746c6f4467995e2f0ed7bd62aa77131 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 09 三月 2025 11:50:59 +0800
Subject: [PATCH] 容缺查询,TODO:容缺完成时调新的接口

---
 src/views/flowable/task/myProcess/send/index.vue |   12 +++--
 src/views/projectProcess/detail/index.vue        |   81 +++++++++++++++-------------------------
 2 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 4d5e6e1..74d9240 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -18,11 +18,11 @@
                   <div class="op-list">
                     <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣' || submitLoading" v-loading="submitLoading" @click="submitForm">纭骞舵彁浜�</el-button>
 <!--                    <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>-->
-                    <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣'" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
-                    <el-button v-if="formDataObj.canJump" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
-                    <el-button v-if="formDataObj.canWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="waitTask()">瀹圭己</el-button>
-                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '鎸傝捣'" size="small" type="primary" @click="hangup">鎸傝捣</el-button>
-                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="cancelHangup">缁撴潫鎸傝捣</el-button>
+                    <el-button size="small" type="primary" v-if="!isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
+                    <el-button v-if="formDataObj.canJump && !isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
+                    <el-button v-if="formDataObj.canWait && !isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="waitTask()">瀹圭己</el-button>
+                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '鎸傝捣' && !isWait" size="small" type="primary" @click="hangup">鎸傝捣</el-button>
+                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '鎸傝捣' && !isWait" size="small" type="primary" @click="cancelHangup">缁撴潫鎸傝捣</el-button>
                   </div>
                   <div class="current">褰撳墠闃舵锛�<span>{{formDataObj.beforeNodeName}}</span><span v-if="formDataObj.taskStatus === 'HANGUP'">锛堟寕璧蜂腑锛�</span></div>
                 </div>
@@ -205,6 +205,7 @@
   props: {},
   data() {
     return {
+      isWait: false,
       jumpDesc: '', // 璺宠繃璇存槑
       rejectLoading: false, // 椹冲洖鎸夐挳鍔犺浇
       submitLoading: false, // 鎻愪氦鎸夐挳鍔犺浇
@@ -288,6 +289,7 @@
     this.procDefId  = this.$route.query && this.$route.query.procDefId;
     this.procInsId  = this.$route.query && this.$route.query.procInsId;
     this.goBackParams  = this.$route.query && this.$route.query.goBackParams;
+    this.isWait = this.$route.query && this.$route.query.isWait;
     // this.getNextFlowNodeByStart(this.deployId);
     this.getFlowFormData(this.taskId);
   },
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 00e54ed..070bc84 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -19,7 +19,7 @@
       <div class="search-warp">
         <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
         <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
-        <div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
+        <div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">瀹圭己浜嬮」</div>
         <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>
@@ -73,45 +73,6 @@
             :formatter="candidateFormatter"
           >
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="promoterUnitName"-->
-<!--            label="鍙戣捣鍗曚綅"-->
-<!--          >-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            prop="promoterName"-->
-<!--            label="鍙戣捣浜�"-->
-<!--          >-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            prop="handlerType"-->
-<!--            label="澶勭悊鏂圭被鍨�"-->
-<!--          >-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-tag v-if="scope.row.handlerType === 'USER'">浜哄憳璐﹀彿</el-tag>-->
-<!--              <el-tag type="success" v-else-if="scope.row.handlerType === 'DEPT'">鍗曚綅</el-tag>-->
-<!--              <el-tag type="info" v-else-if="scope.row.handlerType === 'ROLE'">瑙掕壊</el-tag>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            prop="handlerUnitName"-->
-<!--            label="澶勭悊鍗曚綅"-->
-<!--            :formatter="unitFormatter"-->
-<!--          >-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            prop="handlerName"-->
-<!--            label="鍊欓�夊鐞嗕汉"-->
-<!--            :formatter="candidateFormatter"-->
-<!--          >-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            prop="handlerName"-->
-<!--            label="瀹為檯澶勭悊浜�"-->
-<!--            :formatter="finalFinishedFormatter"-->
-<!--          >-->
-<!--          </el-table-column>-->
           <el-table-column
             align="center"
             prop="taskStatus"
@@ -415,7 +376,7 @@
       }
     },
     showHandle(row) {
-      if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣') {
+      if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣' || row.taskStatus === '瀹圭己') {
         if (row.handlerType === "USER") {
           return row.handlerId.indexOf(this.$store.state.user.id) !== -1
         } else if (row.handlerType === "DEPT") {
@@ -428,13 +389,7 @@
       }
     },
     goToDo(row) {
-      // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
-      let params = {
-        processDefId: row.processDefId,
-        taskId: row.taskId
-      }
-      getTaskIsAuditing(params).then(res => {
-        console.log("row",row)
+      if (row.taskStatus === '瀹圭己') {
         this.$router.push({
           path: '/flowable/task/myProcess/send/index',
           query: {
@@ -445,12 +400,38 @@
             flowName: this.queryParams.processName,
             projectName: this.detailData.projectName,
             taskId: row.taskId,
-            showAuditing: res.data,
+            showAuditing: false,
             projectId: this.queryParams.projectId,
+            isWait: true,
             goBackParams: this.queryParams
           }
         })
-      })
+      } else {
+        // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
+        let params = {
+          processDefId: row.processDefId,
+          taskId: row.taskId
+        }
+        getTaskIsAuditing(params).then(res => {
+          console.log("row",row)
+          this.$router.push({
+            path: '/flowable/task/myProcess/send/index',
+            query: {
+              deployId: row.deployId,
+              procDefId: row.processDefId,
+              procInsId: row.processInsId,
+              processName: row.taskName,
+              flowName: this.queryParams.processName,
+              projectName: this.detailData.projectName,
+              taskId: row.taskId,
+              showAuditing: res.data,
+              projectId: this.queryParams.projectId,
+              isWait: false,
+              goBackParams: this.queryParams
+            }
+          })
+        })
+      }
     },
     goToProcessDetail(row) {
       this.$router.push({ path: '/flowable/task/myProcess/detail/index',

--
Gitblit v1.8.0