合并

src/views/materials/batchPlan/index.vue

@@ -206,7 +206,7 @@ const initFormData: any = {
     planCode: undefined,
     matCat: undefined,
     status: undefined,
-    projectId: currentProject.value.id
+    projectId: currentProject.value?.id
   },
 
   planList: [
@@ -230,13 +230,13 @@ const data = reactive({
       pageSize: 10,
       planCode: undefined,
 
-      projectId: currentProject.value.id
+      projectId: currentProject.value?.id
     },
     mainData: {
       pageNum: 1,
       pageSize: 10,
       mrpBaseId: undefined,
-      projectId: currentProject.value.id
+      projectId: currentProject.value?.id
     }
   },
   rules: {
@@ -316,7 +316,7 @@ const reset = () => {
   const status = form.value.mrpBaseBo.status;
   form.value = { ...initFormData, status }; // 重置但保留
   cailiaoshebeiFormRef.value?.resetFields();
-  form.value.mrpBaseBo.projectId = currentProject.value.id;
+  form.value.mrpBaseBo.projectId = currentProject.value?.id;
   form.value.planList = [
     {
       name: undefined,
@@ -385,7 +385,7 @@ const submitForm = async () => {
   await addCailiaoshebei({
     addDataList: cailiaoshebeiList.value,
     batchNumber: form.value.batchNumber,
-    projectId: currentProject.value.id
+    projectId: currentProject.value?.id
   } as any).finally(() => (buttonLoading.value = false));
   proxy?.$modal.msgSuccess('操作成功');
   dialog.visible = false;
@@ -466,7 +466,7 @@ onMounted(() => {
 
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value?.id,
   (nid, oid) => {
     queryParams.value.mainData.projectId = nid;