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

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

@@ -602,7 +602,7 @@
       <fund-plan-edit :fundPlan.sync="formData.fundPlan"/>
       <!-- 设备费-购置设备预算明细表 -->
       <equipments-edit :equipments.sync="formData.equipments"/>
-      <!-- 设备费-购置设备预算明细表 -->
+      <!-- 科技计划项目承担单位研究资金支出预算明细表 -->
       <unit-payment-edit :unitPayment.sync="formData.unitPayment"/>
 
       <!-- 项目课题设置 -->

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

@@ -531,6 +531,8 @@
     <equipments-info :equipments.sync="value.equipments"/>
     <!-- 设备费-购置设备预算明细表 -->
     <unit-payment-info :unitPayment.sync="value.unitPayment"/>
+    <!-- 项目绩效目标表 -->
+    <project-kpi :projectKPI.sync="formData.projectKPI" />
 
     <!-- 项目课题设置 -->
     <project-sub-info :dataList.sync="value.projectSubList" />
@@ -551,6 +553,7 @@ import budgetInfo from '@/views/report/project/components/budgetInfo'
 import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
 import equipmentsInfo from '@/views/report/project/components/equipmentsInfo.vue'
 import unitPaymentInfo from '@/views/report/project/components/unitPaymentInfo.vue'
+import projectKpi from '@/views/report/project/components/projectKPI.vue'
 import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import managementRuleInfo from '@/views/report/project/components/managementRuleInfo'
 import fileInfo from "@/views/report/project/components/keyProject/fileInfo";
@@ -560,7 +563,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
+    projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpi, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
   },
   name: "ProjectInfo",
   data () {

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

@@ -90,13 +90,21 @@
 <script>
 export default {
   name: "projectKPI",
+  props: {
+    projectKPI: {
+      type: String,
+      default: () => {
+        return null
+      }
+    },
+  },
   data() {
     return {
       kpiData: {},
     };
   },
   created () {
-    this.getProjectKpitStatistic()
+    //this.getProjectKpitStatistic()
   },
   methods: {
     getProjectKpitStatistic() {