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

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

@@ -37,6 +37,19 @@ export default {
       budgetCategory: null,
     }
   },
+  watch: {
+    budgetType: {
+      immediate: true,
+      deep: true, // 加上 deep
+      handler(newVal) {
+        if (newVal) {
+          this.budgetCategory = newVal.type === 'HTTalent'
+        } else {
+          this.budgetCategory = null
+        }
+      }
+    }
+  },
   created() {
     if (this.budgetType) {
       if (this.budgetType.type === 'HTTalent') {

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

@@ -537,6 +537,9 @@ export default {
         }
       })
     },
+    FundChange () {
+      this.value.totalFund = this.value.applyFund + this.value.otherFund
+    },
     talentCategoryHolder () {
       if (this.value.talentCategory === this.talentTraningInfo.HTTalent ||
         this.value.talentCategory === this.talentTraningInfo.RTTalent) {
@@ -547,11 +550,6 @@ export default {
         this.talentTypeId = 16
       }
 
-      if (talentType)
-        this.formData.talentType = talentType
-      else
-        this.formData.talentType = []
-
       this.processBudgetType()
     },
     processBudgetType () {