1

src/views/projectManage/ProjectManagement.vue

@@ -859,6 +859,18 @@ export default {
           data[0].ClosingstatementData = JSON.parse(
             data[0].ClosingstatementData
           );
+
+          data[0].budget = data[0].money?JSON.parse(data[0].money):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
+
           data[0].money = data[0].money2?JSON.parse(data[0].money2):{
               "device": 0,
               "Material": 0,
@@ -869,6 +881,8 @@ export default {
               "activities": 0,
               "Transaction": 0
           };
+
+
           // data[0].multiSelectProject=JSON.parse(data[0].multiSelectProject)
           if (data[0].opinion != null) {
             data[0].opinion = JSON.parse(data[0].opinion);

src/views/projectManage/components/Closingstatement.vue

@@ -1011,7 +1011,7 @@
         <tr>
           <td>经费大类</td>
           <td>经费小类</td>
-          <td>支出科目</td>
+          <td>预算经费（元）</td>
           <td>金额（元）</td>
           <td colspan="3">计算依据及理由</td>
         </tr>
@@ -1029,7 +1029,7 @@
               知识产权事务费：Transaction   TransactionRemarks -->
         <tr>
           <td>小型仪器设备费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].device }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1047,7 +1047,7 @@
         </tr>
         <tr>
           <td>材料费</td>
-          <td>-</td>
+          <td>{{myArrayProp[0]["budget"].Material}}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1065,7 +1065,7 @@
         </tr>
         <tr>
           <td>测试化验加工费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].processing }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1083,7 +1083,7 @@
         </tr>
         <tr>
           <td>项目协作费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].Collaboration }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1102,7 +1102,7 @@
         </tr>
         <tr>
           <td>项目成果鉴定费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].APPRAISAL}}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1118,7 +1118,7 @@
         </tr>
         <tr>
           <td>参展参赛费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].entery }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1136,7 +1136,7 @@
         </tr>
         <tr>
           <td>创客交流活动费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].activities }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"
@@ -1154,7 +1154,7 @@
         </tr>
         <tr>
           <td>论文版面费</td>
-          <td>-</td>
+          <td>{{ myArrayProp[0]["budget"].Transaction }}</td>
           <td>
             <el-input-number
               v-if="!isDownPdf"

src/views/projectManage/components/Closingstatement1.vue

@@ -83,6 +83,18 @@ export default {
 
 					data[0].promotion = data[0].promotion.indexOf(data[0].ProjectNo);
 
+
+          data[0].budget = data[0].money?JSON.parse(data[0].money):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
+
           data[0].money = data[0].money2?JSON.parse(data[0].money2):{
               "device": 0,
               "Material": 0,
@@ -93,6 +105,8 @@ export default {
               "activities": 0,
               "Transaction": 0
           };
+
+
           data[0].ClosingstatementData = data[0].ClosingstatementData
             ? JSON.parse(data[0].ClosingstatementData)
             : this.submitData;

src/views/projectSettlement/components/projectSettlementBook.vue

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