#

src/views/fundManage/makerfundDetails.vue

@@ -186,7 +186,7 @@ export default {
                 fid:this.$route.query['Id'],
                 aid:this.$route.query['paid'],
             }
-            console.log(param);
+            // console.log(param);
             this.ajax
             .get(this.$store.state.api+'/selectActivityFundDetail',param)
             .then(res=>{
@@ -267,7 +267,7 @@ export default {
 
 
                 // 实际使用
-                if (data['actualuse']!=null) {
+                if (data[1][0]['actualuse']!=null) {
                     this.fundList[0].actualuse=actualuse.device
                     this.fundList[1].actualuse=actualuse.Material
                     this.fundList[2].actualuse=actualuse.processing

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -398,12 +398,20 @@
             // this.wordData['total']=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
             // return console.log(this.wordData);
             // getWord(this.downWordData)
-            // this.downloadDig=false;
+            this.downloadDig=false;
           }
         },
+         //小型仪器设备费：device        deviceRemarks
+              //材料费：Material             MaterialRemarks
+              //测试化验加工费：processing    processingRemarks
+              //项目协作费：Collaboration     CollaborationRemarks
+              //项目成果鉴定费：APPRAISAL     APPRAISALRemarks
+              //参展参赛费：entery            enteryRemarks
+              //创客交流活动费：activities    activitiesRemarks
+              //知识产权事务费：Transaction   TransactionRemarks
         computed:{   //经费总合
           reversedMessage: function () {
-            return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)
+            return (this.wordData.fund.device*1 + this.wordData.fund.Material*1+this.wordData.fund.processing*1+ this.wordData.fund.Collaboration*1+this.wordData.fund.APPRAISAL*1+ this.wordData.fund.entery*1+this.wordData.fund.activities*1+this.wordData.fund.Transaction*1)
           }
         },
         mounted(){

src/views/projectApply/components/studentProjectWordShow.vue

@@ -175,25 +175,25 @@
           </tr>
           <tr>
             <td colspan="2">小型仪器设备费</td>
-            <td v-text="downWordData.fund.facility">
+            <td v-text="downWordData.fund.device">
             </td><td colspan="2">
               项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">材料费</td><td v-text="downWordData.fund.materials">
+            <td colspan="2">材料费</td><td v-text="downWordData.fund.Material">
             </td><td colspan="2">
               项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">测试化验加工费</td><td v-text="downWordData.fund.process">
+            <td colspan="2">测试化验加工费</td><td v-text="downWordData.fund.processing">
             </td><td colspan="2">
               项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">项目协作费</td><td v-text="downWordData.fund.assist">
+            <td colspan="2">项目协作费</td><td v-text="downWordData.fund.Collaboration">
             </td><td colspan="2">
               按合同规定支付给协作单位的费用
             </td>
@@ -203,25 +203,25 @@
             <td rowspan="5">间接费用</td>
           </tr>
           <tr>
-            <td colspan="2">项目成果鉴定费</td><td v-text="downWordData.fund.authenticate">
+            <td colspan="2">项目成果鉴定费</td><td v-text="downWordData.fund.APPRAISAL">
             </td><td colspan="2">
               学术会务费、评审费、鉴定费、成果集制作费等费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">参展参赛费</td><td v-text="downWordData.fund.match">
+            <td colspan="2">参展参赛费</td><td v-text="downWordData.fund.entery">
             </td><td colspan="2">
               参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">创客交流活动费</td><td v-text="downWordData.fund.activity">
+            <td colspan="2">创客交流活动费</td><td v-text="downWordData.fund.activities">
             </td><td colspan="2">
               创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
             </td>
           </tr>
           <tr>
-            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.affair">
+            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.Transaction">
             </td><td colspan="2">
               论文版面费、专利及其他知识产权事务等费用。
             </td>