Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/components/NomMarkerWord.vue

@@ -192,7 +192,6 @@
                       resize="none"
                       placeholder="小型仪器设备费"
                       v-model.number="wordData['fund']['device']"
-                      @change="checkProjectFund('device')"
                       ></el-input>
               </td>
               <td colspan="5">
@@ -207,8 +206,7 @@
                       autosize
                       resize="none"
                       placeholder="材料费"
-                      v-model.number="wordData['fund']['Material']"
-                      @change="checkProjectFund('Material')"></el-input>
+                      v-model.number="wordData['fund']['Material']"></el-input>
               </td>
               <td colspan="5">项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</td>
             </tr>
@@ -220,7 +218,6 @@
                       autosize
                       resize="none"
                       placeholder="测试化验加工费"
-                      @change="checkProjectFund('processing')"
                       v-model.number="wordData['fund']['processing']"></el-input>
               </td>
               <td colspan="5">项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</td>
@@ -233,7 +230,6 @@
                       autosize
                       resize="none"
                       placeholder="项目协作费"
-                      @change="checkProjectFund('Collaboration')"
                       v-model.number="wordData['fund']['Collaboration']"></el-input>
               </td>
               <td colspan="5">按合同规定支付给协作单位的费用</td>
@@ -247,7 +243,6 @@
                       autosize
                       resize="none"
                       placeholder="项目成果鉴定费"
-                      @change="checkProjectFund('APPRAISAL')"
                       v-model.number="wordData['fund']['APPRAISAL']"></el-input>
               </td>
               <td colspan="5">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
@@ -260,7 +255,6 @@
                       autosize
                       resize="none"
                       placeholder="参展参赛费"
-                      @change="checkProjectFund('entery')"
                       v-model.number="wordData['fund']['entery']"></el-input>
               </td>
               <td colspan="5">参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</td>
@@ -273,7 +267,6 @@
                       autosize
                       resize="none"
                       placeholder="创客交流活动费"
-                      @change="checkProjectFund('activities')"
                       v-model.number="wordData['fund']['activities']"></el-input>
               </td>
               <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
@@ -286,7 +279,6 @@
                       autosize
                       resize="none"
                       placeholder="知识产权事务费"
-                      @change="checkProjectFund('Transaction')"
                       v-model.number="wordData['fund']['Transaction']">
                     </el-input>
               </td>

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -558,17 +558,17 @@
                     this.ProjectEndFile = FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'';
                     if(this.ProjectEndFile!=null && this.ProjectEndFile!='')this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
+                    console.log(FormData[4][0]);
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
-                            // item['chapter'] = JSON.parse(item['chapter']);
                             if(item['reportFile']!=null&&item['reportFile']!=''){
                                 item['reportFile'] = JSON.parse(item['reportFile']);
-                                this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                                if(item['reportFile'].length!=0)this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                                else this.ActivityLookFile.push({url:"",type:""})
                             }else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
-                    console.log(this.AllActivity)
                     // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
                     this.loading = false;
                 }).catch(err=>{