oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetOtherController.java

+/*
+ * @Author: ysh
+ * @Date: 2025-05-09 10:35:47
+ * @LastEditors: 
+ * @LastEditTime: 2025-05-16 11:23:17
+ */
 package com.ruoyi.web.controller.oa;
 
 import java.util.List;
      * 删除cmc预算外开支
      */
     @Log(title = "cmc预算外开支", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{expenseIds}")
+	@DeleteMapping("/{budgetId}")
     public AjaxResult remove(@PathVariable String[] budgetId)
     {
         return success(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(budgetId));

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

  * @Author: ysh
  * @Date: 2025-05-14 16:09:56
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-14 16:56:52
+ * @LastEditTime: 2025-05-19 10:47:29
 -->
 <template>
   <div class="app-container">
           <el-button icon="el-icon-back" type="text" @click="handleBack">返回选择</el-button>
           <h3>预算调整</h3>
         </div>
-        <budget-adjust :taskForm="taskForm" :taskName="taskName" :row="selectedRows"
-          @preserve="preserve"></budget-adjust>
+        <budget-adjust :taskForm="taskForm" :taskName="taskName" :row="selectedRows" @preserve="preserve"
+          @goBack="$emit('goBack')"></budget-adjust>
       </div>
     </transition>
   </div>
     },
     preserve() {
       this.hideReturn = false;
-      console.log(1111);
     }
   }
 }

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

  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-16 11:15:36
+ * @LastEditTime: 2025-05-19 17:49:04
 -->
 <template>
   <div class="main" v-loading="loading">
     <h2 class="text-center">项目直接生产成本预算—核算表</h2>
-    <p style="text-align: center">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+    <p style="text-align: center">
+      编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}
+      <span style="margin-left: 20px;">核算人：{{ checkForm.checker ? getUserName(checkForm.checker) : '' }}</span>
+    </p>
+    <div class="mt20 mb20" v-if="showAlter && taskName">
+      <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+        <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+      </el-alert>
+    </div>
     <el-divider></el-divider>
     <el-descriptions :column="3" border class="descriptions">
       <el-descriptions-item label="项目编号">
       <el-descriptions-item label="预算表单备注" :span="5">
         {{ budgetForm.remark }}
       </el-descriptions-item>
+      <el-descriptions-item label="预算附件" :span="3" v-if="budgetForm.document">
+        <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + budgetForm.document}`)">
+          {{ getFileName(budgetForm.document) }}
+        </el-link>
+        <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + budgetForm.document}`"
+          :underline="false" target="_blank">
+          <span class="el-icon-download">下载文件</span>
+        </el-link>
+      </el-descriptions-item>
       <el-descriptions-item label="项目计划工作量" :span="3">
         <div>
           <table border="1" style="width: 100%;">
           </tr>
           <tr style="color:#F56C6C">
             <td :colspan="8" class="head">内业核算绩效额</td>
-            <td :colspan="1" class="head">
+            <td :colspan="1" class="head" v-if="taskName == '核算编制'">
               <el-input-number v-model="budgetForm.settleAdjust" :controls="false" style="width:100%"></el-input-number>
             </td>
+            <td style="text-align:right;font-weight:bold;" :colspan="1" class="head" v-else>
+              {{ budgetForm.settleAdjust ? budgetForm.settleAdjust.toFixed(2) : '0.00' }}
+            </td>
           </tr>
         </table>
       </el-descriptions-item>
       <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
         <inner-staff-cost :staffList.sync="innerStaffList" :settleExpense="budgetForm.settleExpense"
-          :settleAdjust="budgetForm.settleAdjust" @update:staffList="handleInnerStaffChange"></inner-staff-cost>
+          :settleAdjust="budgetForm.settleAdjust" :taskName="taskName"
+          @update:staffList="handleInnerStaffChange"></inner-staff-cost>
       </el-descriptions-item>
       <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
-        <outer-staff-cost :staffList.sync="outerStaffList"
+        <outer-staff-cost :staffList.sync="outerStaffList" :taskName="taskName"
           @update:staffList="handleOuterStaffChange"></outer-staff-cost>
       </el-descriptions-item>
       <el-descriptions-item label="车辆成本" :span="3" v-if="carList.length > 0">
-        <car-cost :carList.sync="carList" @update:carList="handleCarChange"></car-cost>
+        <car-cost :carList.sync="carList" :taskName="taskName" @update:carList="handleCarChange"></car-cost>
       </el-descriptions-item>
       <el-descriptions-item label="设备成本" :span="3" v-if="deviceList.length > 0">
-        <device-cost :deviceList.sync="deviceList" @update:deviceList="handleDeviceChange"></device-cost>
+        <device-cost :deviceList.sync="deviceList" :taskName="taskName"
+          @update:deviceList="handleDeviceChange"></device-cost>
       </el-descriptions-item>
       <el-descriptions-item label="现场开支" :span="3">
-        <site-cost :siteList.sync="siteList" @update:siteList="handleSiteChange"></site-cost>
+        <site-cost :siteList.sync="siteList" :taskName="taskName" @update:siteList="handleSiteChange"></site-cost>
       </el-descriptions-item>
       <el-descriptions-item label="经营相关" :span="3">
