新增项目核算查看页面

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCheckMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u1 on u1.user_id = c.cw_user_id
         left join sys_user as u2 on u2.user_id = c.manager_user_id
         left join sys_user as u3 on u3.user_id = c.zjl_user_id
-        left join cmc_project as p on b.project_id = p.project_id
+        left join cmc_project as p on c.project_id = p.project_id
     </sql>
 
     <select id="selectCmcCheckList" parameterType="CmcCheck" resultMap="CmcCheckResult">

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 14:10:34
+ * @LastEditTime: 2025-05-21 17:06:38
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -678,9 +678,18 @@ export default {
       })
     },
     async initActualInfo(project) {
-      let deviceIds = project.devices.split(',');
-      let carIds = project.cars.split(',');
-      let participateIds = project.participates.split(',');
+      let deviceIds = [];
+      let carIds = [];
+      let participateIds = [];
+      if (project.devices) {
+        deviceIds = project.devices.split(',');
+      }
+      if (project.cars) {
+        carIds = project.cars.split(',');
+      }
+      if (project.participates) {
+        participateIds = project.participates.split(',');
+      }
       let actualDeviceList = [];
       let actualCarList = [];
       let actualParticipateList = [];

oa-ui/src/views/oa/budget/index.vue

@@ -49,13 +49,9 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
-      <el-table-column label="间接成本" align="center" prop="fixCost" />
-      <el-table-column label="直接成本" align="center" prop="settleExpense" />
-      <el-table-column label="其他成本" align="center" prop="directExpense">
-        <template slot-scope="scope">
-          {{ (Number(scope.row.directExpense) - Number(scope.row.settleExpense)).toFixed(2) }}
-        </template>
-      </el-table-column>
+      <el-table-column label="人员成本" align="center" prop="staffCost" />
+      <el-table-column label="车辆成本" align="center" prop="carCost" />
+      <el-table-column label="设备成本" align="center" prop="deviceCost" />
       <el-table-column label="预算总额" align="center" prop="totalBudget" />
       <el-table-column label="编制人" align="center" prop="compiler">
         <template slot-scope="scope">
@@ -101,9 +97,9 @@
 import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
 import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
 import { listProject } from '@/api/oa/project/project';
-import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
-import newBudgetInfo from '../../flowable/form/budget/adjust/newBudgetInfo.vue';
-import budgetAdjust from '../../flowable/form/budget/adjust/budgetAdjust.vue';
+import budgetInfo from '@/views/flowable/form/budget/budgetInfo.vue';
+import newBudgetInfo from '@/views/flowable/form/budget/adjust/newBudgetInfo.vue';
+import budgetAdjust from '@/views/flowable/form/budget/adjust/budgetAdjust.vue';
 import FormData from './formData.vue';
 export default {
   name: "Budget",