From 75b1da21196cca7fd538f8b95dd19df081ed0489 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 23 Aug 2024 13:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=20?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interferenceUserTable.vue                 | 21 ++++++++++---------
 .../components/undocumented/index.vue         |  5 +++--
 src/views/system/bpm/task/todo/index.vue      | 12 +++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index 520f2ab7..5e32ca75 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -93,6 +93,15 @@ const tableStore = new TableStore({
     column: [
         { title: '序号', type: 'seq', width: 80 },
         { field: 'city', title: '所在地市', minWidth: 80 },
+        {
+            field: 'substation',
+            title: '厂站名称',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
         { field: 'projectName', title: '项目名称', minWidth: 170 },
         {
             field: 'userType',
@@ -103,7 +112,7 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
-        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
             title: '用户状态',
@@ -144,15 +153,7 @@ const tableStore = new TableStore({
                 null: '/'
             }
         },
-        {
-            field: 'substation',
-            title: '厂站名称',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
-            }
-        },
+
         {
             title: '详细信息',
             minWidth: 100,
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index f584c97f..9fd4b686 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -38,7 +38,7 @@
     <!-- 上传 -->
     <Audit ref="AuditRef" @onSubmit="tableStore.index()" />
     <!-- 查看详情 detail 新增/修改 create-->
-    <addForm ref="addForms" @onSubmit="tableStore.index()"   ></addForm>
+    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, watch } from 'vue'
@@ -81,7 +81,7 @@ const tableStore = new TableStore({
         {
             field: 'city',
             title: '所在地市',
-            minWidth: 80,
+            minWidth: 80
             // formatter: (obj: any) => {
             //     return areaOptionList.filter(item => item.id == obj.row.city)[0]?.name
             // }
@@ -105,6 +105,7 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
             title: '用户状态',
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index cb6fdbac..ed2dc057 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -40,16 +40,16 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '任务名称', field: 'processInstance.name', width: 200 },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 200 },
         { title: '任务内容', field: 'instanceSign', minWidth: 300 },
-        { title: '发起人', field: 'processInstance.startUser.name', width: 120 },
-        { title: '发起部门', field: 'processInstance.startUser.deptName', width: 120 },
-        { title: '发起时间', field: 'createTime', width: 180 },
-        { title: '当前任务', field: 'name', width: 140 },
+        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 120 },
+        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 120 },
+        { title: '发起时间', field: 'createTime', minWidth: 180 },
+        { title: '当前任务', field: 'name', minWidth: 140 },
         {
             title: '操作',
             align: 'center',
-            width: 100,
+            minWidth: 100,
             render: 'buttons',
             buttons: [
                 {