-        <business-cost :budgetForm.sync="budgetForm" @update:budgetForm="handleBusinessChange"></business-cost>
+        <business-cost :budgetForm.sync="budgetForm" :taskName="taskName"
+          @update:budgetForm="handleBusinessChange"></business-cost>
+      </el-descriptions-item>
+      <el-descriptions-item label="现场外开销" :span="3">
+        <other-cost :otherList.sync="otherList" :taskName="taskName" @update:otherList="handleOtherChange"></other-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="预算外开销" :span="3">
-        <other-cost :otherList.sync="otherList" @update:otherList="handleOtherChange"></other-cost>
+      <el-descriptions-item label="统计" :span="3">
+        <table border="1" style="width:100%;" class="budget-summary">
+          <tr class="header">
+            <td><b>名称</b></td>
+            <td><b>预算金额</b></td>
+            <td><b>核算金额</b></td>
+            <td><b>（核算-预算）差值</b></td>
+          </tr>
+          <tr>
+            <td>人员成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : Number(budgetForm.staffCost).toFixed(2)
+            }}</td>
+            <td style="text-align:right;">{{ isNaN(checkStaffCost) ? 0 : Number(checkStaffCost).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkStaffCost) - Number(budgetForm.staffCost)).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td>车辆成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.carCost) ? 0 : Number(budgetForm.carCost).toFixed(2) }}
+            </td>
+            <td style="text-align:right;">{{ isNaN(checkCarCost) ? 0 : Number(checkCarCost).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkCarCost) - Number(budgetForm.carCost)).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td>设备成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.deviceCost) ? 0 : Number(budgetForm.deviceCost).toFixed(2)
+            }}</td>
+            <td style="text-align:right;">{{ isNaN(checkDeviceCost) ? 0 : Number(checkDeviceCost).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkDeviceCost) - Number(budgetForm.deviceCost)).toFixed(2) }}
+            </td>
+          </tr>
+          <tr>
+            <td>现场开支成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : Number(budgetForm.siteSum).toFixed(2) }}
+            </td>
+            <td style="text-align:right;">{{ isNaN(checkSiteCost) ? 0 : Number(checkSiteCost).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkSiteCost) - Number(budgetForm.siteSum)).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td>经营相关成本</td>
+            <td style="text-align:right;">{{ isNaN(totalJYAmount) ? 0 : Number(totalJYAmount).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ isNaN(checkJYAmount) ? 0 : Number(checkJYAmount).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkJYAmount) - Number(totalJYAmount)).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td>现场外开销</td>
+            <td style="text-align:right;">0.00</td>
+            <td style="text-align:right;">{{ isNaN(checkOtherCost) ? 0 : Number(checkOtherCost).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkOtherCost) - 0).toFixed(2) }}</td>
+          </tr>
+          <tr class="total-budget">
+            <td><b>总计</b></td>
+            <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
+            <td style="text-align:right;"><b>{{ isNaN(totalBudgetAdjust) ? 0 : totalBudgetAdjust }}</b></td>
+            <td style="text-align:right;"><b>{{ (Number(totalBudgetAdjust) - Number(budgetForm.totalBudget)).toFixed(2)
+            }}</b></td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="核算说明" :span="3">
+        <div v-if="taskName == '核算编制' && !checkForm.checkComment" class="alert alert-warning"
+          style="padding: 10px; border: 1px solid #f0ad4e; background-color: #fcf8e3; color: #8a6d3b;">
+          请填写以下内容
+        </div>
+        <el-input :class="{ 'business-section': taskName == '核算编制' }" type="textarea" :autosize="{ minRows: 4 }"
+          v-model="checkForm.checkComment" :disabled="taskName != '核算编制'" />
+        <div class="sign mt10" v-if="checkForm.checkComment">
+          <div class="mr20">签名：<span class="auditor">{{ getUserName(checkForm.checker) }}</span>
+          </div>
+          <div class="ml20"><span>核算时间：{{ checkForm.checkTime }}</span></div>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="财务审核意见" :span="3">
+        <div v-if="taskName == '财务审核' && !checkForm.cwComment" class="alert alert-warning"
+          style="padding: 10px; border: 1px solid #f0ad4e; background-color: #fcf8e3; color: #8a6d3b;">
+          请填写以下内容
+        </div>
+        <el-input :class="{ 'business-section': taskName == '财务审核' }" type="textarea" :autosize="{ minRows: 4 }"
+          v-model="checkForm.cwComment" :disabled="taskName != '财务审核'" />
+        <div class="sign mt10" v-if="checkForm.cwComment">
+          <div class="mr20">签名：<span class="auditor">{{ getUserName(checkForm.cwUserId) }}</span>
+          </div>
+          <div class="ml20"><span>审核时间：{{ checkForm.cwTime }}</span></div>
+        </div>
       </el-descriptions-item>
       <el-descriptions-item label="分管审核意见" :span="3">
-
+        <table border="1" style="width:100%; text-align:left;">
+          <tr style="background-color:#f8f8f9;">
+            <td style="width:50%;">预算分管审核意见</td>
+            <td style="width:50%;">核算分管审核意见</td>
+          </tr>
+          <tr>
+            <td>
+              <el-input type="textarea" :autosize="{ minRows: 4 }" v-model="budgetForm.managerComment" disabled />
+              <div class="sign mt10" v-if="budgetForm.manager">
+                <div class="mr20">签名：<span class="auditor">{{ getUserName(budgetForm.manager) }}</span></div>
+                <div class="ml20"><span>审核时间：{{ budgetForm.managerTime }}</span></div>
+              </div>
+            </td>
+            <td>
+              <el-input type="textarea" :autosize="{ minRows: 4 }" v-model="checkForm.managerComment"
+                :disabled="taskName != '分管审核'" />
+              <div class="sign mt10" v-if="checkForm.managerUserId">
+                <div class="mr20">签名：<span class="auditor">{{ getUserName(checkForm.managerUserId) }}</span></div>
+                <div class="ml20"><span>审核时间：{{ checkForm.managerTime }}</span></div>
+              </div>
+            </td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="总经理审批意见" :span="3">
+        <table border="1" style="width:100%; text-align:left;">
+          <tr style="background-color:#f8f8f9;">
+            <td style="width:50%;">预算总经理审核意见</td>
+            <td style="width:50%;">核算总经理审核意见</td>
+          </tr>
+          <tr>
+            <td>
+              <el-input type="textarea" :autosize="{ minRows: 4 }" v-model="budgetForm.zjlComment" disabled />
+              <div class="sign mt10" v-if="budgetForm.zjlComment">
+                <div class="mr20">签名：<span class="auditor">{{ getUserName(budgetForm.auditor) }}</span>
+                </div>
+                <div class="ml20"><span>审核时间：{{ budgetForm.zjlTime }}</span></div>
+              </div>
+            </td>
+            <td>
+              <el-input type="textarea" :autosize="{ minRows: 4 }" v-model="checkForm.zjlComment"
+                :disabled="taskName != '总经理审核'" />
+              <div class="sign mt10" v-if="checkForm.zjlComment">
+                <div class="mr20">签名：<span class="auditor">{{ getUserName(checkForm.zjlUserId) }}</span>
+                </div>
+                <div class="ml20"><span>审核时间：{{ checkForm.zjlTime }}</span></div>
+              </div>
+            </td>
+          </tr>
+        </table>
       </el-descriptions-item>
     </el-descriptions>
