3333

src/views/expert/components/expertEdit.vue

@@ -222,6 +222,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     submit () {
+      console.log(this.formData)
       if (!!!this.formData.specList || this.formData.specList.length == 0) {
         this.$message.error('请选择评审专业！')
         return false

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

@@ -26,38 +26,58 @@
     </a-row>
 
     <div v-for="(item, index) in budget" :key="'budget' + index" class="row_center">
-      <a-row v-if="item.type ==='count'">
+      <a-row v-if="item.type ==='count'" type="flex">
         <a-col :span="6" :style="'text-align: left;padding-left:'+left(item.level)+'px'">
+          <div class="special-middle">
             {{item.budgetName}}
+          </div>
         </a-col>
         <a-col :span="3">
+          <div class="special-middle">
             {{Count(item.source,'totalBudget',index)}}
+          </div>
         </a-col>
         <a-col :span="5">
-          <span v-if="!!!item.show||item.show === 'applyFunds'">{{Count(item.source,'applyFunds',index)}}</span>
+          <div class="special-middle">
+            <span v-if="!!!item.code||item.code === 'applyFunds'">{{Count(item.source,'applyFunds',index)}}</span>
+          </div>
         </a-col>
         <a-col :span="5">
+          <div class="special-middle">
             {{Count(item.source,'selfFunds',index)}}
+          </div>
         </a-col>
         <a-col :span="5">
+          <div class="special-middle">
             <a-input v-model="item.calculationBasis" :maxLength="100" style="width: 80%;" />
+          </div>
         </a-col>
       </a-row>
-      <a-row v-else>
+      <a-row v-else type="flex">
         <a-col :span="6" :style="'text-align: left;padding-left:'+left(item.level)+'px'">
+          <div class="special-middle">
             {{item.budgetName}}
+          </div>
         </a-col>
         <a-col :span="3">
+          <div class="special-middle">
             {{Count1(index, item.applyFunds, item.selfFunds)}}
+          </div>
         </a-col>
         <a-col :span="5">
-          <a-input-number v-model="item.applyFunds" :min="0" :step="0.01" style="width: 80%" v-if="!!!item.show||item.show === 'applyFunds'" />
+          <div class="special-middle">
+            <a-input-number v-model="item.applyFunds" :min="0" :step="0.01" style="width: 80%" v-if="!!!item.code||item.code === 'applyFunds'" />
+          </div>
         </a-col>
         <a-col :span="5">
-          <a-input-number v-model="item.selfFunds" :min="0" :step="0.01" style="width: 80%" v-if="!!!item.show||item.show === 'selfFunds'" />
+          <div class="special-middle">
+            <a-input-number v-model="item.selfFunds" :min="0" :step="0.01" style="width: 80%" v-if="!!!item.code||item.code === 'selfFunds'" />
+          </div>
         </a-col>
         <a-col :span="5">
+          <div class="special-middle">
             <a-input v-model="item.calculationBasis" :maxLength="100" style="width: 80%;" />
+          </div>
         </a-col>
       </a-row>
     </div>
@@ -70,16 +90,16 @@ export default {
   name: "fundEdit",
   data () {
     return {
-      budget: budgetList()
+
     };
   },
   props: {
-    // budget: {
-    //   type: Array,
-    //   default: () => {
-    //     return []
-    //   }
-    // },
+    budget: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
   },
   created () {
   },
@@ -106,18 +126,24 @@ export default {
       }
     },
     Count1 (index, applyFunds, selfFunds) {
-      this.budget[index].totalBudget = (applyFunds + selfFunds).toFixed(2)
-      return (applyFunds + selfFunds).toFixed(2)
+      let apply = 0.00
+      let self = 0.00
+      if (!!applyFunds)
+        apply = applyFunds
+      if (!!selfFunds)
+        self = selfFunds
+      this.budget[index].totalBudget = (apply + self).toFixed(2)
+      return (apply + self).toFixed(2)
     },
     left (l) {
       switch (l) {
-        case 1:
+        case '1':
           return 4;
-        case 2:
+        case '2':
           return 12;
-        case 3:
+        case '3':
           return 20;
-        case 4:
+        case '4':
           return 30;
       }
       return 0;

src/views/report/project/config.js

@@ -11,7 +11,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "一、资金来源合计",
             source: [1, 2],
-            show: null,
+            code: null,
             type: 'count'
         },
         {
@@ -25,7 +25,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(一)财政资金",
             source: null,
-            show: 'applyFunds',
+            code: 'applyFunds',
             type: 'ins'
         },
         {
@@ -39,7 +39,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(二)自筹资金",
             source: [3, 4, 5, 6],
-            show: 'selfFunds',
+            code: 'selfFunds',
             type: 'count'
         },
         {
@@ -53,7 +53,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "1.承担单位自有货币资金",
             source: null,
-            show: 'selfFunds',
+            code: 'selfFunds',
             type: 'ins'
         },
         {
@@ -67,7 +67,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "2.从银行获得的贷款",
             source: null,
-            show: 'selfFunds',
+            code: 'selfFunds',
             type: 'ins'
         },
         {
@@ -81,7 +81,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "3.其他财政拨款",
             source: null,
-            show: 'selfFunds',
+            code: 'selfFunds',
             type: 'ins'
         },
         {
@@ -95,7 +95,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "4.其他资金",
             source: null,
-            show: 'selfFunds',
+            code: 'selfFunds',
             type: 'ins'
         },
         {
@@ -109,7 +109,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "二、支出预算合计",
             source: [8, 22],
-            show: null,
+            code: null,
             type: 'count'
         },
         {
@@ -123,7 +123,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(一)直接费用",
             source: [9, 14, 15, 16, 17, 18, 19, 20, 21],
-            show: null,
+            code: null,
             type: 'count'
         },
         {
@@ -137,7 +137,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "1.设备费",
             source: [10, 11, 12, 13],
-            show: null,
+            code: null,
             type: 'count'
         },
         {
@@ -151,7 +151,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(1)设备购置费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -165,7 +165,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(2)试制设备费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -179,7 +179,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(3)设备改造费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -193,7 +193,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(4)设备租赁费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -207,7 +207,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "2.材料费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -221,7 +221,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "3.燃料动力费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -235,7 +235,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "4.测试化验加工费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -249,7 +249,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "5.差旅费/会议费/国际合作交流费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -263,7 +263,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "6.劳务费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -277,7 +277,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "7.专家咨询费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -291,7 +291,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "8.出版/文献/信息传播/知识产权\n事务费",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -305,7 +305,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "9.其他支出",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         },
         {
@@ -319,7 +319,7 @@ const budgetList = () => {
             calculationBasis: "",
             budgetName: "(二)间接费用\r\n",
             source: null,
-            show: null,
+            code: null,
             type: 'ins'
         }
     ]