From a21bf2f755a105d7e911b31772727076a33f4d7b Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Fri, 29 Aug 2025 14:47:58 +0800
Subject: [PATCH 1/2] 0829

---
 .env.development                  |  2 +-
 src/views/ProjectScreen/index.vue |  1 -
 src/views/patch/index.vue         | 69 +++++++++++++++----------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/.env.development b/.env.development
index 500d6b0..16dfc46 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/src/views/ProjectScreen/index.vue b/src/views/ProjectScreen/index.vue
index 306c494..612dd7d 100644
--- a/src/views/ProjectScreen/index.vue
+++ b/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>
diff --git a/src/views/patch/index.vue b/src/views/patch/index.vue
index 1aaa708..1aa3400 100644
--- a/src/views/patch/index.vue
+++ b/src/views/patch/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="p-2">
     <!-- 搜索区域 -->
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -22,12 +21,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['patch:patch:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['patch:patch:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['patch:patch:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['patch:patch:export']">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -59,10 +56,10 @@
         <el-table-column label="任务状态" align="center" prop="taskStatus">
           <template #default="scope">
             <span
-              :class="[Number(scope.row.taskStatus) === 0 ? 'text-warning' : Number(scope.row.taskStatus) === 1 ? 'text-success' : 'text-danger']">
+              :class="[Number(scope.row.taskStatus) === 0 ? 'text-warning' : Number(scope.row.taskStatus) === 1 ? 'text-success' : 'text-danger']"
+            >
               {{
-                Number(scope.row.taskStatus) === 0 ? '未完成' : Number(scope.row.taskStatus) === 1 ? '已完成' :
-                  `未知状态(${scope.row.taskStatus})`
+                Number(scope.row.taskStatus) === 0 ? '未完成' : Number(scope.row.taskStatus) === 1 ? '已完成' : `未知状态(${scope.row.taskStatus})`
               }}
             </span>
           </template>
@@ -74,15 +71,13 @@
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['patch:patch:edit']"></el-button>
             </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['patch:patch:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['patch:patch:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
       <!-- 进度详情弹窗 -->
-      <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px"
-        destroy-on-close>
+      <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px" destroy-on-close>
         <div class="mb-4">
           <!-- v-hasPermi="['patch:progress:add']" -->
           <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
@@ -99,28 +94,37 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
             <template #default="scope">
               <el-tooltip content="修改进度" placement="top">
-                <el-button link type="primary" icon="Edit" size="small" @click="handleProgressUpdate(scope.row)"
-                  v-hasPermi="['patch:progress:edit']"></el-button>
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  size="small"
+                  @click="handleProgressUpdate(scope.row)"
+                  v-hasPermi="['patch:progress:edit']"
+                ></el-button>
               </el-tooltip>
               <el-tooltip content="删除进度" placement="top">
-                <el-button link type="primary" icon="Delete" size="small" @click="handleProgressDelete(scope.row)"
-                  v-hasPermi="['patch:progress:remove']"></el-button>
+                <el-button
+                  link
+                  type="primary"
+                  icon="Delete"
+                  size="small"
+                  @click="handleProgressDelete(scope.row)"
+                  v-hasPermi="['patch:progress:remove']"
+                ></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
       </el-dialog>
       <!-- 新增/修改进度弹窗 -->
-      <el-dialog :title="progressDialog.title" v-model="progressDialog.visible" width="500px" append-to-body
-        destroy-on-close>
+      <el-dialog :title="progressDialog.title" v-model="progressDialog.visible" width="500px" append-to-body destroy-on-close>
         <el-form ref="progressFormRef" :model="progressForm" :rules="progressRules" label-width="120px">
-          <el-input v-model="progressForm.ordersId" placeholder="关联的任务ID" readonly
-            style="color: #666; background: #f5f7fa" type="hidden" />
+          <el-input v-model="progressForm.ordersId" placeholder="关联的任务ID" readonly style="color: #666; background: #f5f7fa" type="hidden" />
           <el-input v-model="progressForm.projectId" type="hidden" />
           <el-input v-model="progressForm.slaveId" placeholder="请输入执行人ID" v-if="false" />
           <el-form-item label="进度" prop="progress">
-            <el-input v-model="progressForm.progress" placeholder="请输入进度（0-100之间的数字）" type="number"
-              @input="handleProgressInput" />
+            <el-input v-model="progressForm.progress" placeholder="请输入进度（0-100之间的数字）" type="number" @input="handleProgressInput" />
           </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="progressForm.remark" type="textarea" placeholder="请输入备注" rows="3" />
@@ -135,15 +139,13 @@
       </el-dialog>
 
       <!-- 分页组件 -->
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 新增/修改任务弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body destroy-on-close>
       <el-form ref="masterFormRef" :model="form" :rules="rules" label-width="100px">
-        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId"
-          :disabled="!!currentProjectId" v-if="false" />
+        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
         <template #help>
           <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
         </template>
@@ -152,17 +154,14 @@
         </el-form-item>
         <el-form-item label="执行人姓名" prop="userId">
           <el-select v-model="form.userId" placeholder="请选择执行人姓名" clearable style="width: 100%">
-            <el-option v-for="item in slaveOptions" :key="item.id" :label="item.nickName"
-              :value="item.userId"></el-option>
+            <el-option v-for="item in slaveOptions" :key="item.id" :label="item.nickName" :value="item.userId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="计划完成时间" prop="pcd">
-          <el-date-picker clearable v-model="form.pcd" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择计划完成时间" />
+          <el-date-picker clearable v-model="form.pcd" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择计划完成时间" />
         </el-form-item>
         <el-form-item label="实际完成时间" prop="act">
-          <el-date-picker clearable v-model="form.act" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择实际完成时间" />
+          <el-date-picker clearable v-model="form.act" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择实际完成时间" />
         </el-form-item>
         <el-form-item label="任务描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入任务描述" />
@@ -244,7 +243,7 @@ interface ProgressDetail {
   updateTime?: string;
   projectId?: string | number;
 }
-interface ProgressForm extends Omit<ProgressDetail, 'updateTime'> { }
+interface ProgressForm extends Omit<ProgressDetail, 'updateTime'> {}
 
 // 4. 获取组件实例
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -663,7 +662,7 @@ onUnmounted(() => {
   width: 120px !important;
 }
 
-.el-table-column .el-button--text+.el-button--text {
+.el-table-column .el-button--text + .el-button--text {
   margin-left: 10px;
 }
 </style>

From 31b00165cf19657136103406632c8d45fa0bef1b Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Fri, 29 Aug 2025 16:12:14 +0800
Subject: [PATCH 2/2] 1

---
 src/views/design/appointment/index copy 2.vue | 9 +++++++--
 src/views/design/appointment/index.vue        | 2 ++
 src/views/design/received/index.vue           | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/design/appointment/index copy 2.vue b/src/views/design/appointment/index copy 2.vue
index d87d820..8609bfd 100644
--- a/src/views/design/appointment/index copy 2.vue	
+++ b/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"
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 644b26b..4376db7 100644
--- a/src/views/design/appointment/index.vue
+++ b/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;
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index b28478f..51604eb 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -112,7 +112,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"