合并

src/views/project/landTransfer/BasicData/landBlock/index.vue

@@ -14,7 +14,7 @@
               <el-input v-model="queryParams.villageCommittee" placeholder="请输入所属村委会" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="设计面积(亩)" prop="designArea">
-              <el-input v-model="queryParams.designArea" type="number"  placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.designArea" type="number" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="地块数(块)" prop="blockCount">
               <el-input v-model="queryParams.blockCount" type="number" placeholder="请输入地块数" clearable @keyup.enter="handleQuery" />
@@ -183,7 +183,7 @@ const dialogMatrix = reactive<DialogOption>({
 
 const initFormData: LandBlockForm = {
   id: undefined,
-  projectId: currentProject.value.id,
+  projectId: currentProject.value?.id,
   landCode: undefined,
   landName: undefined,
   villageCommittee: undefined,
@@ -200,7 +200,7 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: currentProject.value.id,
+    projectId: currentProject.value?.id,
     landCode: undefined,
     landName: undefined,
     villageCommittee: undefined,
@@ -305,7 +305,7 @@ const handleDelete = async (row?: LandBlockVO) => {
 // 获取方阵列表
 const getfangzhenList = async () => {
   loading.value = true;
-  const res = await subMatrix(currentProject.value.id);
+  const res = await subMatrix(currentProject.value?.id);
   res.data.forEach((item) => {
     item.children.forEach((item2) => {
       item2.matrixId = item2.name + '_' + item2.matrixId;
@@ -380,7 +380,7 @@ const resetMatrix = () => {
 };
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value?.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     getfangzhenList();