Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

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

@@ -69,8 +69,8 @@ export default {
   data() {
     return {
       invisibleTotalBudget: [],
-      invisibleApplyFunds: [0, 2, 3, 4],
-      invisibleSelfFunds: [0, 1, 3, 4],
+      invisibleApplyFunds: [0, 2, 3, 4, 5, 6, 7, 8, 9],
+      invisibleSelfFunds: [0, 1, 2, 7, 8, 9],
     };
   },
   props: {
@@ -83,35 +83,81 @@ export default {
   },
   created() {},
   methods: {
-    //资金来源计算
+    // //资金来源计算
+    // calFundFrom() {
+    //   this.budget[0].applyFunds = this.budget[1].applyFunds + this.budget[2].applyFunds
+    //   this.budget[0].selfFunds = this.budget[1].selfFunds + this.budget[2].selfFunds
+    //   this.calRowTotalAmount(0)
+    // },
+    // //资金支出计算
+    // calFundPayment() {
+    //   this.budget[3].applyFunds = this.budget[4].applyFunds + this.budget[8].applyFunds
+    //   this.budget[3].selfFunds = this.budget[4].selfFunds + this.budget[8].selfFunds
+    //   this.calRowTotalAmount(3)
+    // },
+    // //直接费计算
+    // calDirectFee() {
+    //   this.budget[4].applyFunds = this.budget[5].applyFunds + this.budget[6].applyFunds + this.budget[7].applyFunds
+    //   this.budget[4].selfFunds = this.budget[5].selfFunds + this.budget[6].selfFunds + this.budget[7].selfFunds
+    //   this.calRowTotalAmount(4)
+    // },
+    // calRowTotalAmount(index) {
+    //   this.budget[index].totalBudget = this.budget[index].applyFunds + this.budget[index].selfFunds
+    // },
+    // outNumberChange (index) {
+    //   this.calRowTotalAmount(index)
+    //   this.calDirectFee()
+    //   this.calFundPayment()
+    //   this.calFundFrom()
+    //   if (this.budget[0].totalBudget < this.budget[3].totalBudget)
+    //     this.$message.info('资金支出总数不能大于资金来源总数！')
+    // },
+    //一、资金来源合计
+    calTotalFund() {
+      this.budget[0].totalBudget = this.budget[0].applyFunds + this.budget[0].selfFunds
+    },
+    //(一)财政资金
     calFundFrom() {
-      this.budget[0].applyFunds = this.budget[1].applyFunds + this.budget[2].applyFunds
-      this.budget[0].selfFunds = this.budget[1].selfFunds + this.budget[2].selfFunds
-      this.calRowTotalAmount(0)
+      this.budget[0].applyFunds = this.budget[1].applyFunds
     },
-    //资金支出计算
-    calFundPayment() {
-      this.budget[3].applyFunds = this.budget[4].applyFunds + this.budget[8].applyFunds
-      this.budget[3].selfFunds = this.budget[4].selfFunds + this.budget[8].selfFunds
-      this.calRowTotalAmount(3)
+    //(二)自筹资金
+    calSelfFee() {
+      this.budget[2].selfFunds = this.budget[3].selfFunds + this.budget[4].selfFunds + this.budget[5].selfFunds + this.budget[6].selfFunds
+      this.budget[0].selfFunds = this.budget[2].selfFunds
+      this.calRowTotalAmount(2)
+    },
+    //1.设备费
+    calEquipment() {
+      this.budget[9].applyFunds = this.budget[10].applyFunds + this.budget[11].applyFunds + this.budget[12].applyFunds + this.budget[13].applyFunds
+      this.budget[9].selfFunds = this.budget[10].selfFunds + this.budget[11].selfFunds + this.budget[12].selfFunds + this.budget[13].selfFunds
+      this.calRowTotalAmount(9)
     },
-    //直接费计算
+    //(一)直接费用
     calDirectFee() {
-      this.budget[4].applyFunds = this.budget[5].applyFunds + this.budget[6].applyFunds + this.budget[7].applyFunds
-      this.budget[4].selfFunds = this.budget[5].selfFunds + this.budget[6].selfFunds + this.budget[7].selfFunds
-      this.calRowTotalAmount(4)
+      this.calEquipment()
+      this.budget[8].applyFunds = this.budget[9].applyFunds + this.budget[14].applyFunds + this.budget[15].applyFunds + this.budget[16].applyFunds + this.budget[17].applyFunds + this.budget[18].applyFunds + this.budget[19].applyFunds + this.budget[20].applyFunds + this.budget[21].applyFunds
+      this.budget[8].selfFunds = this.budget[9].selfFunds + this.budget[14].selfFunds + this.budget[15].selfFunds + this.budget[16].selfFunds + this.budget[17].selfFunds + this.budget[18].selfFunds + this.budget[19].selfFunds + this.budget[20].selfFunds + this.budget[21].selfFunds
+      this.calRowTotalAmount(8)
+    },
+    //二、支出预算合计
+    calFundPayment() {
+      this.calDirectFee()
+      this.budget[7].applyFunds = this.budget[8].applyFunds + this.budget[22].applyFunds
+      this.budget[7].selfFunds = this.budget[8].selfFunds + this.budget[22].selfFunds
+      this.calRowTotalAmount(7)
     },
     calRowTotalAmount(index) {
       this.budget[index].totalBudget = this.budget[index].applyFunds + this.budget[index].selfFunds
     },
     outNumberChange (index) {
       this.calRowTotalAmount(index)
-      this.calDirectFee()
-      this.calFundPayment()
       this.calFundFrom()
-      if (this.budget[0].totalBudget < this.budget[3].totalBudget)
+      this.calSelfFee()
+      this.calTotalFund()
+      this.calFundPayment()
+      if (this.budget[0].totalBudget < this.budget[7].totalBudget)
         this.$message.info('资金支出总数不能大于资金来源总数！')
-    },
+    }
   },
 };
 </script>

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

@@ -18,22 +18,22 @@
           <div>年度</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第一年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第二年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第三年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <!-- <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>第四年</div>
         </div>
@@ -42,7 +42,7 @@
         <div class="special-middle">
           <div>第五年</div>
         </div>
-      </a-col>
+      </a-col> -->
       <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>合计</div>
@@ -54,25 +54,25 @@
       <a-col :span="6" style="text-align: right;">
         <div class="special-middle">{{ item.fundName }}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <a-form-model-item v-if="!invisibleYearValue1.includes(index)" :prop="'fundPlan.' + index + '.yearValue1'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input-number v-model="item.yearValue1" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
         </a-form-model-item>
         <div class="special-middle" v-else>{{parseFloat(item.yearValue1).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <a-form-model-item v-if="!invisibleYearValue2.includes(index)" :prop="'fundPlan.' + index + '.yearValue2'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input-number v-model="item.yearValue2" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
         </a-form-model-item>
         <div class="special-middle" v-else>{{parseFloat(item.yearValue2).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <a-form-model-item v-if="!invisibleYearValue3.includes(index)" :prop="'fundPlan.' + index + '.yearValue3'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input-number v-model="item.yearValue3" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
         </a-form-model-item>
         <div class="special-middle" v-else>{{parseFloat(item.yearValue3).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <!-- <a-col :span="3">
         <a-form-model-item v-if="!invisibleYearValue4.includes(index)" :prop="'fundPlan.' + index + '.yearValue4'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input-number v-model="item.yearValue4" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
         </a-form-model-item>
@@ -83,7 +83,7 @@
           <a-input-number v-model="item.yearValue5" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
         </a-form-model-item>
         <div class="special-middle" v-else>{{parseFloat(item.yearValue5).toFixed(2)}}</div>
-      </a-col>
+      </a-col> -->
       <a-col :span="3">
         <a-form-model-item v-if="!invisibleTotalAmount.includes(index)" :prop="'fundPlan.' + index + '.totalAmount'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input-number v-model="item.totalAmount" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />

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

@@ -18,22 +18,22 @@
           <div>年度</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第一年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第二年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="5" class="bg-gray">
         <div class="special-middle">
           <div>第三年</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <!-- <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>第四年</div>
         </div>
@@ -42,7 +42,7 @@
         <div class="special-middle">
           <div>第五年</div>
         </div>
-      </a-col>
+      </a-col> -->
       <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>合计</div>
@@ -54,21 +54,21 @@
       <a-col :span="6" style="text-align: right;">
         <div class="special-middle">{{ item.fundName }}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <div class="special-middle">{{parseFloat(item.yearValue1).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <div class="special-middle">{{parseFloat(item.yearValue2).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="5">
         <div class="special-middle">{{parseFloat(item.yearValue3).toFixed(2)}}</div>
       </a-col>
-      <a-col :span="3">
+      <!-- <a-col :span="3">
         <div class="special-middle">{{parseFloat(item.yearValue4).toFixed(2)}}</div>
       </a-col>
       <a-col :span="3">
         <div class="special-middle">{{parseFloat(item.yearValue5).toFixed(2)}}</div>
-      </a-col>
+      </a-col> -->
       <a-col :span="3">
         <div class="special-middle">{{parseFloat(item.totalAmount).toFixed(2)}}</div>
       </a-col>