From 0d7c3033973dd765b477dba90cd321f45cf30674 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 00:38:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auth/index.vue                          |  1 -
 src/views/expense-management/share/add.vue        |  6 ++++--
 src/views/project-demand/requirement/add.vue      | 15 ++++++++++-----
 src/views/project-demand/summary/add.vue          |  7 ++++---
 .../project-management/implementation/check.vue   |  6 ++++--
 .../project-management/implementation/upload.vue  |  3 ++-
 .../implementation/uploadFee.vue                  |  3 ++-
 src/views/project-management/initiation/apply.vue |  3 ++-
 src/views/special-fund/add.vue                    |  3 ++-
 9 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index dda3c87..7adfb49 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -95,7 +95,6 @@
               </el-form>
             </el-tab-pane>
           </el-tabs>
-
         </el-card>
       </el-col>
     </el-row>
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 28dbf61..2730e08 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -279,11 +279,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
@@ -326,11 +327,12 @@ const handleResubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let newUsrAllocationsObj = {}
     let newUsrAllocationsObjArray = []
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index cdb13c4..11ff89f 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData"  ref="demandForm" :rules="rules">
+    <el-form :model="formData" ref="demandForm" :rules="rules">
       <el-row gutter="30">
         <el-col :span="8">
           <el-form-item label="征集名称" prop="requirementName" label-width="96">
@@ -42,7 +42,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable >
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -58,7 +58,10 @@
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
             </div>
-            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
+            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{
+                getName(selectedCompanyList)
+              }}
+            </div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
@@ -365,14 +368,16 @@ const submitParam = (item) => {
   }
 }
 const handleSubmit = async (instance) => {
+  console.log('submitParam(formData.value)', submitParam(formData.value))
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     const {msg, code} = await addRequirement(submitParam(formData.value))
     ElNotification({
@@ -427,7 +432,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
       formData.value = res.data
-      if(res.data.fileList.length!==0){
+      if (res.data.fileList.length !== 0) {
         showTable.value = false
         nextTick(() => {
           showTable.value = true
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 6d19535..a76ba5c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -214,7 +214,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="16" v-if="formData.isSpecialFund">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -294,7 +294,7 @@ const formData = ref({
 
 const rules = reactive({
   projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
-  // specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
   startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}],
   endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}],
   rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}],
@@ -401,11 +401,12 @@ const handleSubmit = debounce(async (instance) => {
   if (!instance) return
   instance.validate(async (valid, fields) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let otherFiles = []
     otherFileList.value.forEach(item => {
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 1d10b04..588f6d6 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -89,11 +89,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let files = []
     otherFileList.value.forEach(item => {
@@ -139,11 +140,12 @@ const handleResubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let otherFiles = []
     if (name.value === 'Implementation/edit') {
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 6a2a087..262e2d1 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -183,11 +183,12 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let params = {
       fileList: fileList.value,
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 4ab7af2..dff4c25 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -173,11 +173,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     instance.clearValidate()
     tableForm.tableData.forEach(item => {
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 600263c..c39704d 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -138,11 +138,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let files = []
     otherFileList.value.forEach(item => {
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index d287762..b37cd65 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -189,11 +189,12 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     const {msg, code} = await addFund(submitParam(formData.value))
     ElNotification({