From bfcbd6893d4554429d55af264c22bfe6f6bfb371 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 2 Dec 2025 14:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/apply/addApply.vue  |  3 ++-
 src/views/business/apply/applyList.vue | 18 +++++++++---------
 src/views/business/audit/auditList.vue | 14 ++++++++------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/views/business/apply/addApply.vue b/src/views/business/apply/addApply.vue
index 9cdfe470..658ed913 100644
--- a/src/views/business/apply/addApply.vue
+++ b/src/views/business/apply/addApply.vue
@@ -351,7 +351,8 @@ export default {
         useTime: null,
         leaseType: '0',
         pageNum: 1, // 页码
-        pageSize: 10 // 每页条数
+        pageSize: 10, // 每页条数
+        useTimeRange: null,
       },
       useProjectList: [], // 使用项目下拉选
       voltageList: [], // 电压等级下拉选
diff --git a/src/views/business/apply/applyList.vue b/src/views/business/apply/applyList.vue
index dccdc911..861aa793 100644
--- a/src/views/business/apply/applyList.vue
+++ b/src/views/business/apply/applyList.vue
@@ -91,10 +91,10 @@
         <el-table-column label="申请工具数" align="center" prop="toolNum" :show-overflow-tooltip="true" />
         <el-table-column label="任务状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-            <el-tag v-if="scope.row.taskStatus == '0'" type="warning">待审核</el-tag>
-            <el-tag v-if="scope.row.taskStatus == '1'" type="success">已通过</el-tag>
-            <el-tag v-if="scope.row.taskStatus == '2'" type="danger">已驳回</el-tag>
-            <el-tag v-if="scope.row.taskStatus == '3'" type="danger">审批驳回</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '0'" type="info">待审批</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '1'" type="warning">审批中</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '2'" type="success">已审批</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '3'" type="danger">审批驳回</el-tag>
             </template>
         </el-table-column>
         <el-table-column label="申请人" align="center" prop="createBy" :show-overflow-tooltip="true" width="140px"/>
@@ -102,8 +102,8 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="{ row }">
             <el-button  size="mini" type="text" icon="el-icon-zoom-in" @click="handleView(row)">查看</el-button>
-            <el-button v-if="row.taskStatus != 1" size="mini" type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-            <el-button v-if="row.taskStatus != 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)" style="color: red"
+            <el-button v-if="row.taskStatus == 0" size="mini" type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+            <el-button v-if="row.taskStatus == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)" style="color: red"
               >删除</el-button
             >
           </template>
@@ -144,9 +144,9 @@ export default {
         endTime: null,
       },
       statusList: [
-        { label: '待审核', value: '0' },
-        { label: '已通过', value: '1' },
-        { label: '已驳回', value: '2' },
+        { label: '待审批', value: '0' },
+        { label: '审批中', value: '1' },
+        { label: '已审批', value: '2' },
         { label: '审批驳回', value: '3' },
       ],
       total: 0, // 总条数
diff --git a/src/views/business/audit/auditList.vue b/src/views/business/audit/auditList.vue
index a85ab0f2..91670a6b 100644
--- a/src/views/business/audit/auditList.vue
+++ b/src/views/business/audit/auditList.vue
@@ -85,9 +85,10 @@
         <el-table-column label="申请工具数" align="center" prop="toolNum" :show-overflow-tooltip="true" />
         <el-table-column label="任务状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-            <el-tag v-if="scope.row.taskStatus == '0'" type="warning">待审核</el-tag>
-            <el-tag v-if="scope.row.taskStatus == '1'" type="success">已通过</el-tag>
-            <el-tag v-if="scope.row.taskStatus == '2'" type="danger">已驳回</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '0'" type="info">待审批</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '1'" type="warning">审批中</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '2'" type="success">已审批</el-tag>
+              <el-tag v-if="scope.row.taskStatus == '3'" type="danger">审批驳回</el-tag>
             </template>
         </el-table-column>
         <el-table-column label="申请人" align="center" prop="createBy" :show-overflow-tooltip="true" width="140px"/>
@@ -133,9 +134,10 @@ export default {
         endTime: null,
       },
       statusList: [
-        { label: '待审核', value: '0' },
-        { label: '已通过', value: '1' },
-        { label: '已驳回', value: '2' },
+        { label: '待审批', value: '0' },
+        { label: '审批中', value: '1' },
+        { label: '已审批', value: '2' },
+        { label: '审批驳回', value: '3' },
       ],
       total: 0, // 总条数
       // 表格数据