1

src/views/projectManage/components/Closingstatement.vue

@@ -1012,7 +1012,7 @@
           <td>经费大类</td>
           <td>经费小类</td>
           <td>预算经费（元）</td>
-          <td>金额（元）</td>
+          <td>实际使用经费（元）</td>
           <td colspan="3">计算依据及理由</td>
         </tr>
         <tr>
@@ -1036,7 +1036,7 @@
               v-model="myArrayProp[0]['money'].device"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
               @change="getPrice"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].device }}</div>
@@ -1055,7 +1055,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].Material }}</div>
           </td>
@@ -1073,7 +1073,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].processing }}</div>
           </td>
@@ -1091,7 +1091,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].Collaboration }}</div>
           </td>
@@ -1110,7 +1110,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].APPRAISAL }}</div>
           </td>
@@ -1126,7 +1126,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].entery }}</div>
           </td>
@@ -1144,7 +1144,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].activities }}</div>
           </td>
@@ -1162,7 +1162,7 @@
               @change="getPrice"
               :min="0"
               :controls="false"
-              :precision="0"
+              :precision="2"
             ></el-input-number>
             <div v-else>{{ myArrayProp[0]["money"].Transaction }}</div>
           </td>
@@ -1883,35 +1883,35 @@ export default {
       }
       var a =
         this.myArrayProp[0]["money"].device != ""
-          ? parseInt(this.myArrayProp[0]["money"].device)
+          ? parseFloat(this.myArrayProp[0]["money"].device)
           : 0;
       var b =
         this.myArrayProp[0]["money"].Material != ""
-          ? parseInt(this.myArrayProp[0]["money"].Material)
+          ? parseFloat(this.myArrayProp[0]["money"].Material)
           : 0;
       var c =
         this.myArrayProp[0]["money"].processing != ""
-          ? parseInt(this.myArrayProp[0]["money"].processing)
+          ? parseFloat(this.myArrayProp[0]["money"].processing)
           : 0;
       var d =
         this.myArrayProp[0]["money"].Collaboration != ""
-          ? parseInt(this.myArrayProp[0]["money"].Collaboration)
+          ? parseFloat(this.myArrayProp[0]["money"].Collaboration)
           : 0;
       var e =
         this.myArrayProp[0]["money"].APPRAISAL != ""
-          ? parseInt(this.myArrayProp[0]["money"].APPRAISAL)
+          ? parseFloat(this.myArrayProp[0]["money"].APPRAISAL)
           : 0;
       var f =
         this.myArrayProp[0]["money"].entery != ""
-          ? parseInt(this.myArrayProp[0]["money"].entery)
+          ? parseFloat(this.myArrayProp[0]["money"].entery)
           : 0;
       var g =
         this.myArrayProp[0]["money"].activities != ""
-          ? parseInt(this.myArrayProp[0]["money"].activities)
+          ? parseFloat(this.myArrayProp[0]["money"].activities)
           : 0;
       var h =
         this.myArrayProp[0]["money"].Transaction != ""
-          ? parseInt(this.myArrayProp[0]["money"].Transaction)
+          ? parseFloat(this.myArrayProp[0]["money"].Transaction)
           : 0;
       this.myArrayProp[0].actualuse = a + b + c + d + e + f + g + h;
       if (t != 1) {

src/views/projectManage/components/studentProjectWordShow.vue

@@ -261,7 +261,7 @@
       <tr>
         <td>支出类别</td>
         <td colspan="2">支出项目</td>
-        <td>金额（元）</td>
+        <td>实际使用经费（元）</td>
         <td colspan="4">备 注</td>
       </tr>
       <tr>

src/views/projectSettlement/components/projectSettlementBook.vue

@@ -895,7 +895,7 @@
         <td>经费大类</td>
         <td>经费小类</td>
         <td>预算经费（元）</td>
-        <td>金额（元）</td>
+        <td>实际使用经费（元）</td>
         <td colspan="3">计算依据及理由</td>
       </tr>
       <tr>
@@ -912,7 +912,7 @@
               知识产权事务费：Transaction   TransactionRemarks -->
       <tr>
         <td>小型仪器设备费</td>
-        <td>{{ myArrayProp[0]["budget"].device }}</td>
+        <td>{{ myArrayProp[0]["budget"].device?myArrayProp[0]["budget"].device:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].device }}</td>
         <td colspan="3">
           项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
