合并

src/views/cory/workMessage/index.vue

@@ -271,7 +271,7 @@ const getList = async () => {
   tableData.value = res.rows;
   total.value = res.total || 0;
   // 获取项目班组信息
-  const teamRes = await listProjectTeamForeman(currentProject.value.id);
+  const teamRes = await listProjectTeamForeman(currentProject.value?.id);
   teamList.value = teamRes.data;
   teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
     label: team.teamName,
@@ -308,7 +308,7 @@ const resetForm = () => {
 };
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value?.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;