xujun

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

@@ -522,6 +522,16 @@
         <div v-html="toTextarea(value.otherTarget)"></div>
       </a-col>
     </a-row>
+
+    <!-- 经费预算 -->
+    <budget-info :budget.sync="value.budget" />
+    <!-- 分年度用款计划 -->
+    <fund-plan-info :fundPlan.sync="value.fundPlan"/>
+    <!-- 设备费-购置设备预算明细表 -->
+    <equipments-info :equipments.sync="value.equipments"/>
+    <!-- 设备费-购置设备预算明细表 -->
+    <unit-payment-info :unitPayment.sync="value.unitPayment"/>
+
     <!-- 项目课题设置 -->
     <project-sub-info :dataList.sync="value.projectSubList" />
 
@@ -537,6 +547,10 @@
 import moment from 'moment'
 import projectMemberInfo from '@/views/report/project/components/projectMemberInfo'
 import cooperativeUnitsInfo from '@/views/report/project/components/cooperativeUnitsInfo'
+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 projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import managementRuleInfo from '@/views/report/project/components/managementRuleInfo'
 import fileInfo from "@/views/report/project/components/keyProject/fileInfo";
@@ -546,7 +560,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    projectMemberInfo, cooperativeUnitsInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
+    projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
   },
   name: "ProjectInfo",
   data () {

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

@@ -83,7 +83,7 @@
         <div class="special-middle">{{ item.socialCode }}</div>
       </a-col>
       <a-col :span="2">
-        <div class="special-middle">{{ item.unitRole }}</div>
+        <div class="special-middle">{{ item.roleName }}</div>
       </a-col>
       <a-col :span="4">
         <div class="special-middle">{{ item.taskDivision }}</div>