From e523b2acb1a0b33f8cb0d1b803b187568b211631 Mon Sep 17 00:00:00 2001
From: bestlee <bestlee@djxinxi.net>
Date: Thu, 25 Jun 2026 11:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.js                 | 2 ++
 src/views/applyList/detail.vue     | 5 +++--
 src/views/applyList/lockDetail.vue | 3 ++-
 src/views/applyList/waitList.vue   | 8 +++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 9b2f7a7..1a9bd69 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -3,6 +3,8 @@ import router from '@/router'
 import { showNotify } from 'vant';
 
 const url = 'http://192.168.0.230';
+// const url = window.location.origin;
+
 axios.defaults.baseURL = url; 
 axios.defaults.withCredentials = false;
 axios.defaults.timeout = 200000;
diff --git a/src/views/applyList/detail.vue b/src/views/applyList/detail.vue
index fcf0848..ab009c6 100644
--- a/src/views/applyList/detail.vue
+++ b/src/views/applyList/detail.vue
@@ -120,7 +120,7 @@ const getDetail = async () => {
         }else{
             info.value.steps = res.data?.apply_steps;
         }
-        console.log(info.value)
+        console.log(info.value);
     } finally {
         loading.value = false;
     }
@@ -229,7 +229,8 @@ onMounted(() => {
                 params?.type==='wait' && info?.status!=99 && params?.isMyself==='pending' &&
                 (info?.status==1 || info?.status==2 || info?.status==3 || info?.status==4) &&
                 (((info?.template_id==1 || info?.template_id==4) && (info?.current_step>=1 && info?.current_step<=3)) || 
-                ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4)))
+                ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) ||
+                info?.template_id==5
             ">
             <p class="btn" @click="agree">同意</p>
             <p class="btn" @click="reject">驳回</p>
diff --git a/src/views/applyList/lockDetail.vue b/src/views/applyList/lockDetail.vue
index 533ed37..3b9853f 100644
--- a/src/views/applyList/lockDetail.vue
+++ b/src/views/applyList/lockDetail.vue
@@ -180,7 +180,8 @@ onMounted(() => {
                 params?.type==='wait' && info?.status!=99 && params?.isMyself==='pending' &&
                 (info?.status==1 || info?.status==2 || info?.status==3 || info?.status==4) &&
                 (((info?.template_id==1 || info?.template_id==4) && (info?.current_step>=1 && info?.current_step<=3)) || 
-                ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4)))
+                ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) || 
+                info?.template_id==5
             ">
             <p class="btn" @click="agree">同意</p>
             <p class="btn" @click="reject">驳回</p>
diff --git a/src/views/applyList/waitList.vue b/src/views/applyList/waitList.vue
index ddde309..4efcab5 100644
--- a/src/views/applyList/waitList.vue
+++ b/src/views/applyList/waitList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref,onMounted } from 'vue'
 import router from '@/router'
-import { waitListApi } from '@/api/apply';
+import { waitListApi,taskCountApi } from '@/api/apply';
 
 const loading = ref(false);
 // 状态
@@ -13,6 +13,7 @@ const statusList = ref([
     {text:'各部门会签中',value:3},
     {text:'审批中',value:4},
     {text:'通过',value:5},
+    {text:'已关闭',value:97},
     {text:'已撤回',value:98},
     {text:'已驳回',value:99},
 ]);
@@ -54,9 +55,10 @@ const getList = async () => {
             page: 1,
             per_page: 9999
         });
-        res.data?.initiated.forEach((item) => { item.type = 'myself'; });
+        // res.data?.initiated.forEach((item) => { item.type = 'myself'; });
         res.data?.pending.forEach((item) => { item.type = 'pending'; });
-        list.value = res.data?.initiated.concat(res.data?.pending);
+        // list.value = res.data?.initiated.concat(res.data?.pending);
+        list.value = res.data?.pending;
     } finally { 
         loading.value = false;
     }