From 7b8e5f3b204bf71729eb01807238a0a05a729f0c Mon Sep 17 00:00:00 2001
From: wangxl <123456>
Date: Wed, 25 Dec 2024 14:09:17 +0800
Subject: [PATCH] eee

---
 src/views/components/common/fileLoad.vue      |  7 +++--
 .../project/components/memberImport.vue       |  2 +-
 .../project/components/projectMemberEdit.vue  | 27 ++++++++++---------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/components/common/fileLoad.vue b/src/views/components/common/fileLoad.vue
index 9a9ef51..a3bf2f2 100644
--- a/src/views/components/common/fileLoad.vue
+++ b/src/views/components/common/fileLoad.vue
@@ -7,7 +7,7 @@
       <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 4px;" />
     </div>
     <div v-else>
-      <a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: file.isRequired, message: '请上传附件',trigger: 'blur',}">
+      <a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: isRequired, message: '请上传附件',trigger: 'blur',}">
         <input type="file" :ref="name +'fileElem' + index" class="visually-hidden" @change="handleFiles(file, index)" />
         <a-button @click="fileSelect(index)"><a-icon type="upload" />选择文件</a-button>
       </a-form-model-item>
@@ -23,6 +23,7 @@ export default {
   },
   data () {
     return {
+      isRequired: true
     };
   },
   props: {
@@ -52,7 +53,9 @@ export default {
     },
   },
   created () {
-
+    if (this.file.isRequired != null && this.file.isRequired != undefined) {
+      this.isRequired = this.file.isRequired
+    }
   },
   methods: {
     deletefile (obj) {
diff --git a/src/views/report/project/components/memberImport.vue b/src/views/report/project/components/memberImport.vue
index b41d2cb..cbaef56 100644
--- a/src/views/report/project/components/memberImport.vue
+++ b/src/views/report/project/components/memberImport.vue
@@ -114,7 +114,7 @@ export default {
             this.errorState = true
           }
           let member = {
-            name: e.姓名, birthday: birthday, sex: gender, title: title, titleName: e.职称, degree: degree, degreeName: e.学位, workUnit: e.工作单位, mobile: e.手机号, email: e.电子邮箱, certId: certId, projWork: e.项目分工, forMonths: e.每年工作, msg: msg, fileId: null, downloadId: null, fileName: null, downloadUrl: null
+            name: e.姓名, birthday: birthday, sex: gender, title: title, titleName: e.职称, degree: degree, degreeName: e.学位, workUnit: e.工作单位, mobile: e.手机号, email: e.电子邮箱, certId: certId, projWork: e.项目分工, forMonths: e.每年工作, msg: msg, fileId: null, downloadId: null, fileName: null, downloadUrl: null, isRequired: true
           }
           memberList.push(member)
         })
diff --git a/src/views/report/project/components/projectMemberEdit.vue b/src/views/report/project/components/projectMemberEdit.vue
index 749f353..31dfda1 100644
--- a/src/views/report/project/components/projectMemberEdit.vue
+++ b/src/views/report/project/components/projectMemberEdit.vue
@@ -201,89 +201,89 @@
         <a-col :span="1">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
         <a-col :span="1">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
         <a-col :span="2">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
         <a-col :span="1">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="2">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="2">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="2">
           <div class="special-middle">
             <div>
-             
+
             </div>
           </div>
         </a-col>
         <a-col :span="2">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
         <a-col :span="4">
           <div class="special-middle">
-            
+
           </div>
         </a-col>
         <a-col :span="3">
           <div class="special-middle">
             <div>
-              
+
             </div>
           </div>
         </a-col>
@@ -315,6 +315,7 @@ import moment from 'moment'
 
 const Member = {
   name: null, birthday: null, sex: null, title: null, titleName: null, degree: null, degreeName: null, workUnit: null, mobile: null, email: null, certId: null, projWork: null, forMonths: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null
+  , isRequired: true
 }
 
 export default {
-- 
2.18.0