-    <div class="text-center mt20 mb20">
+    <div class="text-center mt20 mb20" v-if="taskName">
+      <el-button type="danger" @click="returnOpen = true">退 回</el-button>
       <el-button type="warning" @click="preserve()">保 存</el-button>
-      <el-button type="success" @click="confirmSucess()">提交下一个流程</el-button>
+      <el-button type="success" @click="confirmSucess()">{{ taskName == '总经理审核' ? '结束流程' : '提交下一个流程' }}</el-button>
     </div>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')"
+        @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { listSite, updateSite, delSite, addSite } from "@/api/oa/budget/budgetSite";
 import { getProject } from "@/api/oa/project/project";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getUsersManageLeader, getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from "@/api/system/post";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
 import SiteCost from '@/views/flowable/form/budget/adjust/components/SiteCost.vue';
 import BusinessCost from '@/views/flowable/form/budget/adjust/components/businessCost.vue';
 import OtherCost from '@/views/flowable/form/budget/adjust/components/otherCost.vue';
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 export default {
   components: {
     InnerStaffCost,
     DeviceCost,
     SiteCost,
     BusinessCost,
-    OtherCost
+    OtherCost,
+    ReturnComment,
+    ReturnBtn
   },
   props: {
     taskForm: {
     },
     row: {
       type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    'taskForm.formId'() {
+      if (!this.row.projectId) {
+        getCheck(this.taskForm.formId).then(res => {
+          this.row.projectId = res.data.projectId;
+          this.initBudgetForm();
+          this.initCheckForm();
+          this.getProjectWorkList();
+        });
+      } else {
+        this.initBudgetForm();
+        this.initCheckForm();
+        this.getProjectWorkList();
+      }
+
     }
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       loading: true,
       budgetForm: {},
+      checkForm: {},
       project: {},
       workContentList: [],
       workList: [],
       carList: [],
       deviceList: [],
       siteList: [],
-      otherList: []
+      otherList: [],
+      returnOpen: false,
+      showAlter: true,
+      totalJYAmount: 0,
+      checkStaffCost: 0,
+      checkCarCost: 0,
+      checkDeviceCost: 0,
+      checkSiteCost: 0,
+      checkOtherCost: 0,
+      checkJYAmount: 0,
+      totalBudgetAdjust: 0,
     }
   },
-  created() {
+  async created() {
+    if (!this.row.projectId) {
+      let res = await getCheck(this.taskForm.formId);
+      this.row.projectId = res.data.projectId;
+    }
     this.initBudgetForm();
+    this.initCheckForm();
     this.getProjectWorkList();
   },
   methods: {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
+          // 经营相关
           this.budgetForm.outExpense = Number(this.budgetForm.outExpense).toFixed(2);
           this.budgetForm.letterExpense = Number(this.budgetForm.letterExpense).toFixed(2);
           this.budgetForm.winExpense = Number(this.budgetForm.winExpense).toFixed(2);
           this.budgetForm.taxExpense = Number(this.budgetForm.taxExpense).toFixed(2);
           this.budgetForm.travelExpense = Number(this.budgetForm.travelExpense).toFixed(2);
           this.budgetForm.totalBudget = Number(this.budgetForm.totalBudget).toFixed(2);
+          this.totalJYAmount = Number(this.budgetForm.outExpense || 0) +
+            Number(this.budgetForm.letterExpense || 0) +
+            Number(this.budgetForm.winExpense || 0) +
+            Number(this.budgetForm.taxExpense || 0) +
+            Number(this.budgetForm.travelExpense || 0);
+
+          this.budgetForm.outAdjust = Number(this.budgetForm.outAdjust).toFixed(2);
+          this.budgetForm.letterAdjust = Number(this.budgetForm.letterAdjust).toFixed(2);
+          this.budgetForm.winAdjust = Number(this.budgetForm.winAdjust).toFixed(2);
+          this.budgetForm.taxAdjust = Number(this.budgetForm.taxAdjust).toFixed(2);
+          this.budgetForm.travelAdjust = Number(this.budgetForm.travelAdjust).toFixed(2);
+          this.checkJYAmount = Number(this.budgetForm.outAdjust || 0) +
+            Number(this.budgetForm.letterAdjust || 0) +
+            Number(this.budgetForm.winAdjust || 0) +
+            Number(this.budgetForm.taxAdjust || 0) +
+            Number(this.budgetForm.travelAdjust || 0);
+
+
           // 获取设备数据
           let deviceRes = await listBudgetDevice({ pageSize: 100, budgetId });
           this.deviceList = deviceRes.rows;
               amountAdjust: device.amountAdjust ? Number(device.amountAdjust).toFixed(2) : 0
             };
           });
+          this.checkDeviceCost = this.deviceList.reduce((sum, device) => sum + Number(device.amountAdjust || 0), 0).toFixed(2);
+
           // 获取车辆数据
           let carRes = await listBudgetCar({ pageSize: 100, budgetId });
           this.carList = carRes.rows;
               amountAdjust: car.amountAdjust ? Number(car.amountAdjust).toFixed(2) : 0
             };
           });
+          this.checkCarCost = this.carList.reduce((sum, car) => sum + (Number(car.amountAdjust) || 0).toFixed(2), 0);
 
           // 获取内业人员数据
           let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
               amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
             };
           });
+          let innerCheckCost = this.innerStaffList.reduce((sum, staff) => sum + Number(staff.amountAdjust || 0), 0);
 
           // 获取外业人员数据
           let outerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '外业' });
               amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
             };
           });
+          let outerCheckCost = this.outerStaffList.reduce((sum, staff) => sum + Number(staff.amountAdjust || 0), 0);
+          this.checkStaffCost = (innerCheckCost + outerCheckCost).toFixed(2);
 
           // 获取内业绩效额数据
           let settleRes = await listBudgetSettle({ pageSize: 100, budgetId });
           // 获取现场开支
           let siteRes = await listSite({ pageSize: 100, budgetId });
           this.siteList = siteRes.rows;
