From c0023afb5ce8146efd681b8e504fa3946ec6961c Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Thu, 20 Mar 2025 09:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/airqualitycollection/index.vue |  2 +-
 src/views/task/create copy 2.vue         |  4 ++--
 src/views/task/index.vue                 | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/airqualitycollection/index.vue b/src/views/airqualitycollection/index.vue
index b690e4e..3cbc440 100644
--- a/src/views/airqualitycollection/index.vue
+++ b/src/views/airqualitycollection/index.vue
@@ -176,7 +176,7 @@ const getList = async () => {
 }
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  console.log(tab, event)
+  console.log(tab.props, event)
 }
 
 /** 搜索按钮操作 */
diff --git a/src/views/task/create copy 2.vue b/src/views/task/create copy 2.vue
index 9af3c8b..e6b8103 100644
--- a/src/views/task/create copy 2.vue	
+++ b/src/views/task/create copy 2.vue	
@@ -234,11 +234,11 @@
           </div>
       </div>
       <div class="footer">
-        <el-button type="primary" @click="submitForm(false)" size="large">{{btnTitle}}</el-button>
+        <el-button type="primary" @click="submitForm(false)" size="large" v-if="!formData.status || formData.status == 0 || formData.status == 1" >{{btnTitle}}</el-button>
         
         <el-button
           type="primary"
-          v-if="showButton"
+          v-if="formData.status == 0"
           @click="submitForm(true)"
           size="large"
           v-hasPermi="['system:enterprise-inspections:audit']"
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index e0c8692..108f4c3 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -86,6 +86,12 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
       <el-table-column label="任务名称" align="left" prop="title" width="200"/>
+      <el-table-column label="任务类型" align="left" prop="taskType">
+        <template #default="scope">
+        <el-tag>{{ scope.row.taskTypeName }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布部门" align="left" prop="deptName" />
       <el-table-column label="任务状态" align="left" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.TASK_STATE" :value="scope.row.status" />
@@ -97,18 +103,14 @@
           <dict-tag :type="DICT_TYPE.TASK_EXEC_TIME" :value="scope.row.execCycle" />
         </template>
       </el-table-column> -->
-      <el-table-column label="任务类型" align="left" prop="taskType">
-        <template #default="scope">
-        <el-tag>{{ scope.row.taskTypeName }}</el-tag>
-        </template>
-      </el-table-column>
+      
       <!-- <el-table-column label="任务优先级" align="center" prop="priority">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.TASK_PRIORITY" :value="scope.row.priority" />
         </template>
       </el-table-column> -->
 
-      <el-table-column label="发布部门" align="left" prop="deptName" />
+     
       <el-table-column
         label="开始时间"
         align="center"