From 9e61ad47111a946c430739f747aaa0e79c08e1ef Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Fri, 14 Mar 2025 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterprises/index.vue      | 39 ++++++++++++----------------
 src/views/enterprises/update.vue     |  2 +-
 src/views/task/createEnterprise2.vue | 16 +++---------
 src/views/task/index.vue             | 16 ++++++------
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue
index 63dfd12..ee7cca9 100644
--- a/src/views/enterprises/index.vue
+++ b/src/views/enterprises/index.vue
@@ -97,11 +97,9 @@
       <el-form-item  class="btnClass">
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button type="primary" plain  @click="
-              push({
-                path: 'update'
-              })
-            ">
+        <el-button type="primary" plain   v-hasPermi="['system:enterprise:create']"
+        @click="push({ path: 'update' })
+        ">
           <Icon icon="ep:plus" class="mr-5px" @click="
               push({
                 path: 'update',
@@ -111,7 +109,7 @@
               })
             " /> 新增
         </el-button>
-        <el-button type="success" plain @click="handleExport" :loading="exportLoading">
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading" v-hasPermi="['system:enterprise:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
@@ -121,38 +119,33 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
-      <el-table-column label="企业名称" align="center" fixed="left" prop="enterprisesName" />
-      <el-table-column label="专管员" align="center"  prop="inviterName" fixed="left"  />
-      <el-table-column label="企业类型" align="center" prop="type" fixed="left" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ENTERPRISES_TYPE" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column label="企业所属区域" align="center" prop="region" fixed="left">
+      <el-table-column label="企业名称" align="left" fixed="left" prop="enterprisesName" width="200" />
+      <el-table-column label="专管员" align="left"  prop="inviterName" fixed="left"  />
+      <el-table-column label="企业所属区域" align="left" prop="region" fixed="left">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ENTERPRISES_AREA" :value="scope.row.region" />
         </template>
       </el-table-column>
 
-      <el-table-column label="企业地址" align="center" prop="address" />
-      <el-table-column label="环保负责人姓名" align="center" prop="contactName" />
+      <el-table-column label="企业地址" align="left" prop="address" />
+      <el-table-column label="负责人姓名" align="left" prop="contactName" />
       <el-table-column
-        label="企业环保负责人联系电话"
+        label="联系电话"
         align="center"
         prop="environmentalContactPhone"
       />
-      <el-table-column label="企业注册号" align="center" prop="registrationNumber" />
-      <el-table-column label="企业图文介绍" align="center" prop="introduction" />
+      <el-table-column label="企业注册号" align="left" prop="registrationNumber" />
+      <el-table-column label="企业图文介绍" align="left" prop="introduction" />
       <!--    <el-table-column label="企业成立时间" align="center" prop="establishmentDate" />
       <el-table-column label="企业经纬度" align="center" prop="gpsLocation" />-->
       <el-table-column
         label="创建时间"
-        align="center"
+        align="left"
         prop="createTime"
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column label="操作" align="left" min-width="120px">
         <template #default="scope">
          
           <el-button
@@ -166,11 +159,11 @@
                 }
               })
             "
-            v-hasPermi="['system:task-info:update']"
+            v-hasPermi="['system:enterprise:update']"
           >
             详情
           </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"  v-hasPermi="['system:enterprise:delete']"> 删除 </el-button>
 <!-- 
           <el-button link type="danger" @click="detailformRef(scope.row.id)"> 详情 </el-button> -->
        
diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue
index a13c6bc..cf7ffa6 100644
--- a/src/views/enterprises/update.vue
+++ b/src/views/enterprises/update.vue
@@ -234,7 +234,7 @@
 </template>
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
+import { EnterprisesApi } from '@/api/enterprises'
 import { EnterpriseQualificationApi, EnterpriseQualificationVO } from '@/api/qualification'
 import { UserVO, getSimpleUserListByUserType } from '@/api/system/user'
 import EnterpriseQualificationForm from '@/views/qualification/EnterpriseQualificationForm.vue'
diff --git a/src/views/task/createEnterprise2.vue b/src/views/task/createEnterprise2.vue
index 49c7cdf..5228b0a 100644
--- a/src/views/task/createEnterprise2.vue
+++ b/src/views/task/createEnterprise2.vue
@@ -186,7 +186,7 @@
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
-import { TagLibraryVO, TagLibraryApi } from '@/api/system/taglibrary'
+import { TagLibraryApi } from '@/api/system/taglibrary'
 import { getSimpleUserZGList } from '@/api/system/user'
 const loading = ref(true) // 列表的加载中
 const emit = defineEmits(['update:modelValue', 'success'])
@@ -209,20 +209,11 @@ const enterprise = ref({
     inviterName: undefined,
     id: undefined,
     userId: undefined,
-    tagList: []
+    tagList: [],
+    isAudit: true
   }),
   total: ref(0)
 })
-const queryParams = ref({
-  enterprisesName: undefined,
-  hy: undefined,
-  st: undefined,
-  wr: undefined,
-  region: undefined,
-  userId: undefined,
-  // registrationNumber: undefined,
-  id: undefined
-})
 
 // 控制弹窗显示
 const visible = ref(false) // 弹窗的是否展示
@@ -261,6 +252,7 @@ async function getEnterPriseList() {
 
   console.log('enterprise.value.queryParams', enterprise.value.queryParams)
 
+
   if (enterprise.value.queryParams.hy || 
     enterprise.value.queryParams.st ||
     enterprise.value.queryParams.wr
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 3d8dc58..e0c8692 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -85,19 +85,19 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
-      <el-table-column label="发布时间" align="center" width="180px" prop="createTime" :formatter="dateFormatter"/>
-      <el-table-column label="任务状态" align="center" prop="status">
+      <el-table-column label="任务名称" align="left" prop="title" width="200"/>
+      <el-table-column label="任务状态" align="left" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.TASK_STATE" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="任务名称" align="center" prop="title" />
+     
       <!-- <el-table-column label="执行周期" align="center" prop="execCycle">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.TASK_EXEC_TIME" :value="scope.row.execCycle" />
         </template>
       </el-table-column> -->
-      <el-table-column label="任务类型" align="center" prop="taskType">
+      <el-table-column label="任务类型" align="left" prop="taskType">
         <template #default="scope">
         <el-tag>{{ scope.row.taskTypeName }}</el-tag>
         </template>
@@ -108,7 +108,7 @@
         </template>
       </el-table-column> -->
 
-      <el-table-column label="发布部门" align="center" prop="deptName" />
+      <el-table-column label="发布部门" align="left" prop="deptName" />
       <el-table-column
         label="开始时间"
         align="center"
@@ -128,7 +128,7 @@
         :formatter="dateFormatter"
         width="180px"
       /> -->
-      <el-table-column label="创建人" align="center" prop="createName" />
+      <el-table-column label="创建人" align="left" prop="createName" />
       <!-- <el-table-column label="父任务id" align="center" prop="parentId" />
       <el-table-column label="父子任务类型" align="center" prop="parentType">
         <template #default="scope">
@@ -137,7 +137,7 @@
       </el-table-column> -->
       <!-- <el-table-column label="执行到第几" align="center" prop="taskStep" /> -->
 
-      <el-table-column label="执法对象" align="center" min-width="50px">
+      <el-table-column label="执法对象" align="left" min-width="50px">
         <template #default="scope">
 
           <el-button link type="primary"   @click="
@@ -155,7 +155,7 @@
 
       </el-table-column>
 
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column label="" align="center" min-width="120px">
         <template #default="scope">
           <el-button
             link