From e68b6444b1b1b0be390d84da03d44ab0179d0608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 28 Feb 2025 10:35:35 +0800
Subject: [PATCH] =?UTF-8?q?0.5.4=20=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=8F=AF=E5=88=9B=E5=BB=BA=E5=B1=9E=E4=BA=8E=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Business/Dept/DeptSelect.vue   |  1 -
 src/components/Dashboard/StatCard.vue         |  2 +-
 src/utils/enums.js                            |  5 ++
 src/views/bst/customer/edit/index.vue         |  4 +-
 .../bst/task/components/TaskEditDialog.vue    | 46 ++++++++++++++-----
 src/views/bst/task/index.vue                  |  4 +-
 src/views/bst/task/mixins.js                  | 28 +++++++++--
 7 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/src/components/Business/Dept/DeptSelect.vue b/src/components/Business/Dept/DeptSelect.vue
index dd85f35..7d90038 100644
--- a/src/components/Business/Dept/DeptSelect.vue
+++ b/src/components/Business/Dept/DeptSelect.vue
@@ -69,7 +69,6 @@ export default {
     getOptions() {
       listDept().then(response => {
         this.options = this.handleTree(response.data, "deptId", "parentId", "children");
-        console.log(this.options);
       });
     },
   }
diff --git a/src/components/Dashboard/StatCard.vue b/src/components/Dashboard/StatCard.vue
index 1163088..97190e8 100644
--- a/src/components/Dashboard/StatCard.vue
+++ b/src/components/Dashboard/StatCard.vue
@@ -54,7 +54,7 @@ export default {
     },
     mainValue: {
       type: Number,
-      required: true
+      default: null,
     },
     mainLabel: {
       type: String,
diff --git a/src/utils/enums.js b/src/utils/enums.js
index 58cbe04..48f6368 100644
--- a/src/utils/enums.js
+++ b/src/utils/enums.js
@@ -137,3 +137,8 @@ export const BriefKeys = {
   CUSTOMER_SOON_FOLLOW: "customerSoonFollow", // 即将需要跟进的客户
 }
 
+// 角色
+export const Role = {
+  SYS_ADMIN: "sys_admin", // 系统管理员
+  ADMIN: "admin", // 管理员
+}
diff --git a/src/views/bst/customer/edit/index.vue b/src/views/bst/customer/edit/index.vue
index 4673e15..fec4cf8 100644
--- a/src/views/bst/customer/edit/index.vue
+++ b/src/views/bst/customer/edit/index.vue
@@ -92,7 +92,7 @@
 <script>
 import { getCustomer, addCustomer, updateCustomer } from "@/api/bst/customer";
 import FormCol from "@/components/FormCol/index.vue";
-import { CustomerStatus, CustomerIntentLevel } from '@/utils/enums';
+import { CustomerStatus, CustomerIntentLevel, Role } from '@/utils/enums';
 import { mapGetters } from 'vuex';
 import UserSelect from '@/components/Business/User/UserSelect.vue';
 import CustomerFollowForm from '@/views/bst/customerFollow/components/CustomerFollowForm.vue';
@@ -149,7 +149,7 @@ export default {
     ...mapGetters(['userId']),
     // 禁用选择跟进人的情况
     disabledFollowUser() {
-      return !checkRole(['sys_admin', 'admin']);
+      return !checkRole([Role.SYS_ADMIN, Role.ADMIN]);
     },
     title() {
       return this.id ? '修改客户' : '新增客户';
diff --git a/src/views/bst/task/components/TaskEditDialog.vue b/src/views/bst/task/components/TaskEditDialog.vue
index e7899ce..09d53ae 100644
--- a/src/views/bst/task/components/TaskEditDialog.vue
+++ b/src/views/bst/task/components/TaskEditDialog.vue
@@ -8,7 +8,7 @@
     @close="handleClose"
     @open="handleOpen"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px" v-loading="loading">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px" v-loading="loading">
       <el-row>
         <form-col :span="24" label="项目" prop="projectId">
           <project-select v-model="form.projectId" :disabled="initData.projectId != null" @change="onChangeProject"/>
@@ -54,9 +54,11 @@
 import { getTask, addTask, updateTask } from "@/api/bst/task";
 import FormCol from "@/components/FormCol/index.vue";
 import ProjectSelect from '@/components/Business/Project/ProjectSelect.vue';
-import { TaskType, TaskLevel } from '@/utils/enums';
+import { TaskType, TaskLevel, Role } from '@/utils/enums';
 import UserSelect from '@/components/Business/User/UserSelect.vue';
 import { FileType } from '@/utils/constants';
+import { checkRole } from '@/utils/permission';
+import { mapGetters } from 'vuex';
 
 export default {
   name: "TaskEditDialog",
@@ -107,6 +109,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['userId']),
     title() {
       return this.id ? '修改任务' : '新增任务';
     },
@@ -120,19 +123,38 @@ export default {
     }
   },
   methods: {
+    /**
+     * 过滤可选择的负责人列表
+     * @param {Array} data 用户列表数据
+     * @returns {Array} 过滤后的用户列表
+     */
     filterOwnerMethod(data) {
-      console.log("filterOwnerMethod", data, this.form);
-      if (this.form.projectId == null) {
-        return data;
+      // 如果选择了项目,需要判断项目相关人员是否存在
+      if (this.form.projectId) {
+        const { projectOwnerId, projectFollowId, projectMemberIds } = this.form;
+        
+        // 项目相关人员信息不完整时返回空数组
+        if (!projectOwnerId || !projectFollowId || !projectMemberIds) {
+          return [];
+        }
+
+        // 获取项目相关人员ID列表(负责人、跟进人、成员)
+        const projectUserIds = [
+          projectOwnerId,
+          projectFollowId,
+          ...projectMemberIds
+        ].filter(Boolean);
+
+        // 过滤出项目相关人员
+        data = data.filter(item => projectUserIds.includes(item.userId));
       }
-      if (this.form.projectOwnerId == null || this.form.projectFollowId == null || this.form.projectMemberIds == null) {
-        return [];
+
+      // 非管理员只能选择自己
+      if (!checkRole([Role.SYS_ADMIN, Role.ADMIN])) {
+        data = data.filter(item => item.userId === this.userId);
       }
-      // 过滤，项目负责人、项目跟进人、项目成员
-      let userList = data.filter(item => {
-        return item.userId === this.form.projectOwnerId || item.userId === this.form.projectFollowId || this.form.projectMemberIds.includes(item.userId);
-      });
-      return userList;
+
+      return data;
     },
     onChangeProject(project) {
       this.form.projectOwnerId = project.ownerId;
diff --git a/src/views/bst/task/index.vue b/src/views/bst/task/index.vue
index 4c2fb5c..1cf627e 100644
--- a/src/views/bst/task/index.vue
+++ b/src/views/bst/task/index.vue
@@ -164,14 +164,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-has-permi="['bst:task:edit']"
+            v-if="canEdit(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-has-permi="['bst:task:remove']"
+            v-if="canDel(scope.row)"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/bst/task/mixins.js b/src/views/bst/task/mixins.js
index 937153c..f12cbea 100644
--- a/src/views/bst/task/mixins.js
+++ b/src/views/bst/task/mixins.js
@@ -1,5 +1,5 @@
-import { TaskStatus } from '@/utils/enums';
-import { checkPermi } from '@/utils/permission';
+import { Role, TaskStatus } from '@/utils/enums';
+import { checkPermi, checkRole } from '@/utils/permission';
 import { mapGetters } from 'vuex';
 export const $task = {
   computed: {
@@ -17,7 +17,8 @@ export const $task = {
     canCancel() {
       return (row) => {
         return checkPermi(['bst:task:cancel']) 
-          && TaskStatus.canCancel().includes(row.status);
+          && TaskStatus.canCancel().includes(row.status)
+          && (checkRole([Role.SYS_ADMIN, Role.ADMIN]) || this.isCreator(row));
       }
     },
     // 是否可以完成
@@ -26,6 +27,27 @@ export const $task = {
         return checkPermi(['bst:task:pass']) 
           && TaskStatus.canPass().includes(row.status);
       }
+    },
+    // 是否可以修改
+    canEdit() {
+      return (row) => {
+        return checkPermi(['bst:task:edit']) 
+          && (checkRole([Role.SYS_ADMIN, Role.ADMIN]) || this.isCreator(row));
+      }
+    },
+    // 是否可以删除
+    canDel() {
+      return (row) => {
+        return checkPermi(['bst:task:remove']) 
+          && (checkRole([Role.SYS_ADMIN, Role.ADMIN]) || this.isCreator(row));
+      }
+    },
+    // 是否是创建者
+    isCreator() {
+      return (row) => {
+        console.log("isCreator", row, this.userId);
+        return row.createId === this.userId;
+      }
     }
   }
 }
\ No newline at end of file