From eb291fa45dbbbe586a1b2675df88d9fa0d2ba592 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 9 Apr 2026 14:14:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(timesheet):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E8=A1=A8=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将项目号列改为下拉选择框，支持项目号筛选
- 添加项目名称列作为独立的下拉选择框
- 更新选择框的标签显示为项目代码和项目名称
- 修正部门字段验证规则的多余逗号问题
- 优化项目选择变更事件处理逻辑
---
 src/views/oa/erp/timesheetInfo/edit.vue | 26 +++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/oa/erp/timesheetInfo/edit.vue b/src/views/oa/erp/timesheetInfo/edit.vue
index 111eede..09047b7 100644
--- a/src/views/oa/erp/timesheetInfo/edit.vue
+++ b/src/views/oa/erp/timesheetInfo/edit.vue
@@ -183,12 +183,28 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="序号" type="index" width="55" align="center" />
 
+        <el-table-column label="项目号" prop="projectId" width="180" align="center">
+          <template #default="scope">
+            <el-select
+              v-model="scope.row.projectId"
+              placeholder="请选择项目号"
+              filterable
+              clearable
+              style="width: 100%"
+              :disabled="isReadOnly"
+              @change="(val) => handleProjectWorkChange(val, scope.row)"
+            >
+              <el-option v-for="item in projectOptions" :key="item.projectId" :label="item.projectCode" :value="item.projectId" />
+            </el-select>
+          </template>
+        </el-table-column>
+
         <!-- 项目名称  -->
         <el-table-column label="项目名称" prop="projectId" min-width="250" align="center">
           <template #default="scope">
             <el-select
               v-model="scope.row.projectId"
-              placeholder="请选择项目"
+              placeholder="请选择项目名称"
               filterable
               clearable
               style="width: 100%"
@@ -200,12 +216,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="项目号" prop="projectCode" width="150" align="center">
-          <template #default="scope">
-            <el-input v-model="scope.row.projectCode" disabled placeholder="自动关联" />
-          </template>
-        </el-table-column>
-
         <el-table-column label="部门" prop="deptId" width="150" align="center">
           <template #default="scope">
             <el-input :model-value="getDeptName(scope.row.deptId)" disabled placeholder="自动关联" />
@@ -304,7 +314,7 @@ const data = reactive({
     // timesheetCode: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
     startTime: [{ required: true, message: '请选择起始日期', trigger: 'change' }],
     endTime: [{ required: true, message: '请选择结束日期', trigger: 'change' }],
-    deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
+    deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }]
   }
 });