+          this.siteList = this.siteList.map(site => {
+            return {
+              ...site,
+              amount: Number(site.amount).toFixed(2),
+              amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
+            };
+          });
+          this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
+          this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
 
           this.siteList = this.siteList.map(site => {
             return {
               amountAdjust: other.amountAdjust ? Number(other.amountAdjust).toFixed(2) : 0
             };
           });
+          this.checkOtherCost = this.otherList.reduce((sum, other) => sum + Number(other.amountAdjust || 0), 0).toFixed(2);
+          this.totalBudgetAdjust = (Number(this.checkStaffCost) + Number(this.checkCarCost) + Number(this.checkDeviceCost)
+            + Number(this.checkSiteCost) + Number(this.checkJYAmount) + Number(this.checkOtherCost)).toFixed(2);
         }
         this.loading = false;
       }).catch(() => {
         this.loading = false;
       });
     },
+    initCheckForm() {
+      getCheck(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.checkForm = res.data;
+        }
+        if (this.taskName == '核算编制') {
+          this.checkForm.checker = this.$store.getters.userId;
+          this.checkForm.checkTime = this.parseTime(new Date(), '{y}-{m}-{d}');
+        } else if (this.taskName == '财务审核') {
+          this.checkForm.cwUserId = this.$store.getters.userId;
+          this.checkForm.cwTime = this.parseTime(new Date(), '{y}-{m}-{d}');
+        } else if (this.taskName == '分管审核') {
+          this.checkForm.managerUserId = this.$store.getters.userId;
+          this.checkForm.managerTime = this.parseTime(new Date(), '{y}-{m}-{d}');
+        } else if (this.taskName == '总经理审核') {
+          this.checkForm.zjlUserId = this.$store.getters.userId;
+          this.checkForm.zjlTime = this.parseTime(new Date(), '{y}-{m}-{d}');
+        }
+      })
+    },
     getProjectWorkList() {
       getProject(this.row.projectId).then(res => {
         this.project = res.data;
     // 处理内业人员数据变化
     handleInnerStaffChange(newList) {
       this.innerStaffList = newList;
+      this.checkStaffCost = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
     },
 
     // 处理外业人员数据变化
     handleOuterStaffChange(newList) {
       this.outerStaffList = newList;
+      this.checkStaffCost = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
     },
     // 处理车辆数据变化
     handleCarChange(newList) {
       this.carList = newList;
+      this.checkCarCost = this.carList.reduce((sum, car) => sum + (Number(car.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
     },
     // 处理设备数据变化
     handleDeviceChange(newList) {
       this.deviceList = newList;
+      this.checkDeviceCost = this.deviceList.reduce((sum, device) => sum + (Number(device.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
     },
     // 处理现场开支数据变化
     handleSiteChange(newList) {
       this.siteList = newList;
+      this.checkSiteCost = this.siteList.reduce((sum, site) => sum + (Number(site.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
     },
     // 处理经营相关数据变化
     handleBusinessChange(newData) {
       this.budgetForm.winAdjust = newData.winAdjust;
       this.budgetForm.taxAdjust = newData.taxAdjust;
       this.budgetForm.travelAdjust = newData.travelAdjust;
+      this.checkJYAmount = Number(newData.outAdjust || 0) +
+        Number(newData.letterAdjust || 0) +
+        Number(newData.winAdjust || 0) +
+        Number(newData.taxAdjust || 0) +
+        Number(newData.travelAdjust || 0);
+      this.getTotalBudgetAdjust();
     },
     // 处理预算外开销数据变化
     handleOtherChange(newList) {
       this.otherList = newList;
+      this.checkOtherCost = this.otherList.reduce((sum, other) => sum + (Number(other.amountAdjust) || 0), 0).toFixed(2);
+      this.getTotalBudgetAdjust();
+    },
+    getTotalBudgetAdjust() {
+      this.totalBudgetAdjust = (Number(this.checkStaffCost) +
+        Number(this.checkCarCost) +
+        Number(this.checkDeviceCost) +
+        Number(this.checkSiteCost) +
+        Number(this.checkJYAmount) +
+        Number(this.checkOtherCost)).toFixed(2);
     },
+    // 保存
     async preserve() {
       let obj = {
         budgetId: this.row.budgetId,
         projectId: this.row.projectId,
         checkId: this.taskForm.formId
       }
-      let checkRes = await getCheck(this.taskForm.formId);
-      if (!checkRes.data) {
+      if (!this.checkForm.checkId) {
         await addCheck(obj);
         this.$emit('preserve');
+      } else {
+        await updateCheck(this.checkForm);
       }
       await updateBudget(this.budgetForm);
-      let staffList = this.innerStaffList.concat(this.outerStaffList);
-      // 更新人员
-      delBudgetStaff(this.row.budgetId).then(async res => {
-        for (let staff of staffList) {
-          staff.budgetId = this.row.budgetId;
-          await addBudgetStaff(staff);
-        }
-      })
-      // 更新车辆
-      delBudgetCar(this.row.budgetId).then(async res => {
-        for (let car of this.carList) {
-          car.budgetId = this.row.budgetId;
-          await addBudgetCar(car);
-        }
-      })
-      // 更新设备
-      delBudgetDevice(this.row.budgetId).then(async res => {
-        for (let device of this.deviceList) {
-          device.budgetId = this.row.budgetId;
-          await addBudgetDevice(device);
+
+      if (this.taskName == '核算编制') {
+        // 更新人员
+        let staffList = this.innerStaffList.concat(this.outerStaffList);
+        delBudgetStaff(this.row.budgetId).then(async res => {
+          for (let staff of staffList) {
+            staff.budgetId = this.row.budgetId;
+            await addBudgetStaff(staff);
+          }
+        })
+        // 更新车辆
+        delBudgetCar(this.row.budgetId).then(async res => {
+          for (let car of this.carList) {
+            car.budgetId = this.row.budgetId;
+            await addBudgetCar(car);
+          }
+        })
+        // 更新设备
+        delBudgetDevice(this.row.budgetId).then(async res => {
+          for (let device of this.deviceList) {
+            device.budgetId = this.row.budgetId;
+            await addBudgetDevice(device);
+          }
+        })
+        // 更新现场开支
+        for (let site of this.siteList) {
+          await updateSite(site);
         }
-      })
-      // 更新现场开支
-      for (let site of this.siteList) {
-        await updateSite(site);
+        // 更新预算外开销
+        delOther(this.row.budgetId).then(async res => {
+          for (let other of this.otherList) {
+            other.budgetId = this.row.budgetId;
+            await addOther(other);
+          }
+        })
       }
-      // 更新预算外开销
-      delOther(this.row.budgetId).then(async res => {
-        for (let other of this.otherList) {
-          other.budgetId = this.row.budgetId;
-          await addOther(other);
-        }
-      })
+
       this.$message.success('保存成功');
     },
     confirmSucess() {
-
-    }
+      this.preserve();
+      let msg = this.taskName == '总经理审核' ? '是否结束流程？' : '是否提交到下一个流程？';
+      this.$modal.confirm(msg).then(async () => {
+        if (this.taskName == '核算编制') {
+          let cwRes = await getUsersViceDeptLeaderByDept({ deptId: 106 });
+          let cwUserId = cwRes.data.userId;
+          this.$set(this.taskForm.variables, 'approvalList', [cwUserId]);
+        } else if (this.taskName == '财务审核') {
+          let managerLeaderRes = await getUsersManageLeader({ userId: this.budgetForm.compiler });
+          let managerLeader = managerLeaderRes.data;
+          let managerList = managerLeader.map(item => item.userId);
+          this.$set(this.taskForm.variables, 'approvalList', managerList);
+        } else if (this.taskName == '分管审核') {
+          let zjlRes = await getUserByPost({ postName: '总经理' });
+          let zjlUserId = zjlRes.data[0].userId;
+          this.$set(this.taskForm.variables, 'approval', zjlUserId);
+        }
+        // 提交到下一个流程
+        getNextFlowNode({ taskId: this.taskForm.taskId }).then(res => {
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit("goBack");
+          });
+        })
+      })
+    },
+    commentByRole() {
+      if (this.taskName == '核算编制') {
+        return this.checkForm.checkComment
+      } else if (this.taskName == '财务审核') {
+        return this.checkForm.cwComment
+      } else if (this.taskName == '分管审核') {
+        return this.checkForm.managerComment
+      } else if (this.taskName == '总经理审核') {
+        return this.checkForm.zjlComment
+      }
+    },
+    isReturn(val) {
+      this.showAlter = val;
+    },
   },
 }
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 .mylabel {
   font-weight: bold;
 }
   }
 }
 
+.sign {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-right: 80px;
+  line-height: 30px;
+  /* 如果需要垂直居中 */
+}
+
 .adjust {
   color: #F56C6C;
   width: 120px;
 ::v-deep .el-descriptions-item__label.is-bordered-label {
   color: #434141;
   background: #eaeaea;
+  width: 120px;
+}
+
+.business-section {
+  border: 2px solid #E6A23C !important;
+  box-shadow: 0 0 10px rgba(64, 158, 255, 0.2);
+
+  tr {
+    background-color: #f0f7ff;
+
+    &:hover {
+      background-color: #e6f1ff;
+    }
+  }
+
+  .el-input-number {
+    .el-input__inner {
+      background-color: #fff;
+      border: 1px solid #E6A23C;
+
+      &:focus {
+        border-color: #e2af62;
+        box-shadow: 0 0 5px rgba(64, 158, 255, 0.3);
+      }
+    }
+  }
+
+  .head.amount {
+    background-color: #ecf5ff;
+    color: #E6A23C;
+    font-weight: bold;
+  }
 }
 </style>

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

  * @Author: ysh
  * @Date: 2025-05-08 14:18:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-15 14:55:55
+ * @LastEditTime: 2025-05-19 16:25:04
 -->
 <template>
   <div class="car-cost">
     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
         <td></td>
+        <td>序号</td>
         <td>车牌号</td>
         <td>折旧成本（天）</td>
         <td>预算天数</td>
       </tr>
       <tr v-for="car, index in carList" :key="'car' + car.carId">
         <td>
-          <div class="delete-btn" @click="removeCar(car, index)"><i class="el-icon-remove-outline"
+          <div class="delete-btn" v-if="car.days == 0" @click="removeCar(car, index)"><i class="el-icon-remove-outline"
               style="color:#F56C6C"></i>
           </div>
         </td>
+        <td>{{ index + 1 }}</td>
         <td>{{ car.car ? car.car.licensePlate : '' }}</td>
         <td style="text-align:right;">{{ car.car ? car.car.dayCost : '' }}</td>
         <td style="text-align:right;">{{ car.days }}</td>
         <td style="text-align:right;">{{ car.amount }}</td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="car.daysAdjust"
-            @change="handleChange(car)"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" style="width:100%;" v-model="car.daysAdjust"
+              @change="handleChange(car)"></el-input-number>
+          </template>
+          <span v-else>{{ car.daysAdjust }}</span>
         </td>
         <td style="text-align:right;">
           {{ car.amountAdjust }}
         </td>
       </tr>
       <tr>
-        <td colspan="2" class="amount">车辆成本合计</td>
+        <td colspan="3" class="amount">车辆成本合计</td>
         <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
           (Number(car.depreciation) || 0), 0).toFixed(2)}}</td>
         <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
           (Number(car.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
-    <div class="mt10">
+    <div class="mt10" v-if="taskName === '核算编制'">
       <el-button type="success" plain icon="el-icon-plus" @click="openCar" size="mini">新增车辆</el-button>
     </div>
     <!-- 选择车辆对话框 -->
     carList: {
       type: Array,
       default: () => []
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {

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

     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
         <td></td>
+        <td>序号</td>
         <td>设备名称</td>
         <td>出厂编号</td>
         <td>规格型号</td>
       </tr>
       <tr v-for="device, index in deviceList" :key="'device' + device.deviceId">
         <td>
-          <div class="delete-btn" @click="removeDevice(device, index)">
+          <div class="delete-btn" v-if="device.days == 0 && taskName == '核算编制'" @click="removeDevice(device, index)">
             <i class="el-icon-remove-outline" style="color:#F56C6C"></i>
           </div>
         </td>
+        <td>{{ index + 1 }}</td>
         <td>{{ device.device ? device.device.name : '' }}</td>
         <td>{{ device.device ? device.device.code : '' }}</td>
         <td>{{ device.device ? device.device.series : '' }}</td>
         <td style="text-align:right;">{{ device.days }}</td>
         <td style="text-align:right;">{{ device.amount }}</td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust"
-            @change="handleChange(device)"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust"
+              @change="handleChange(device)"></el-input-number>
+          </template>
+          <span v-else>{{ device.daysAdjust }}</span>
         </td>
         <td style="text-align:right;">
           {{ device.amountAdjust }}
         </td>
       </tr>
       <tr>
-        <td colspan="5" class="amount">设备成本合计</td>
+        <td colspan="6" class="amount">设备成本合计</td>
         <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.device ?
           device.device.dayCost : 0) || 0), 0).toFixed(2)}}</td>
         <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.days) ||
           (Number(device.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
-    <div class="mt10">
+    <div class="mt10" v-if="taskName === '核算编制'">
       <el-button type="success" plain icon="el-icon-plus" @click="openDevice" size="mini">新增设备</el-button>
     </div>
     <!-- 选择设备对话框 -->
     deviceList: {
       type: Array,
       default: () => []
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {

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

       <tr v-for="staff, index in staffList" :key="'user' + index">
         <td>
           <!-- <el-button type="danger" icon="el-icon-minus" circle plain></el-button> -->
-          <div class="delete-btn" @click="removeStaff(staff, index)"><i class="el-icon-remove-outline"
-              style="color:#F56C6C"></i>
+          <div class="delete-btn" v-if="staff.days == 0 && taskName == '核算编制'" @click="removeStaff(staff, index)"><i
+              class="el-icon-remove-outline" style="color:#F56C6C"></i>
           </div>
         </td>
         <td>{{ index + 1 }}</td>
         <td style="text-align:right;">{{ staff.amount }}</td>
         <td style="text-align:right;">{{ (staff.dayCost * staff.daysAdjust).toFixed(2) }}</td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="staff.daysAdjust"
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" style="width:100%;" v-model="staff.daysAdjust"
             @change="handleChange(staff)"></el-input-number>
+          <span v-else>{{ staff.daysAdjust }}</span>
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="staff.performanceAdjust"
-            @change="handleChange(staff)"></el-input-number>
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" style="width:100%;"
+            v-model="staff.performanceAdjust" @change="handleChange(staff)"></el-input-number>
+          <span v-else>{{ staff.performanceAdjust }}</span>
         </td>
         <td style="text-align:right;">
           {{ staff.amountAdjust }}
         <td colspan="5" class="head amount">内业人员成本合计</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.staffCost) || 0), 0).toFixed(2)}}</td>
-        <td class="head amount"  :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
-          (Number(staff.performance) || 0), 0).toFixed(2)}}</td>
+        <td class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">
+          {{staffList.reduce((sum, staff) => sum +
+            (Number(staff.performance) || 0), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum + (Number(staff.amount)
           || 0), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           ((staff.dayCost * staff.daysAdjust)), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.daysAdjust) || 0), 0).toFixed(2)}}</td>
