From cdb78111331cfee97c7001447b34361485f97e4f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 14 Jul 2024 19:07:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  4 ++-
 .../DetailComponent/FileComponent.vue         |  5 ---
 .../DetailComponent/ProjectApply.vue          | 35 ++++++++++---------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index dfe82e7..47666a8 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -405,7 +405,9 @@ html, body, #app, .el-container, .el-aside, .el-main {
 .nowrap {
   white-space: pre
 }
-
+.el-empty__description {
+  margin-top: 0!important;
+}
 //SvgIcon组件的样式
 .home-icon {
   width: 4em;
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index ebbbdc4..330bb56 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/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>
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 0283bb8..2471476 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/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