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

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

@@ -120,7 +120,7 @@ export default {
     //一、资金来源合计
     calTotalFund () {
       this.budget[0].totalBudget = this.budget[0].applyFunds + this.budget[0].selfFunds
-      this.$emit('save', [this.budget[0].totalBudget, this.budget[0].applyFunds])
+      this.$emit('save', [this.budget[0].totalBudget, this.budget[0].applyFunds, this.budget[0].selfFunds])
     },
     //(一)财政资金
     calFundFrom () {

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

@@ -895,11 +895,13 @@ export default {
       }
     },
     budgetSave (e) {
-      if (!!e && e.length == 2) {
+      if (!!e && e.length == 3) {
         this.formData.totalFunding = e[0]
         this.formData.govFunding = e[1]
+        
         this.formData.projectKPI.totalBudget = this.formData.totalFunding
         this.formData.projectKPI.applyFunds = this.formData.govFunding
+        this.formData.projectKPI.selfFunds = e[2]
       }
     },
   }

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

@@ -105,7 +105,7 @@
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              {{ moment(item.birthday).format('YYYY-MM') }}
+              {{ moment(item.birthday).format('YYYY-MM-DD') }}
             </div>
           </div>
         </a-col>

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

@@ -93,7 +93,7 @@
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              {{ moment(item.birthday).format('YYYY-MM') }}
+              {{ moment(item.birthday).format('YYYY-MM-DD') }}
             </div>
           </div>
         </a-col>