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

src/views/report/talent/components/budgetFiveInfo.vue

@@ -146,7 +146,7 @@ export default {
     }
   },
   created() {
-    //this.calTotalFee()
+    this.calTotalFee()
   },
   methods: {
     FeeChange (index) {
@@ -177,6 +177,16 @@ export default {
       this.FeeChange(index)
     },
     calTotalFee() {
+      if (!this.budgetList || this.budgetList.length < 9) {
+        this.totalYearValue1 = 0
+        this.totalYearValue2 = 0
+        this.totalYearValue3 = 0
+        this.totalYearValue4 = 0
+        this.totalYearValue5 = 0
+        this.totalFee = 0
+        return
+      }
+
       this.totalYearValue1 = this.budgetList[0].yearValue1 + this.budgetList[1].yearValue1 + this.budgetList[2].yearValue1 + this.budgetList[8].yearValue1
       this.totalYearValue2 = this.budgetList[0].yearValue2 + this.budgetList[1].yearValue2 + this.budgetList[2].yearValue2 + this.budgetList[8].yearValue2
       this.totalYearValue3 = this.budgetList[0].yearValue3 + this.budgetList[1].yearValue3 + this.budgetList[2].yearValue3 + this.budgetList[8].yearValue3
@@ -250,7 +260,9 @@ export default {
     budgetList: {
       handler(budgetList) {
         this.calTotalFee()
-      }
+      },
+      deep: true,
+      immediate: true // 新增
     }
   }
 }

src/views/report/talent/components/budgetThreeInfo.vue

@@ -111,7 +111,7 @@ export default {
     }
   },
   created() {
-    //this.calTotalFee()
+    this.calTotalFee()
   },
   methods: {
     FeeChange (index) {
@@ -142,6 +142,14 @@ export default {
       this.FeeChange(index)
     },
     calTotalFee() {
+      if (!this.budgetList || this.budgetList.length < 9) {
+        this.totalYearValue1 = 0
+        this.totalYearValue2 = 0
+        this.totalYearValue3 = 0
+        this.totalFee = 0
+        return
+      }
+
       this.totalYearValue1 = this.budgetList[0].yearValue1 + this.budgetList[1].yearValue1 + this.budgetList[2].yearValue1 + this.budgetList[8].yearValue1
       this.totalYearValue2 = this.budgetList[0].yearValue2 + this.budgetList[1].yearValue2 + this.budgetList[2].yearValue2 + this.budgetList[8].yearValue2
       this.totalYearValue3 = this.budgetList[0].yearValue3 + this.budgetList[1].yearValue3 + this.budgetList[2].yearValue3 + this.budgetList[8].yearValue3
@@ -206,7 +214,9 @@ export default {
     budgetList: {
       handler(budgetList) {
         this.calTotalFee()
-      }
+      },
+      deep: true,
+      immediate: true // 新增
     }
   }
 }

src/views/report/talent/components/talentInfo.vue

@@ -546,6 +546,12 @@ export default {
       } else {
         this.talentTypeId = 16
       }
+
+      if (talentType)
+        this.formData.talentType = talentType
+      else
+        this.formData.talentType = []
+
       this.processBudgetType()
     },
     processBudgetType () {
@@ -556,8 +562,10 @@ export default {
       } else {
         this.budgetType = { type: 'RTTalent', trainingYear: this.talentTraningInfo.RTTrainingYear, EveryYearFee: this.talentTraningInfo.RTEveryYearFee }
       }
-      if (!!!this.value.applyFund || this.value.applyFund == 0)
-        this.value.applyFund = this.budgetType.trainingYear * this.budgetType.EveryYearFee
+      
+      this.value.applyFund = this.budgetType.trainingYear * this.budgetType.EveryYearFee
+
+      this.FundChange()
     }
   },
   watch: {