修改必填项

src/renderer/src/views/project/admin/create.vue

@@ -70,7 +70,7 @@
                 </el-col -->
             </el-row>
         </el-form>
-        <el-form :model="baseForm" label-position="left" label-width="81" size="large">
+        <el-form ref="formRef2" :model="baseForm" label-position="left" label-width="81" size="large" :rules="baseFormRules2"> 
             <el-row :gutter="20">
                 <el-col :span="6">
                     <el-form-item label="开工年:" prop="startYear">
@@ -249,6 +249,31 @@ const baseFormRules = {
         trigger: 'blur',
         message: '请选择项目类型',
     },
+    startYear: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择开工年',
+    },
+    endYear: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择完工年',
+    },
+
+}
+const formRef2 = ref(null)
+const baseFormRules2 = {
+
+    startYear: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择开工年',
+    },
+    endYear: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择完工年',
+    },
 
 }
 const unitSelect = ref('')
@@ -399,8 +424,13 @@ const createClick = async () => {
         let yearForm = ele.yearForm
         list.push(yearForm)
     })
+    // const isValidate = await formValidate(formRef.value)
+    // if (!isValidate) return false
     const isValidate = await formValidate(formRef.value)
-    if (!isValidate) return false
+    const isValidate2 = await formValidate(formRef2.value)
+
+    
+    if (!isValidate || !isValidate2) return false
     creatLoading.value = true
     //发起请求
     const { error, code, msg } = await mainApi.add({
@@ -441,7 +471,10 @@ const saveClick = async () => {
         list.push(yearForm)
     })
     const isValidate = await formValidate(formRef.value)
-    if (!isValidate) return false
+    const isValidate2 = await formValidate(formRef2.value)
+    console.log(isValidate2, 'isValidate2')
+    
+    if (!isValidate && !isValidate2) return false
     creatLoading.value = true
     //发起请求
     const { error, code, msg } = await mainApi.update({