-        <td class="head amount" :class="{ 'performance-error': isPerformanceAdjustExceeded() }" style="text-align:right;">
+        <td class="head amount" :class="{ 'performance-error': isPerformanceAdjustExceeded() }"
+          style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
-    <div class="add-staff mt10">
+    <div class="add-staff mt10" v-if="taskName === '核算编制'">
       <el-button type="success" plain icon="el-icon-plus" @click="openPeople" size="mini">新增人员</el-button>
     </div>
     <!-- 选择人员对话框 -->
     settleAdjust: {
       type: Number,
       default: 0
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {
       isOpenPeople: false,
     }
   },
-  watch: {
-
-  },
-  mounted() {
-  },
   methods: {
     handleChange(staff) {
       staff.amountAdjust = ((Number(staff.dayCost || 0) * Number(staff.daysAdjust || 0)) + Number(staff.performanceAdjust || 0)).toFixed(2)

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

         <td style="min-width:100px;">固定成本合计</td>
         <td style="min-width:100px;">绩效成本合计</td>
         <td style="width:120px;min-width:80px;">预算金额</td>
-        <td class="adjust" style="width:120px;min-width:80px;">核算固定成本</td>
         <td class="adjust" style="width:120px;min-width:80px;">核算天数</td>
         <td class="adjust" style="width:120px;min-width:80px;">核算系数</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算固定成本</td>
         <td class="adjust" style="width:120px;min-width:80px;">核算绩效</td>
         <td class="adjust" style="width:120px;min-width:80px;">核算金额</td>
       </tr>
       <tr v-for="staff, index in staffList" :key="'user' + staff.userId">
         <td>
-          <div class="delete-btn" @click="removeStaff(staff, index)">
+          <div class="delete-btn" v-if="staff.days == 0" @click="removeStaff(staff, index)">
             <i class="el-icon-remove-outline" style="color:#F56C6C"></i>
           </div>
         </td>
         <td style="text-align:right;">{{ staff.staffCost }}</td>
         <td style="text-align:right;">{{ staff.performance }}</td>
         <td style="text-align:right;">{{ staff.amount }}</td>
-        <td style="text-align:right;">{{ (staff.dayCost * staff.daysAdjust).toFixed(2) }}</td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="staff.daysAdjust"
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" style="width:100%;" v-model="staff.daysAdjust"
             @change="handleChange(staff)"></el-input-number>
+          <span v-else>{{ staff.daysAdjust }}</span>
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="staff.coefficientAdjust"
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" style="width:100%;" v-model="staff.coefficientAdjust"
             @change="handleChange(staff)"></el-input-number>
+          <span v-else>{{ staff.coefficientAdjust }}</span>
         </td>
+        <td style="text-align:right;">{{ (staff.dayCost * staff.daysAdjust).toFixed(2) }}</td>
         <td style="text-align:right;">
           {{ staff.performanceAdjust }}
         </td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.amount) || 0),
           0).toFixed(2)}}</td>
