feat(oa/crm): 实现出差申请交流反馈权限控制

- 添加用户角色列表管理功能
- 实现基于角色的交流过程与反馈字段可见性控制
- 集成tripCommView角色权限验证机制
- 支持申请人本人查看反馈内容
- 更新表格列显示逻辑增加角色权限判断
- 移除固定用户ID访问限制改为角色化控制
- 添加行程明细列表和创建人字段类型定义
- 注释掉无权限用户的反馈填写功能入口

src/api/oa/crm/businessTripApply/types.ts

@@ -117,6 +117,16 @@ export interface BusinessTripApplyVO {
    * 附件ID（多个用逗号分隔）
    */
   ossId: string | number;
+
+  /**
+   * 创建人
+   */
+  createBy?: string | number;
+
+  /**
+   * 交流过程与反馈
+   */
+  exchangeFeedback?: string;
 }
 
 export interface BusinessTripApplyForm extends BaseEntity {
@@ -268,6 +278,16 @@ export interface BusinessTripApplyForm extends BaseEntity {
    * 抄送人员ID列表
    */
   copyUserIds?: string | string[];
+
+  /**
+   * 交流过程与反馈
+   */
+  exchangeFeedback?: string;
+
+  /**
+   * 行程明细列表
+   */
+  crmBusinessTripDetailsList?: any[];
 }
 
 export interface BusinessTripApplyQuery extends PageQuery {

src/views/oa/crm/businessTripApply/edit.vue

@@ -432,30 +432,15 @@ const submitFormData = ref<StartProcessBo>({
 });
 const taskVariables = ref<Record<string, any>>({});
 
-// 业务方向负责人ID映射
-const BUSINESS_DIRECTION_LEADER_MAP: Record<number, string> = {
-  1: '1985254821554475009',
-  2: '1985258519835889666',
-  3: '1985251968270127105',
-  4: '1985257496048226305',
-  5: '1985254145713688578'
-};
-
-// 交流过程与反馈字段可见性：仅申请人、业务方向负责人、陈海军、张东辉可查看
+// 用户角色列表
+const userRoles = ref<string[]>([]);
+// "市场交流反馈查看"角色：拥有此角色的用户可查看交流过程与反馈
+const hasTripCommViewRole = computed(() => userRoles.value?.some((role) => role === 'tripCommView'));
+// 交流过程与反馈字段可见性：拥有角色 或 申请人本人
 const canViewFeedback = computed(() => {
+  if (hasTripCommViewRole.value) return true;
   const currentUserId = String(useUserStore().userId);
-  // 1. 申请人本人
   if (form.value.applicantId && currentUserId === String(form.value.applicantId)) return true;
-  // 2. 陈海军、张东辉（通过 userList 匹配）
-  const fixedNames = ['陈海军', '张东辉'];
-  const fixedIds = fixedNames
-    .map((name) => userList.value.find((u: any) => u.nickName === name))
-    .filter(Boolean)
-    .map((u: any) => String(u.userId));
-  if (fixedIds.includes(currentUserId)) return true;
-  // 3. 当前单据的业务方向负责人
-  const bd = Number(form.value.businessDirection);
-  if (bd && BUSINESS_DIRECTION_LEADER_MAP[bd] && currentUserId === BUSINESS_DIRECTION_LEADER_MAP[bd]) return true;
   return false;
 });
 
@@ -591,19 +576,25 @@ onMounted(async () => {
     const customerRes = await getCrmCustomerInfoList({});
     customerList.value = customerRes.data || [];
 
-    // 自动填充申请人信息
-    if (!id) {
-      try {
-        const infoRes = await getInfo();
+    // 始终获取当前用户角色（用于反馈字段可见性判断）
+    try {
+      const infoRes = await getInfo();
+      userRoles.value = infoRes.data?.roles || [];
+      // 新增时自动填充申请人信息
+      if (!id) {
         if (infoRes.data?.user) {
           form.value.applicantId = infoRes.data.user.userId;
           form.value.applicantName = infoRes.data.user.nickName;
           form.value.deptId = infoRes.data.user.deptId;
           form.value.deptName = infoRes.data.user.deptName;
         }
-      } catch (e) {
-        console.error('获取用户信息失败', e);
       }
+    } catch (e) {
+      console.error('获取用户信息失败', e);
+      userRoles.value = [];
+    }
+
+    if (!id) {
       // 从 index 页面传来 tripType
       if (routeParams.value.tripType) {
         form.value.tripType = routeParams.value.tripType;
@@ -635,7 +626,7 @@ onMounted(async () => {
             confirmCopyIds.push(String(matchedUser.userId));
           }
         });
-        
+
         // 追加：业务方向负责人的ID映射（与后台 SpelRuleComponent.java 保持一致）
         const BUSINESS_DIRECTION_TO_USERNAME: Record<number, string> = {
           1: '1985254821554475009',
@@ -648,7 +639,7 @@ onMounted(async () => {
         if (bd && BUSINESS_DIRECTION_TO_USERNAME[bd]) {
           confirmCopyIds.push(BUSINESS_DIRECTION_TO_USERNAME[bd]);
         }
-        
+
         // 兼容原有的手工可选抄送并做个去重合并
         form.value.copyUserIds = Array.from(new Set([...(form.value.copyUserIds || []), ...confirmCopyIds]));
         // 关键挂载：将整理完的抄送群放入该次提交时的全局工作流上下文引擎变量中
@@ -728,7 +719,7 @@ const projectInfoSelectCallBack = (data: ProjectInfoVO[]) => {
           }
           form.value.variables.approverId = String(selectedProject.managerId);
           handleApproverSelectChange(String(selectedProject.managerId));
-          proxy?.$modal.msgSuccess('已关联项目经理作为下一步审批人');
+          // proxy?.$modal.msgSuccess('已关联项目经理作为下一步审批人');
         }
       }
     }
@@ -948,7 +939,7 @@ const approvalVerifyOpen = async () => {
     if (!isValid) return;
 
     if (!aggregateDetailsToForm()) return;
-    
+
     buttonLoading.value = true;
     try {
       if (form.value.tripId) {

src/views/oa/crm/businessTripApply/index.vue

@@ -120,7 +120,14 @@
         </el-table-column>
         <el-table-column label="交流目的" align="center" prop="exchangePurpose" width="150" show-overflow-tooltip v-if="columns[17].visible" />
         <el-table-column label="会议/展会名称" align="center" prop="meetingName" width="150" show-overflow-tooltip v-if="columns[19].visible" />
-        <el-table-column label="交流过程与反馈" align="center" prop="exchangeFeedback" width="200" show-overflow-tooltip v-if="columns[20].visible">
+        <el-table-column
+          label="交流过程与反馈"
+          align="center"
+          prop="exchangeFeedback"
+          width="200"
+          show-overflow-tooltip
+          v-if="columns[20].visible && hasTripCommViewRole"
+        >
           <template #default="scope">
             <span v-if="canViewRowFeedback(scope.row)">{{ scope.row.exchangeFeedback }}</span>
             <span v-else style="color: #c0c4cc">-</span>
@@ -146,19 +153,19 @@
             <el-tooltip content="查看详情" placement="top" v-if="scope.row.flowStatus !== 'draft' && scope.row.flowStatus">
               <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip
-              content="填写反馈"
-              placement="top"
-              v-if="scope.row.tripStatus === '3' && (scope.row.tripType === '2' || scope.row.tripType === '3') && canViewRowFeedback(scope.row)"
-            >
-              <el-button
-                link
-                type="success"
-                icon="ChatDotRound"
-                @click="handleFeedback(scope.row)"
-                v-hasPermi="['oa/crm:businessTripApply:edit']"
-              ></el-button>
-            </el-tooltip>
+<!--            <el-tooltip-->
+<!--              content="填写反馈"-->
+<!--              placement="top"-->
+<!--              v-if="scope.row.tripStatus === '3' && (scope.row.tripType === '2' || scope.row.tripType === '3') && canViewRowFeedback(scope.row)"-->
+<!--            >-->
+<!--              <el-button-->
+<!--                link-->
+<!--                type="success"-->
+<!--                icon="ChatDotRound"-->
+<!--                @click="handleFeedback(scope.row)"-->
+<!--                v-hasPermi="['oa/crm:businessTripApply:edit']"-->
+<!--              ></el-button>-->
+<!--            </el-tooltip>-->
             <!--            <el-tooltip content="删除" placement="top">-->
             <!--              <el-button-->
             <!--                link-->
@@ -204,8 +211,21 @@ import { UserQuery, UserVO } from '@/api/system/user/types';
 import { allListDept, listDept } from '@/api/system/dept';
 import { DeptVO } from '@/api/system/dept/types';
 import { useUserStore } from '@/store/modules/user';
+import { getInfo } from '@/api/login';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const userRoles = ref<string[]>([]);
+// "市场交流反馈查看"角色
+const hasTripCommViewRole = computed(() => userRoles.value?.some((role) => role === 'tripCommView'));
+
+// 拥有角色 或 当前用户是该行数据的创建人
+const canViewRowFeedback = (row: BusinessTripApplyVO): boolean => {
+  if (hasTripCommViewRole.value) return true;
+  const currentUserId = String(useUserStore().userId);
+  if (row.createBy && currentUserId === String(row.createBy)) return true;
+  return false;
+};
 const { trip_status, trip_type, business_direction } = toRefs<any>(proxy?.useDict('trip_status', 'trip_type', 'business_direction'));
 
 const businessTripApplyList = ref<BusinessTripApplyVO[]>([]);
@@ -219,32 +239,6 @@ const router = useRouter();
 const userList = ref<UserVO[]>([]);
 const deptList = ref<DeptVO[]>([]);
 
-// 业务方向负责人ID映射
-const BUSINESS_DIRECTION_LEADER_MAP: Record<number, string> = {
-  1: '1985254821554475009',
-  2: '1985258519835889666',
-  3: '1985251968270127105',
-  4: '1985257496048226305',
-  5: '1985254145713688578'
-};
-
-// 逐行判断“交流过程与反馈”可见性：申请人、业务方向负责人、陈海军、张东辉
-const canViewRowFeedback = (row: BusinessTripApplyVO): boolean => {
-  const currentUserId = String(useUserStore().userId);
-  // 1. 申请人本人
-  if (row.applicantId && currentUserId === String(row.applicantId)) return true;
-  // 2. 陈海军、张东辉
-  const fixedIds = ['陈海军', '张东辉']
-    .map(name => userList.value.find((u: any) => u.nickName === name))
-    .filter(Boolean)
-    .map((u: any) => String(u.userId));
-  if (fixedIds.includes(currentUserId)) return true;
-  // 3. 业务方向负责人
-  const bd = Number(row.businessDirection);
-  if (bd && BUSINESS_DIRECTION_LEADER_MAP[bd] && currentUserId === BUSINESS_DIRECTION_LEADER_MAP[bd]) return true;
-  return false;
-};
-
 const queryFormRef = ref<ElFormInstance>();
 
 // 列显隐信息
@@ -380,6 +374,13 @@ const handleExport = () => {
 };
 
 onMounted(async () => {
+  // 获取当前用户角色
+  try {
+    const infoRes = await getInfo();
+    userRoles.value = infoRes.data?.roles || [];
+  } catch (e) {
+    userRoles.value = [];
+  }
   // 加载用户列表
   const userQuery = ref<UserQuery>();
   const userRes = await getUserList(userQuery.value);
@@ -391,10 +392,6 @@ onMounted(async () => {
   getList();
 });
 
-onActivated(() => {
-  getList();
-});
-
 // ============ 出差反馈相关 ============
 const feedbackDialogVisible = ref(false);
 const feedbackLoading = ref(false);
@@ -414,21 +411,21 @@ const feedbackRules = {
   exchangeFeedback: [{ required: true, message: '请填写交流过程与反馈', trigger: 'blur' }]
 };
 
-/** 填写反馈按钮操作 */
-const handleFeedback = (row: BusinessTripApplyVO) => {
-  feedbackForm.value = {
-    tripId: row.tripId,
-    applyCode: row.applyCode,
-    tripType: row.tripType,
-    applicantId: row.applicantId,
-    tripLocation: row.tripLocation,
-    startTime: row.startTime,
-    endTime: row.endTime,
-    durationDays: row.durationDays,
-    exchangeFeedback: row.exchangeFeedback || ''
-  };
-  feedbackDialogVisible.value = true;
-};
+// /** 填写反馈按钮操作 */
+// const handleFeedback = (row: BusinessTripApplyVO) => {
+//   feedbackForm.value = {
+//     tripId: row.tripId,
+//     applyCode: row.applyCode,
+//     tripType: row.tripType,
+//     applicantId: row.applicantId,
+//     tripLocation: row.tripLocation,
+//     startTime: row.startTime,
+//     endTime: row.endTime,
+//     durationDays: row.durationDays,
+//     exchangeFeedback: row.exchangeFeedback || ''
+//   };
+//   feedbackDialogVisible.value = true;
+// };
 
 /** 提交反馈 */
 const submitFeedback = async () => {