Merge pull request 'fix : 修复项目立项校验' (#548) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/548

src/components/DetailComponent/FileComponent.vue

@@ -162,8 +162,3 @@ watch(() => props.processViewer, (newVal) => {
 }, {deep: true})
 </script>
 
-<style scoped>
-:deep(.el-table--fit ) {
-  height: 300px !important;
-}
-</style>

src/components/DetailComponent/ProjectApply.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="apply-block">
-    <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
+    <el-form :model="localFormData" ref="formRef" label-width="auto"  v-if="step!=='50'">
       <el-row>
         <el-col :span="24" v-if="title==='apply'">
           <el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
@@ -257,8 +257,6 @@ const handleShowProjectChargePersonTable = () => {
   projectChargePersonUserPicker.value.showUserPicker()
 }
 const projectChargePersonUserPickerOk = (userList) => {
-  console.log('dsfsdfs',formRef.value,formRef.value?.validateField('projectChargePerson'))
-
   projectChargePersonUserList.value = userList
 }
 const handleShowProjectPersonTable = () => {
@@ -271,8 +269,6 @@ const projectPersonUserPickerOk = (userList) => {
   for (const user of userList) {
     userIds.push(user.id)
   }
-  // localFormData.value.projectPersonIds = userIds
-  console.log(userList, projectPersonUserList.value)
 }
 const getPreProcessList = () => {
   loading.value = true
@@ -310,7 +306,6 @@ const choosePreProcess = () => {
     preProcessArray.push(preProcessObj)
   })
   localFormData.value.preProcess = preProcessArray
-  // console.log('localFormData.value.preProcess', localFormData.value.preProcess)
   showPreTable.value = false
 }
 
@@ -377,16 +372,6 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-  // if (!instance) return
-  // instance.validate(async (valid) => {
-  //   if (!valid) {
-  //     ElNotification({
-  //       title: '提示',
-  //       message: '请完善数据,再提交!',
-  //       type: 'error'
-  //     })
-  //     return;
-  //   }
     if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
       if (localFormData.value.preProcess === undefined) {
         ElNotification({
@@ -394,8 +379,25 @@ const handleSubmit = async () => {
           message: '请选择前置流程!',
           type: 'error'
         })
+        return;
       }
     }
+    if(projectChargePersonUserList.value&&projectChargePersonUserList.value.length===0){
+      ElNotification({
+        title: '提示',
+        message: '请选择项目负责人!',
+        type: 'error'
+      })
+      return;
+    }
+    if(projectPersonUserList.value&&projectPersonUserList.value.length===0){
+      ElNotification({
+        title: '提示',
+        message: '请选择项目成员!',
+        type: 'error'
+      })
+      return;
+    }
     let files = []
     if (props.mode === 'resubmit') {
       attachment.value.allFileList.forEach(item => {
@@ -473,7 +475,6 @@ const handleSubmit = async () => {
         })
       }
     }
-  // })
 }
 const init = async () => {
   let id = projectId.value