解决冲突

src/views/ProjectScreen/index.vue

@@ -14,7 +14,6 @@ import Header from './components/header.vue';
 import leftPage from './components/leftPage.vue';
 import centerPage from './components/centerPage.vue';
 import rightPage from './components/rightPage.vue';
-
 </script>
 
 <style lang="scss" scoped>

src/views/design/appointment/index copy 2.vue

@@ -5,7 +5,12 @@
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
         <p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
-        <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
+        <el-button
+          @click="disabledForm = false"
+          v-hasPermi="['design:user:list']"
+          class="px-8 py-2.5 transition-all duration-300 font-medium"
+          v-if="disabledForm"
+        >
           点击编辑
         </el-button>
       </div>
@@ -220,7 +225,7 @@
         </div>
 
         <!-- 提交按钮区域 -->
-        <div  class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
+        <div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
           <el-button
             type="primary"
             size="large"

src/views/design/appointment/index.vue

@@ -436,6 +436,8 @@ const disabledForm = ref(true); // 初始禁用表单（编辑时开启）
 
 /** 查询当前部门的所有用户（确保用户列表有效） */
 const getDeptAllUser = async (deptId: number | undefined) => {
+  console.log(1111111111111);
+
   if (!deptId) {
     ElMessage.warning('请先选择部门');
     return;

src/views/design/received/index.vue

@@ -114,7 +114,7 @@
           <el-button
             type="primary"
             @click="submitForm"
-            v-hasPermi="['design:collect:add']"
+            v-hasPermi="['design:collect:batch']"
             v-if="!form.id || form.status == 'draft'"
             size="large"
             class="px-8 transition-all hover:bg-blue-600"