Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

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) {

src/views/report/project/components/fileEdit.vue

@@ -57,19 +57,19 @@
         {{ index + 1 }}
       </a-col>
       <a-col :span="6">
-        <div class="special-middle" v-if="index <= 10">{{ item.fileExplain }}</div>
+        <div class="special-middle" v-if="item.required">{{ item.fileExplain }}</div>
         <a-form-model-item v-else :prop="'fileList.' + index + '.fileExplain'" :rules="{required: item.isRequired, message: '*',trigger: 'blur',}">
-          <a-input v-model="item.fileExplain" :maxLength="100" style="width: 100%" :disabled="item.required" />
+          <a-input v-model="item.fileExplain" :maxLength="100" style="width: 100%" />
         </a-form-model-item>
       </a-col>
       <a-col :span="2">
         <div class="special-middle" style="text-align: center;">
-          <div>{{ item.isRequired == true ? "是" : "否" }}</div>
+          <div>{{ item.isRequired == true && item.required ? "是" : "否" }}</div>
         </div>
       </a-col>
       <a-col :span="12" style="text-align: left;">
         <div class="special-middle" style="text-align: left;">
-          <file-load :file.sync="fileList[index]" :index="index" :name="'fileList'" :format="['doc', 'docx', 'pdf']"/>
+          <file-load :file.sync="fileList[index]" :index="index" :name="'fileList'" :format="['doc', 'docx', 'pdf']" />
         </div>
       </a-col>
       <a-col :span="2">
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-const File = { fileName: null, downloadUrl: null, fileExplain: null, downloadId: null, isRequired: false, required: false };
+const File = { fileName: null, downloadUrl: null, fileExplain: null, downloadId: null, isRequired: true, required: false };
 
 export default {
   name: "fileEdit",

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)
         })

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 {