-        <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
-          ((staff.dayCost * staff.daysAdjust)), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.daysAdjust) || 0), 0).toFixed(2)}}</td>
         <td class="head amount">
           ——
         </td>
+        <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
+          ((staff.dayCost * staff.daysAdjust)), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0).toFixed(2)}}
         </td>
           {{staffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
-    <div class="add-staff mt10">
+    <div class="add-staff mt10" v-if="taskName === '核算编制'">
       <el-button type="success" plain icon="el-icon-plus" @click="openPeople" size="mini">新增人员</el-button>
     </div>
     <!-- 选择人员对话框 -->
     staffList: {
       type: Array,
       default: () => []
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {

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

  * @Author: ysh
  * @Date: 2025-05-15 15:30:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-16 09:59:30
+ * @LastEditTime: 2025-05-19 11:24:43
 -->
 <template>
   <div class="site-cost">
         <td>{{ index + 1 }}</td>
         <td>{{ site.name }}</td>
         <td style="text-align: right;">{{ site.amount }}</td>
-        <td>
-          <el-input-number :controls="false" v-model="site.amountAdjust" placeholder="请输入核算金额"
+        <td style="text-align: right;">
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" v-model="site.amountAdjust" placeholder="请输入核算金额"
             @change="handleSiteChange(site)" />
+          <span v-else>{{ site.amountAdjust }}</span>
         </td>
         <td style="text-align: left;">{{ site.remark }}</td>
       </tr>
     siteList: {
       type: Array,
       default: () => []
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   methods: {

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

  * @Author: ysh
  * @Date: 2025-05-15 18:24:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-16 10:33:48
+ * @LastEditTime: 2025-05-19 15:26:20
 -->
 <template>
   <div class="business-cost">
           {{ budgetForm.outExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.outAdjust" :min="0" :step="0.01"
-            @change="updateTotalJYAmount"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" v-model="budgetForm.outAdjust" :min="0" :step="0.01"
+              @change="updateTotalJYAmount"></el-input-number>
+          </template>
+          <span v-else>{{ budgetForm.outAdjust }}</span>
         </td>
         <td class="remark-cell">{{ budgetForm.outRemark }}</td>
       </tr>
           {{ budgetForm.letterExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.letterAdjust" :min="0" :step="0.01"
-            @change="updateTotalJYAmount"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" v-model="budgetForm.letterAdjust" :min="0" :step="0.01"
+              @change="updateTotalJYAmount"></el-input-number>
+          </template>
+          <span v-else>{{ budgetForm.letterAdjust }}</span>
         </td>
         <td class="remark-cell">{{ budgetForm.letterRemark }}</td>
       </tr>
           {{ budgetForm.winExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.winAdjust" :min="0" :step="0.01"
-            @change="updateTotalJYAmount"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" v-model="budgetForm.winAdjust" :min="0" :step="0.01"
+              @change="updateTotalJYAmount"></el-input-number>
+          </template>
+          <span v-else>{{ budgetForm.winAdjust }}</span>
         </td>
         <td class="remark-cell">{{ budgetForm.winRemark }}</td>
       </tr>
           {{ budgetForm.taxExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.taxAdjust" :min="0" :step="0.01"
-            @change="updateTotalJYAmount"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" v-model="budgetForm.taxAdjust" :min="0" :step="0.01"
+              @change="updateTotalJYAmount"></el-input-number>
+          </template>
+          <span v-else>{{ budgetForm.taxAdjust }}</span>
         </td>
         <td class="remark-cell">{{ budgetForm.taxRemark }}</td>
       </tr>
           {{ budgetForm.travelExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.travelAdjust" :min="0" :step="0.01"
-            @change="updateTotalJYAmount"></el-input-number>
+          <template v-if="taskName === '核算编制'">
+            <el-input-number :controls="false" v-model="budgetForm.travelAdjust" :min="0" :step="0.01"
+              @change="updateTotalJYAmount"></el-input-number>
+          </template>
+          <span v-else>{{ budgetForm.travelAdjust }}</span>
         </td>
         <td class="remark-cell">{{ budgetForm.travelRemark }}</td>
       </tr>
     budgetForm: {
       type: Object,
       required: true
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {
   methods: {
     initTotalJYAmount() {
       this.totalJYAmount = ((Number(this.budgetForm.outExpense) || 0) + (Number(this.budgetForm.letterExpense) || 0) + (Number(this.budgetForm.winExpense) || 0) + (Number(this.budgetForm.taxExpense) || 0) + (Number(this.budgetForm.travelExpense) || 0)).toFixed(2)
+
     },
     updateTotalJYAmount() {
       this.totalJYAmountAdjust = ((Number(this.budgetForm.outAdjust) || 0) + (Number(this.budgetForm.letterAdjust) || 0) + (Number(this.budgetForm.winAdjust) || 0) + (Number(this.budgetForm.taxAdjust) || 0) + (Number(this.budgetForm.travelAdjust) || 0)).toFixed(2)
+      this.$emit('update:budgetForm', this.budgetForm);
     }
   }
 }

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

       </tr>
       <tr v-for="other, index in otherList" :key="other.id">
         <td>
-          <div class="delete-btn" @click="removeOther(other, index)"><i class="el-icon-remove-outline"
-              style="color:#F56C6C"></i>
+          <div class="delete-btn" v-if="taskName == '核算编制'" @click="removeOther(other, index)"><i
+              class="el-icon-remove-outline" style="color:#F56C6C"></i>
           </div>
         </td>
         <td>{{ index + 1 }}</td>
         <td>
-          <el-input v-model="other.name" placeholder="请输入名称" />
+          <el-input v-if="taskName === '核算编制'" v-model="other.name" placeholder="请输入名称" />
+          <span v-else>{{ other.name }}</span>
         </td>
-        <td>
-          <el-input-number :controls="false" v-model="other.amountAdjust" placeholder="请输入核算金额"
-            @change="handleOtherChange(other)" />
+        <td style="text-align: right;">
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" v-model="other.amountAdjust"
+            placeholder="请输入核算金额" @change="handleOtherChange(other)" />
+          <span v-else>{{ other.amountAdjust }}</span>
         </td>
-        <td>
-          <el-input type="textarea" :rows="2" v-model="other.remark" placeholder="请输入备注" />
+        <td style="text-align: left;">
+          <el-input v-if="taskName === '核算编制'" type="textarea" :rows="2" v-model="other.remark" placeholder="请输入备注" />
+          <span v-else>{{ other.remark }}</span>
         </td>
       </tr>
       <tr>
         <td colspan="3" class="amount">预算外开支合计</td>
-        <td class="amount" style="text-align: right;">{{otherList.reduce((sum, other) => sum + (Number(other.amountAdjust) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align: right;">{{otherList.reduce((sum, other) => sum +
+          (Number(other.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
-    <div class="add-staff mt10">
+    <div class="add-staff mt10" v-if="taskName === '核算编制'">
       <el-button type="success" plain icon="el-icon-plus" @click="addOther" size="mini">新增项</el-button>
     </div>
   </div>
         amountAdjust: null,
         remark: ''
       }]
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   watch: {

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

  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-15 17:40:52
+ * @LastEditTime: 2025-05-19 17:03:41
 -->
 <template>
   <div class="main" v-loading="loading">
     <h2 class="text-center">项目直接生产成本预算表</h2>
     <p style="text-align: center">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
     <el-divider></el-divider>
-    <div class="mt20 mb20" v-if="showAlter">
+    <div class="mt20 mb20" v-if="showAlter && taskName">
       <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
         <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
       </el-alert>
           </tr>
         </table>
       </el-descriptions-item>
-      <el-descriptions-item label="现场开支" :span="3">
+      <el-descriptions-item label="现场开支" :span="3" v-if="siteList.length > 0">
         <table border="1" style="width:100%;">
           <tr style="background-color:#f8f8f9">
             <td>序号</td>
         </div>
       </el-descriptions-item>
     </el-descriptions>
-    <div class="text-center mt20 mb20">
+    <div class="text-center mt20 mb20" v-if="taskName">
       <el-button type="danger" @click="returnOpen = true">退 回</el-button>
       <el-button type="warning" @click="preserve()">保 存</el-button>
       <el-button type="success" @click="confirmSucess()">提交下一个流程</el-button>
       type: String,
     }
   },
+  watch: {
+    'taskForm.formId'() {
+      this.initBudgetForm();
+      this.getProjectWorkList();
+      this.getContractInfo();
+    }
+  },
   data() {
     return {
       loading: true,

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-04-24 10:55:22
+ * @LastEditTime: 2025-05-19 17:08:57
 -->
 <template>
   <div class="main">
     <div v-loading="loading">
-      <h2 class="text-center">项目直接生产成本预算表</h2>
+      <h2 class="text-center">项目直接生产成本预算表（旧版）</h2>
       <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
       <el-descriptions :column="3" border class="descriptions">
         <el-descriptions-item label="项目编号">

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-04 14:12:25
+ * @LastEditTime: 2025-05-19 16:30:37
 -->
 <template>
   <div>
       v-else-if="taskForm.procDefName == '绩效审批'"></performance-form>
     <study-form :key="'study' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
       v-else-if="taskForm.procDefName == '参培审核'"></study-form>
+    <budget-adjust :key="'budgetAdjust' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
+      v-else-if="taskForm.procDefName == '项目核算'"></budget-adjust>
   </div>
 </template>
 
 import outsourceForm from '@/views/flowable/form/outsource/outsourceForm.vue';
 import performanceForm from '@/views/flowable/form/performance/performanceForm.vue';
 import StudyForm from "@/views/flowable/form//oa/studyForm.vue";
+import BudgetAdjust from '@/views/flowable/form/budget/adjust/budgetAdjust.vue';
 export default {
   props: {
     passingParam: {
     procureForm,
     outsourceForm,
     performanceForm,
-    StudyForm
+    StudyForm,
+    BudgetAdjust
   },
   data() {
     return {

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

     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
-      <budget-info :taskForm="taskForm"  :taskName="''"></budget-info>
+      <budget-adjust :taskForm="taskForm" :taskName="''" :row="clickRow" v-if="isAdjust"></budget-adjust>
+      <div v-else>
+        <budget-info v-if="isOld" :taskForm="taskForm" :taskName="''"></budget-info>
+        <new-budget-info v-if="!isOld" :taskForm="taskForm" :taskName="''"></new-budget-info>
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
 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 FormData from './formData.vue';
-import { checkPermi } from '@/utils/permission';
 export default {
   name: "Budget",
-  components: { budgetInfo, FormData, },
+  components: { budgetInfo, FormData, newBudgetInfo, budgetAdjust },
   data() {
     return {
       // 遮罩层
       rules: {
       },
       taskForm: {
-        formId:''
+        formId: ''
       },
       projectList: [],
       queryType: '1',
+      isOld: false,
+      clickRow: {},
+      isAdjust: false
     };
   },
   created() {
         this.total = response.total;
         this.loading = false;
       });
-    }, 
+    },
     remoteMethod(val) {
       let params1 = {
         pageNum: 1,
       this.open = true;
       this.title = "添加预算";
     },
-    handleView(row) {
-      this.taskForm.formId = row.projectId;
+    async handleView(row) {
+      this.isAdjust = this.$store.getters.roles.includes('leader') || this.$store.getters.roles.includes('finance')
+        || this.$store.getters.roles.includes('nfinance') || this.$store.getters.roles.includes('admin');
+      if (this.isAdjust) {
+        let res = await listCheck({ budgetId: row.budgetId });
+        if (res.rows.length > 0) {
+          this.taskForm.formId = res.rows[0].checkId;
+        } else {
+          this.taskForm.formId = row.projectId;
+          this.isAdjust = false;
+        }
+      } else {
+        this.taskForm.formId = row.projectId;
+      }
+      this.clickRow = row;
+      let old = Number(row.project.projectNumber.substring(0, 4));
+      if (old >= 2025) {
+        this.isOld = false;
+      } else {
+        this.isOld = true;
+      }
       this.infoOpen = true;
     },
     /** 修改按钮操作 */