@@ -920,7 +920,7 @@
       </tr>
       <tr>
         <td>材料费</td>
-        <td>{{ myArrayProp[0]["budget"].Material }}</td>
+        <td>{{ myArrayProp[0]["budget"].Material?myArrayProp[0]["budget"].Material:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].Material }}</td>
         <td colspan="3">
           项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
@@ -928,7 +928,7 @@
       </tr>
       <tr>
         <td>测试化验加工费</td>
-        <td>{{ myArrayProp[0]["budget"].processing }}</td>
+        <td>{{ myArrayProp[0]["budget"].processing?myArrayProp[0]["budget"].processing:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].processing }}</td>
         <td colspan="3">
           项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
@@ -936,7 +936,7 @@
       </tr>
       <tr>
         <td>项目协作费</td>
-        <td>{{ myArrayProp[0]["budget"].Collaboration }}</td>
+        <td>{{ myArrayProp[0]["budget"].Collaboration?myArrayProp[0]["budget"].Collaboration:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].Collaboration }}</td>
         <td colspan="3">按合同规定支付给协作单位的费用</td>
       </tr>
@@ -945,13 +945,13 @@
       </tr>
       <tr>
         <td>项目成果鉴定费</td>
-        <td>{{ myArrayProp[0]["budget"].APPRAISAL }}</td>
+        <td>{{ myArrayProp[0]["budget"].APPRAISAL?myArrayProp[0]["budget"].APPRAISAL:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].APPRAISAL }}</td>
         <td colspan="3">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
       </tr>
       <tr>
         <td>参展参赛费</td>
-        <td>{{ myArrayProp[0]["budget"].entery }}</td>
+        <td>{{ myArrayProp[0]["budget"].entery? myArrayProp[0]["budget"].entery:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].entery }}</td>
         <td colspan="3">
           参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
@@ -959,7 +959,7 @@
       </tr>
       <tr>
         <td>创客交流活动费</td>
-        <td>{{ myArrayProp[0]["budget"].activities }}</td>
+        <td>{{ myArrayProp[0]["budget"].activities?myArrayProp[0]["budget"].activities:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].activities }}</td>
         <td colspan="3">
           创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
@@ -967,7 +967,7 @@
       </tr>
       <tr>
         <td>论文版面费</td>
-        <td>{{ myArrayProp[0]["budget"].Transaction }}</td>
+        <td>{{ myArrayProp[0]["budget"].Transaction?myArrayProp[0]["budget"].Transaction:'0' }}</td>
         <td>{{ myArrayProp[0]["money"].Transaction }}</td>
         <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
@@ -1323,7 +1323,7 @@ export default {
           let _num = 0;
           for(let key in data[0].money){
             if(data[0].money[key]!=""){
-              _num+= parseInt(data[0].money[key])
+              _num+= parseFloat(data[0].money[key])
             }
 
           }

src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -214,7 +214,7 @@
             <td rowspan="12" ref="fund">预算经费</td><td>总经费</td><td colspan="5" v-text="reversedMessage==0?'':reversedMessage"></td>
           </tr>
           <tr>
-            <td>支出类别</td><td colspan="2">支出项目</td><td>金额（元）</td><td colspan="4">备 注</td>
+            <td>支出类别</td><td colspan="2">支出项目</td><td>实际使用经费（元）</td><td colspan="4">备 注</td>
           </tr>
           <tr>
             <td rowspan="5">直接费用</td>