修改项目预算，新增项目核算，编写核算编制表单

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

@@ -79,18 +79,6 @@ public class CmcBudgetController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
     {
-        if (cmcBudget.getManagerComment() != null && cmcBudget.getZjlComment() == null) {
-            cmcBudget.setManager(getLoginUser().getUserId());
-            cmcBudget.setManagerTime(new Date());
-        }
-        if (cmcBudget.getZjlComment() != null && cmcBudget.getDszComment() == null) {
-            cmcBudget.setAuditor(getLoginUser().getUserId());
-            cmcBudget.setZjlTime(new Date());
-        }
-        if (cmcBudget.getDszComment() != null && cmcBudget.getDszTime() == null) {
-            cmcBudget.setApprover(getLoginUser().getUserId());
-            cmcBudget.setDszTime(new Date());
-        }
         return toAjax(cmcBudgetService.updateCmcBudget(cmcBudget));
     }
 

oa-ui/src/api/oa/budget/check.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc项目核算列表
+export function listCheck(query) {
+  return request({
+    url: '/oa/check/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目核算详细
+export function getCheck(checkId) {
+  return request({
+    url: '/oa/check/' + checkId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目核算
+export function addCheck(data) {
+  return request({
+    url: '/oa/check',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目核算
+export function updateCheck(data) {
+  return request({
+    url: '/oa/check',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目核算
+export function delCheck(checkId) {
+  return request({
+    url: '/oa/check/' + checkId,
+    method: 'delete'
+  })
+}

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

@@ -149,12 +149,12 @@
 <script>
 import { Snowflake } from "@/utils/snowFlake.js";
 import { getProject } from "@/api/oa/project/project";
-import { listBudget, addBudget, updateBudget, delBudget } from "@/api/oa/budget/budget.js";
-import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar.js";
-import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
-import { listBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice.js";
-import { listBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
-import { listSite, getSite, delSite, addSite, updateSite } from "@/api/oa/budget/budgetSite.js";
+import { listBudget, addBudget, updateBudget } from "@/api/oa/budget/budget.js";
+import { addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar.js";
+import { addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
+import { addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice.js";
+import { addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
+import { delSite, addSite } from "@/api/oa/budget/budgetSite.js";
 import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUsersDeptLeader, getDeptLeadersByDeptId } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import budgetInfo from "./budgetInfo.vue";

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

@@ -0,0 +1,218 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-14 16:09:56
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-14 16:56:52
+-->
+<template>
+  <div class="app-container">
+    <transition name="fade-transform" mode="out-in">
+      <div v-if="!projectId" key="selection">
+        <div class="selection-header">
+          <h3 style="font-weight: bold; color: #FF5733;">选择核算项目</h3>
+        </div>
+        <el-form :model="queryParams" ref="queryForm" :inline="true" class="search-form">
+          <el-form-item prop="projectId">
+            <el-select v-model="queryType" style="width: 120px;">
+              <el-option label="项目编号" value="1"></el-option>
+              <el-option label="项目名称" value="2"></el-option>
+            </el-select>
+            <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+              :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
+              <el-option v-for="project in projectList" :key="project.projectId"
+                :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="budgetList">
+          <el-table-column label="序号" align="center" type="index" width="60" />
+          <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="totalBudget" />
+          <el-table-column label="编制人" align="center" prop="compiler">
+            <template slot-scope="scope">
+              {{ getUserName(scope.row.compiler) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审核人" align="center" prop="auditor">
+            <template slot-scope="scope">
+              {{ getUserName(scope.row.auditor) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="handleSelect(scope.row)">选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <div v-else key="adjust">
+        <div class="adjust-header" v-if="hideReturn">
+          <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>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+import { listBudget, getBudget } from '@/api/oa/budget/budget';
+import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
+import { listProject } from '@/api/oa/project/project';
+import BudgetAdjust from './budgetAdjust.vue';
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    },
+    taskName: {
+      type: String,
+    }
+  },
+  components: {
+    BudgetAdjust
+  },
+  data() {
+    return {
+      loading: true,
+      projectId: '',
+      budgetList: [],
+      total: 0,
+      selectedRows: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: undefined,
+        projectName: undefined
+      },
+      queryType: '1',
+      projectList: [],
+      hideReturn: true
+    }
+  },
+  created() {
+    this.initForm();
+    this.getBudgetList();
+  },
+  methods: {
+    initForm() {
+      getCheck(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.hideReturn = false;
+          this.projectId = res.data.projectId;
+          getBudget(res.data.budgetId).then(response => {
+            this.selectedRows = response.data;
+          })
+        }
+      })
+    },
+    getBudgetList() {
+      listBudget(this.queryParams).then(res => {
+        this.budgetList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      });
+    },
+    handleSelect(row) {
+      this.projectId = row.projectId;
+      this.selectedRows = row;
+      console.log(row);
+    },
+    handleBack() {
+      this.projectId = '';
+    },
+    getList() {
+      this.loading = true;
+      this.getBudgetList();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 重置表单 */
+    resetForm(refName) {
+      if (this.$refs[refName]) {
+        this.$refs[refName].resetFields();
+      }
+    },
+    remoteMethod(val) {
+      let params1 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    preserve() {
+      this.hideReturn = false;
+      console.log(1111);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selection-header,
+.adjust-header {
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+
+  h3 {
+    margin: 0;
+    margin-left: 10px;
+  }
+}
+
+.search-form {
+  margin-bottom: 20px;
+  padding: 20px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+
+.fade-transform-enter-active,
+.fade-transform-leave-active {
+  transition: all 0.5s;
+}
+
+.fade-transform-enter {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.fade-transform-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
+</style>

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

@@ -1,11 +1,11 @@
 <!--
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
- * @LastEditors: 
- * @LastEditTime: 2025-05-12 17:18:35
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-14 18:27:04
 -->
 <template>
-  <div class="main">
+  <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>
@@ -108,7 +108,7 @@
         </table>
       </el-descriptions-item>
       <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
-        <inner-staff-cost :staffList.sync="innerStaffList"
+        <inner-staff-cost :staffList.sync="innerStaffList" :settleExpense="budgetForm.settleExpense"
           @update:staffList="handleInnerStaffChange"></inner-staff-cost>
       </el-descriptions-item>
       <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
@@ -140,16 +140,22 @@
 
       </el-descriptions-item>
     </el-descriptions>
+    <div class="text-center mt20 mb20">
+      <el-button type="warning" @click="preserve()">保 存</el-button>
+      <el-button type="success" @click="confirmSucess()">提交下一个流程</el-button>
+    </div>
   </div>
 </template>
 
 <script>
+import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
 import { listBudget, updateBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar, updateBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice, updateBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle, updateBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudgetCar, updateBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice, updateBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle, updateBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
+import { listSite, delSite, addSite } from "@/api/oa/budget/budgetSite";
 import { getProject } from "@/api/oa/project/project";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
@@ -170,6 +176,9 @@ export default {
     },
     taskName: {
       type: String,
+    },
+    row: {
+      type: Object,
     }
   },
   data() {
@@ -192,7 +201,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(async res => {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.row.projectId }).then(async res => {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
@@ -205,12 +214,36 @@ export default {
           this.carList = carRes.rows;
 
           // 获取内业人员数据
-          let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId });
+          let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
           this.innerStaffList = innerStaffRes.rows;
+          this.innerStaffList = this.innerStaffList.map(staff => {
+            return {
+              ...staff,
+              dayCost: Number(staff.dayCost).toFixed(2),
+              performance: Number(staff.performance).toFixed(2),
+              amount: Number(staff.amount).toFixed(2),
+              staffCost: Number(staff.staffCost).toFixed(2),
+              daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
+              performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
+              amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
+            };
+          });
 
           // 获取外业人员数据
-          let outerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId });
+          let outerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '外业' });
           this.outerStaffList = outerStaffRes.rows;
+          this.outerStaffList = this.outerStaffList.map(staff => {
+            return {
+              ...staff,
+              dayCost: Number(staff.dayCost).toFixed(2),
+              performance: Number(staff.performance).toFixed(2),
+              amount: Number(staff.amount).toFixed(2),
+              staffCost: Number(staff.staffCost).toFixed(2),
+              daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
+              performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
+              amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
+            };
+          });
 
           // 获取内业绩效额数据
           let settleRes = await listBudgetSettle({ pageSize: 100, budgetId });
@@ -233,17 +266,16 @@ export default {
       });
     },
     getProjectWorkList() {
-      getProject(this.taskForm.formId).then(res => {
+      getProject(this.row.projectId).then(res => {
         this.project = res.data;
       })
-      listProjectWork({ pageSize: 999, projectId: this.taskForm.formId }).then(res => {
+      listProjectWork({ pageSize: 999, projectId: this.row.projectId }).then(res => {
         this.workContentList = res.rows;
       })
     },
     // 处理内业人员数据变化
     handleInnerStaffChange(newList) {
       this.innerStaffList = newList;
-      console.log(newList)
       // 计算内业人员总成本
       const totalAmount = this.innerStaffList.reduce((sum, staff) => {
         return sum + (staff.amountAdjust || 0);
@@ -272,6 +304,30 @@ export default {
         // updateBudget(this.budgetForm);
       }
     },
+    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) {
+        await addCheck(obj);
+        this.$emit('preserve');
+      }
+      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);
+        }
+      })
+      this.$message.success('保存成功');
+    },
+    confirmSucess() {
+
+    }
   },
 }
 </script>
@@ -282,7 +338,7 @@ export default {
 }
 
 .main {
-  width: 85%;
+  width: 90%;
   margin: 0 auto;
   text-align: center;
 }

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

@@ -7,13 +7,15 @@
         <td>姓名</td>
         <td>人员成本（天）</td>
         <td style="width:120px">预算天数</td>
-        <td>预算绩效</td>
-        <td style="width:120px">金额</td>
+        <td>固定成本合计</td>
+        <td>绩效成本合计</td>
+        <td style="width:120px">预算金额</td>
+        <td class="adjust" style="width:120px">核算固定成本</td>
         <td class="adjust" style="width:120px">核算天数</td>
         <td class="adjust" style="width:120px">核算绩效</td>
         <td class="adjust" style="width:120px">核算金额</td>
       </tr>
-      <tr v-for="staff, index in staffList" :key="'user' + staff.userId">
+      <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" v-if="index + 1 > lens" @click="removeStaff(index)"><i class="el-icon-remove-outline"
@@ -24,20 +26,39 @@
         <td>{{ staff.user ? staff.user.nickName : '' }}</td>
         <td>{{ staff.dayCost }}</td>
         <td>{{ staff.days }}</td>
-        <td>{{ staff.performance }}</td>
-        <td>{{ staff.amount }}</td>
-        <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"
             @change="handleChange(staff)"></el-input-number>
         </td>
-        <td>
+        <td style="text-align:right;">
           <el-input-number :controls="false" style="width:100%;" v-model="staff.performanceAdjust"
             @change="handleChange(staff)"></el-input-number>
         </td>
-        <td>
+        <td style="text-align:right;">
           {{ staff.amountAdjust }}
         </td>
       </tr>
+      <tr>
+        <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" 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': isPerformanceExceeded() }" style="text-align:right;">
+          {{staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0).toFixed(2)}}</td>
+        <td class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">
+          {{staffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2)}}</td>
+      </tr>
     </table>
     <div class="add-staff mt10">
       <el-button type="success" plain icon="el-icon-plus" @click="openPeople" size="mini">新增人员</el-button>
@@ -61,6 +82,10 @@ export default {
     staffList: {
       type: Array,
       default: () => []
+    },
+    settleExpense: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -70,19 +95,14 @@ export default {
     }
   },
   watch: {
-    staffList(newval, oldval) {
-      if (oldval.length == 0) {
-        this.lens = newval.length;
-        console.log(this.lens)
-      }
-    }
+
   },
   mounted() {
-
+    this.lens = this.staffList.length;
   },
   methods: {
     handleChange(staff) {
-      staff.amountAdjust = ((Number(staff.staffCost) * Number(staff.daysAdjust)) + Number(staff.settleAdjust)).toFixed(2)
+      staff.amountAdjust = ((Number(staff.dayCost || 0) * Number(staff.daysAdjust || 0)) + Number(staff.performanceAdjust || 0)).toFixed(2)
       this.$emit('update:staffList', this.staffList);
     },
     openPeople() {
@@ -93,7 +113,13 @@ export default {
         v.days = 0;
         v.settle = 0;
         v.amount = 0;
-        v.user = v
+        v.user = v;
+        v.dayCost = parseFloat(((v.salary.salary + 1780) * 12) / 365).toFixed(2);
+        v.staffCost = 0;
+        v.performance = 0;
+        v.daysAdjust = 0;
+        v.performanceAdjust = 0;
+        v.amountAdjust = 0;
       }
       this.staffList.push(...val);
       this.isOpenPeople = false;
@@ -113,6 +139,10 @@ export default {
           arr.splice(index, 1);
         }
       }).catch(() => { });
+    },
+    isPerformanceExceeded() {
+      const totalPerformance = this.staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0);
+      return totalPerformance > Number(this.settleExpense);
     }
   }
 }
@@ -144,4 +174,23 @@ export default {
   cursor: pointer;
   font-size: 18px;
 }
+
+.amount {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+.head.amount {
+  font-weight: bold;
+}
+
+.performance-error {
+  background-color: #fef0f0 !important;
+  color: #f56c6c !important;
+  border: 1px solid #fbc4c4 !important;
+}
+
+.performance-error:hover {
+  background-color: #fde2e2 !important;
+}
 </style>

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

@@ -8,7 +8,10 @@
         <td>人员成本（天）</td>
         <td style="width:120px">预算天数</td>
         <td>预算系数</td>
+        <td>固定成本合计</td>
+        <td>绩效成本合计</td>
         <td style="width:120px">金额</td>
+        <td class="adjust" style="width:120px">核算固定成本</td>
         <td class="adjust" style="width:120px">核算天数</td>
         <td class="adjust" style="width:120px">核算系数</td>
         <td class="adjust" style="width:120px">核算金额</td>
@@ -24,19 +27,43 @@
         <td>{{ staff.dayCost }}</td>
         <td>{{ staff.days }}</td>
         <td>{{ staff.coefficient }}</td>
-        <td>{{ staff.amount }}</td>
-        <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"
             @change="handleChange(staff)"></el-input-number>
         </td>
-        <td>
+        <td style="text-align:right;">
           <el-input-number :controls="false" style="width:100%;" v-model="staff.coefficientAdjust"
             @change="handleChange(staff)"></el-input-number>
         </td>
-        <td>
+        <td style="text-align:right;">
           {{ staff.amountAdjust }}
         </td>
       </tr>
+      <tr>
+        <td colspan="6" 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" 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" style="text-align:right;">
+         ——
+        </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">
       <el-button type="success" plain icon="el-icon-plus" @click="openPeople" size="mini">新增人员</el-button>
@@ -75,10 +102,13 @@ export default {
       }
     }
   },
+  mounted() {
+    this.lens = this.staffList.length;
+  },
   methods: {
     handleChange(staff) {
       // 计算调整后的金额
-      staff.amountAdjust = (Number(staff.staffCost) * Number(staff.daysAdjust) * Number(staff.coefficientAdjust) * Number(staff.otherCoefficientAdjust)).toFixed(2)
+      staff.amountAdjust = (Number(staff.dayCost) * Number(staff.daysAdjust) + (200 * Number(staff.daysAdjust) * Number(staff.coefficient))).toFixed(2)
       this.$emit('update:staffList', this.staffList);
     },
     openPeople() {
@@ -141,4 +171,13 @@ export default {
   cursor: pointer;
   font-size: 18px;
 }
+
+.amount {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+.head.amount {
+  font-weight: bold;
+}
 </style>

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

@@ -2,13 +2,18 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-13 18:05:08
+ * @LastEditTime: 2025-05-14 14:18:45
 -->
 <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">
+      <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+        <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+      </el-alert>
+    </div>
     <el-descriptions :column="3" border class="descriptions">
       <el-descriptions-item label="项目编号">
         {{ project.projectNumber }}
@@ -40,23 +45,12 @@
               <td style="width: 200px">备注</td>
             </tr>
             <tr v-for="(work, index) in workContentList" :key="index">
-              <td>
-                {{ work.content }}
-              </td>
-              <td>
-                {{ work.scale }}
-              </td>
-              <td>
-                {{ work.unit }}
-              </td>
-              <td>
-                {{ work.workload }}
-              </td>
-              <td>
-                {{ work.deadline }}
-              </td>
-              <td class="remark-cell">
-                {{ work.remark }}
+              <td>{{ work.content }}</td>
+              <td>{{ work.scale }} </td>
+              <td>{{ work.unit }}</td>
+              <td>{{ work.workload }}</td>
+              <td>{{ work.deadline }}</td>
+              <td class="remark-cell">{{ work.remark }}
               </td>
             </tr>
           </table>
@@ -97,12 +91,13 @@
             <td v-else>
               {{ work.coefficient }}
             </td>
-            <td style="text-align:right;">{{ work.settle ? work.settle.toFixed(2) : '0.00' }}</td>
+            <td style="text-align:right;">{{ work.settle ? Number(work.settle).toFixed(2) : '0.00' }}</td>
             <td class="remark-cell">{{ work.remark ? work.remark : '' }}</td>
           </tr>
           <tr>
             <td :colspan="7" class="head amount">内业绩效额合计</td>
-            <td :colspan="1" class="head amount" style="text-align:right;">
+            <td :colspan="1" class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }"
+              style="text-align:right;">
               {{ budgetForm.settleExpense ? budgetForm.settleExpense.toFixed(2) : '0.00' }}
             </td>
             <td></td>
@@ -126,27 +121,28 @@
             <td>{{ staff.user ? staff.user.nickName : '' }}</td>
             <td>{{ staff.dayCost }}</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="staff.days" :min="0"
-                :step="0.01" @change="(val) => updateInnerStaffAmount(staff, val, 'days')"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="staff.days" :min="0" :step="0.01"
+                @change="(val) => updateInnerStaffAmount(staff, val, 'days')"></el-input-number>
             </td>
             <td v-else>{{ staff.days }}</td>
             <td style="text-align:right;">{{ staff.staffCost }}</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="staff.performance" :min="0"
-                :step="0.01" @change="(val) => updateInnerStaffAmount(staff, val, 'performance')"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="staff.performance" :min="0" :step="0.01"
+                @change="(val) => updateInnerStaffAmount(staff, val, 'performance')"></el-input-number>
             </td>
-            <td v-else style="text-align:right;">{{ staff.performance }}</td>
+            <td v-else>{{ staff.performance }}</td>
             <td style="text-align:right;">{{ staff.amount }}</td>
             <td class="remark-cell">{{ staff.remark }}</td>
-          </tr> 
+          </tr>
           <tr>
             <td colspan="4" class="head amount">内业人员成本合计</td>
             <td class="head amount" style="text-align:right;">{{innerStaffList.reduce((sum, staff) => sum +
               (Number(staff.staffCost) || 0),
               0).toFixed(2)}}</td>
-            <td class="head amount" style="text-align:right;">{{innerStaffList.reduce((sum, staff) => sum +
-              (Number(staff.performance) || 0),
-              0).toFixed(2)}}</td>
+            <td class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">
+              {{innerStaffList.reduce((sum, staff) => sum +
+                (Number(staff.performance) || 0),
+                0).toFixed(2)}}</td>
             <td class="head amount" style="text-align:right;">{{innerStaffList.reduce((sum, staff) => sum +
               (Number(staff.amount) || 0),
               0).toFixed(2)}}</td>
@@ -173,13 +169,13 @@
             <td>{{ staff.dayCost }}</td>
             <td>200</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="staff.days" :min="0"
-                :step="0.01" @change="(val) => updateOuterStaffAmount(staff, val, 'days')"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="staff.days" :min="0" :step="0.01"
+                @change="(val) => updateOuterStaffAmount(staff, val, 'days')"></el-input-number>
             </td>
             <td v-else>{{ staff.days }}</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="staff.coefficient" :min="0"
-                :step="0.01" @change="(val) => updateOuterStaffAmount(staff, val, 'coefficient')"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="staff.coefficient" :min="0" :step="0.01"
+                @change="(val) => updateOuterStaffAmount(staff, val, 'coefficient')"></el-input-number>
             </td>
             <td v-else>{{ staff.coefficient }}</td>
             <td style="text-align:right;">{{ staff.staffCost }}</td>
@@ -215,8 +211,8 @@
             <td>{{ car.car ? car.car.licensePlate : '' }}</td>
             <td>{{ car.car ? car.car.dayCost : '' }}</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="car.days" :min="0"
-                :step="0.01" @change="(val) => updateCarAmount(car, val)"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="car.days" :min="0" :step="0.01"
+                @change="(val) => updateCarAmount(car, val)"></el-input-number>
             </td>
             <td v-else>{{ car.days }}</td>
             <td style="text-align:right;">{{ car.amount }}</td>
@@ -247,8 +243,8 @@
             <td>{{ device.device ? device.device.brand : '' }}</td>
             <td>{{ device.device ? device.device.dayCost : '' }}</td>
             <td v-if="taskName == '分管审核'">
-              <el-input-number style="width:80px;" :controls="false" v-model="device.days" :min="0"
-                :step="0.01" @change="(val) => updateDeviceAmount(device, val)"></el-input-number>
+              <el-input-number style="width:80px;" :controls="false" v-model="device.days" :min="0" :step="0.01"
+                @change="(val) => updateDeviceAmount(device, val)"></el-input-number>
             </td>
             <td v-else>{{ device.days }}</td>
             <td style="text-align:right;">{{ device.amount }}</td>
@@ -266,13 +262,17 @@
           <tr style="background-color:#f8f8f9">
             <td>序号</td>
             <td>开支项</td>
-            <td>金额</td>
+            <td style="min-width:120px">金额</td>
             <td>备注</td>
           </tr>
           <tr v-for="site, index in siteList" :key="'site' + site.expenseId">
             <td>{{ index + 1 }}</td>
             <td>{{ site.name }}</td>
-            <td style="text-align:right;">{{ site.amount }}</td>
+            <td v-if="taskName == '分管审核'">
+              <el-input-number style="width:100%;" :controls="false" v-model="site.amount" :min="0" :step="0.01"
+                @change="(val) => updateSiteAmount(site, val)"></el-input-number>
+            </td>
+            <td v-else style="text-align:right;">{{ site.amount }}</td>
             <td class="remark-cell">{{ site.remark }}</td>
           </tr>
           <tr>
@@ -362,20 +362,24 @@
           </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(budgetForm.staffCost) ? 0 : 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(budgetForm.carCost) ? 0 : 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(budgetForm.deviceCost) ? 0 : 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>
-          </tr> 
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : Number(budgetForm.siteSum).toFixed(2) }}
+            </td>
+          </tr>
           <tr>
             <td>经营相关成本</td>
             <td style="text-align:right;">{{ isNaN(totalJYAmount) ? 0 : Number(totalJYAmount).toFixed(2) }}</td>
@@ -386,6 +390,20 @@
           </tr>
         </table>
       </el-descriptions-item>
+      <el-descriptions-item label="合同总价" :span="3" v-if="$store.getters.roles.includes('leader')">
+        <table border="1" style="width:100%;">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>合同名称</td>
+            <td>合同总价</td>
+          </tr>
+          <tr v-for="contract, index in contractList" :key="contract.contractId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ contract.contractName }}</td>
+            <td>{{ contract.amount }}</td>
+          </tr>
+        </table>
+      </el-descriptions-item>
       <el-descriptions-item label="分管领导审核意见" :span="3">
         <div v-if="taskName == '分管审核' && !budgetForm.managerComment" class="alert alert-warning"
           style="padding: 10px; border: 1px solid #f0ad4e; background-color: #fcf8e3; color: #8a6d3b;">
@@ -434,12 +452,14 @@ import { listBudget, updateBudget } from "@/api/oa/budget/budget";
 import { listBudgetCar, updateBudgetCar } from "@/api/oa/budget/budgetCar";
 import { listBudgetDevice, updateBudgetDevice } from "@/api/oa/budget/budgetDevice";
 import { listBudgetSettle, updateBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudgetStaff, updateBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
-import { listSite } from "@/api/oa/budget/budgetSite.js";
+import { listSite, updateSite } from "@/api/oa/budget/budgetSite.js";
 import { getProject } from "@/api/oa/project/project";
 import { getUsersManageLeader, getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { listProjectContract } from "@/api/oa/contract/projectContract";
+import { getContract } from "@/api/oa/contract/contract";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
@@ -479,11 +499,14 @@ export default {
       siteList: [],
       totalJYAmount: 0,
       returnOpen: false,
+      contractList: [],
+      showAlter: true,
     }
   },
   created() {
     this.initBudgetForm();
     this.getProjectWorkList();
+    this.getContractInfo();
   },
   methods: {
     initBudgetForm() {
@@ -567,12 +590,29 @@ export default {
           let siteRes = await listSite({ pageSize: 100, budgetId });
           this.siteList = siteRes.rows;
           this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
+
+          // 检查内业人员绩效总额是否超过内业绩效总额
+          const totalPerformance = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0);
+          if (totalPerformance > Number(this.budgetForm.settleExpense)) {
+            this.$message.warning('内业人员绩效总额超过内业绩效总额，请检查');
+          }
         }
         this.loading = false;
       }).catch(() => {
         this.loading = false;
       });
     },
+    getContractInfo() {
+      listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+        let contractIds = res.rows;
+        this.contractList = [];
+        for (let contractId of contractIds) {
+          getContract(contractId.contractId).then(response => {
+            this.contractList.push(response.data);
+          })
+        }
+      })
+    },
     safeNumber(value) {
       const num = Number(value);
       return isNaN(num) ? 0 : num;
@@ -586,6 +626,7 @@ export default {
       })
     },
     async preserve() {
+      this.$message.warning('正在保存，请勿关闭页面');
       if (this.taskName == '分管审核') {
         this.budgetForm.manager = this.$store.getters.userId;
         this.budgetForm.managerTime = this.parseTime(new Date(), '{y}-{m}-{d}');
@@ -593,6 +634,16 @@ export default {
         this.budgetForm.auditor = this.$store.getters.userId;
         this.budgetForm.zjlTime = this.parseTime(new Date(), '{y}-{m}-{d}');
       }
+      if (this.taskName != '经营审核') {
+        await Promise.all([
+          ...this.carList.map(car => updateBudgetCar(car)),
+          ...this.deviceList.map(device => updateBudgetDevice(device)),
+          ...this.innerStaffList.map(staff => updateBudgetStaff(staff)),
+          ...this.outerStaffList.map(staff => updateBudgetStaff(staff)),
+          ...this.workList.map(work => updateBudgetSettle(work)),
+          ...this.siteList.map(site => updateSite(site))
+        ]);
+      }
       await updateBudget(this.budgetForm)
       this.$message.success('保存成功');
     },
@@ -611,10 +662,19 @@ export default {
             return
           }
           let zjlRes = await getUserByPost({ postName: '总经理' });
-          let zjlUserId = zjlRes.data.userId;
+          let zjlUserId = zjlRes.data[0].userId;
           this.$set(this.taskForm.variables, 'approval', zjlUserId);
         }
-        return
+        else if (this.taskName == '总经理审核') {
+          if (!this.budgetForm.zjlComment) {
+            this.$message.error('请填写审核意见')
+            return
+          }
+          let dszRes = await getUserByPost({ postName: '董事长' });
+          let dszUserId = dszRes.data[0].userId;
+          this.$set(this.taskForm.variables, 'approval', dszUserId);
+          this.$set(this.taskForm.variables, "skip", true);
+        }
         //提交到下一个流程
         getNextFlowNode({ taskId: this.taskForm.taskId }).then(res => {
           complete(this.taskForm).then(response => {
@@ -630,7 +690,6 @@ export default {
         Number(this.budgetForm.winExpense || 0) +
         Number(this.budgetForm.taxExpense || 0) +
         Number(this.budgetForm.travelExpense || 0);
-      // Calculate total budget by adding all components
       const innerStaffTotal = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0);
       const outerStaffTotal = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0);
       const carTotal = this.carList.reduce((sum, car) => sum + (Number(car.amount) || 0), 0);
@@ -666,8 +725,13 @@ export default {
       staff.amount = (Number(staff.staffCost) + Number(staff.performance)).toFixed(2);
       let innerStaffTotal = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0);
       let outerStaffTotal = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0);
+      let innerStaffPerformance = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0);
       this.budgetForm.staffCost = (innerStaffTotal + outerStaffTotal).toFixed(2);
       this.updateTotalJYAmount();
+      if (innerStaffPerformance > this.budgetForm.settleExpense) {
+        this.$message.error('内业人员成本超过内业绩效总额，请修改');
+        return;
+      }
     },
     updateOuterStaffAmount(staff, value, field) {
       staff[field] = value;
@@ -681,18 +745,37 @@ export default {
     updateCarAmount(car, value) {
       car.days = value;
       car.amount = (Number(car.car.dayCost) * Number(car.days)).toFixed(2);
+      let carTotal = this.carList.reduce((sum, car) => sum + (Number(car.amount) || 0), 0);
+      this.budgetForm.carCost = carTotal.toFixed(2);
       this.updateTotalJYAmount();
     },
     updateDeviceAmount(device, value) {
       device.days = value;
       device.amount = (Number(device.device.dayCost) * Number(device.days)).toFixed(2);
+      let deviceTotal = this.deviceList.reduce((sum, device) => sum + (Number(device.amount) || 0), 0);
+      this.budgetForm.deviceCost = deviceTotal.toFixed(2);
       this.updateTotalJYAmount();
     },
+    updateSiteAmount(site, value) {
+      site.amount = value;
+      let siteTotal = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
+      this.budgetForm.siteSum = siteTotal.toFixed(2);
+      this.updateTotalJYAmount();
+    },
+    isPerformanceExceeded() {
+      const totalPerformance = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0);
+      return totalPerformance > Number(this.budgetForm.settleExpense);
+    },
+    isReturn(val) {
+      this.showAlter = val;
+    },
   },
 }
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 .mylabel {
   font-weight: bold;
 }
@@ -794,4 +877,22 @@ table {
   line-height: 30px;
   /* 如果需要垂直居中 */
 }
+
+.performance-error {
+  background-color: #fef0f0 !important;
+  color: #f56c6c !important;
+  border: 1px solid #fbc4c4 !important;
+}
+
+.performance-error:hover {
+  background-color: #fde2e2 !important;
+}
+
+.performance-error .el-input-number {
+  .el-input__inner {
+    background-color: #fef0f0;
+    border-color: #f56c6c;
+    color: #f56c6c;
+  }
+}
 </style>

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

@@ -54,6 +54,8 @@
       @goBack="goBack"></performance-form>
     <study-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '参培审核'"
       @goBack="goBack"></study-form>
+    <adjust-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目核算'"
+      @goBack="goBack"></adjust-index>
   </div>
 </template>
 
@@ -86,7 +88,8 @@ import declareForm from '@/views/flowable/form/work/declareForm.vue';
 import procureForm from '@/views/flowable/form/procure/procureForm.vue';
 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 StudyForm from "@/views/flowable/form/oa/studyForm.vue";
+import AdjustIndex from '@/views/flowable/form/budget/adjust/adjustIndex.vue';
 export default {
   components: {
     ScTable,
@@ -117,7 +120,8 @@ export default {
     procureForm,
     outsourceForm,
     PerformanceForm,
-    StudyForm
+    StudyForm,
+    AdjustIndex,
   },
   props: {
     taskForm: {

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-04 14:27:27
+ * @LastEditTime: 2025-05-14 15:41:49
 -->
 <template>
   <div class="app-container">
@@ -75,18 +75,6 @@
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
-      <div v-if="$store.getters.userId == 1">
-        <el-select v-model="queryType" style="width: 120px;">
-          <el-option label="项目编号" value="1"></el-option>
-          <el-option label="项目名称" value="2"></el-option>
-        </el-select>
-        <el-select v-model="projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
-          :remote-method="remoteMethod" style="width: 300px;">
-          <el-option v-for="project in projectList" :key="project.projectId"
-            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
-          </el-option>
-        </el-select>
-      </div>
       <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"
         @close="open = false"></progress-tree>
     </el-dialog>
@@ -127,8 +115,6 @@ export default {
   },
   data() {
     return {
-      queryType: '1',
-      projectId: '',
       projectList: [],
       // 遮罩层
       loading: true,
@@ -292,27 +278,6 @@ export default {
         })
       }
     },
-    remoteMethod(val) {
-      let params1 = {
-        pageNum: 1,
-        pageSize: 20,
-        projectNumber: val
-      }
-      let params2 = {
-        pageNum: 1,
-        pageSize: 20,
-        projectName: val
-      }
-      let params = {};
-      if (this.queryType == '1') {
-        params = params1
-      } else {
-        params = params2
-      }
-      listProject(params).then(res => {
-        this.projectList = res.rows;
-      })
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
@@ -338,10 +303,10 @@ export default {
           return
         }
       }
-      // if (row.category == "assess" || row.category == "car" || ) {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
         let data = res.data;
+        debugger
         if (data.dataType === 'dynamic' && row.name != '项目预算') {
           if (data.type === 'assignee') { // 指定人员
             this.checkSendUser = true;
@@ -369,8 +334,8 @@ export default {
             variables.variables = formData;
             let routePath = this.getRoutePath(row);
             if (row.name == '项目预算') {
-              variables.approval = 1;
-              formData.formId = this.projectId;
+              variables.approval = this.$store.getters.userId;
+              formData.formId = row.projectId;
             }
             // 启动流程并将表单数据加入流程变量
             definitionStart(row.id, JSON.stringify(variables)).then(res => {
@@ -384,10 +349,8 @@ export default {
                 if (records.length == 1) {
                   records = records[0]
                 }
-                if(row.name == '项目预算'){
+                if (row.name == '项目预算') {
                   this.open = false;
-                  this.getList();
-                  return
                 }
                 this.$router.push({
                   path: routePath,

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-26 15:03:14
+ * @LastEditTime: 2025-05-14 15:40:11
 -->
 <template>
   <div>
@@ -24,10 +24,33 @@
       <el-button type="primary" @click="confirm">确定</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </div>
+
+    <!-- 项目编号选择对话框 -->
+    <el-dialog title="请选择将要发起预算的项目" :visible.sync="projectDialogVisible" width="30%" append-to-body>
+      <el-form :model="projectForm" label-width="80px">
+        <el-form-item>
+          <el-select v-model="queryType" style="width: 120px;">
+            <el-option label="项目编号" value="1"></el-option>
+            <el-option label="项目名称" value="2"></el-option>
+          </el-select>
+          <el-select v-model="projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+            :remote-method="remoteMethod" style="width: 300px;">
+            <el-option v-for="project in projectList" :key="project.projectId"
+              :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="projectDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleProjectConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { listProject } from '@/api/oa/project/project';
 export default {
   props: {
     definitionList: {
@@ -47,7 +70,15 @@ export default {
         children: "children",
         label: "name",
       },
-      clickNode: {}
+      clickNode: {},
+      projectDialogVisible: false,
+      projectForm: {
+        projectId: ''
+      },
+      projectList: [], // 项目列表数据
+      timeout: null,
+      queryType: '1',
+      projectId: ''
     };
   },
   mounted() { },
@@ -80,10 +111,15 @@ export default {
           this.treeData[0].children.push(i);
         }
         else if (i.category == "project") {
-          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底" && i.name != "技术方案")
+          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底" && i.name != "技术方案" && i.name != "项目核算")
             this.treeData[1].children.push(i);
           if (i.name == "项目预算") {
-            if (this.$store.getters.userId == 1) {
+            if (this.$store.getters.roles.includes('projectLeader')) {
+              this.treeData[1].children.push(i);
+            }
+          }
+          if (i.name == "项目核算") {
+            if (this.$store.getters.roles.includes('nfinance')) {
               this.treeData[1].children.push(i);
             }
           }
@@ -100,7 +136,44 @@ export default {
       this.clickNode = data
     },
     confirm() {
-      this.$emit('confirm', this.clickNode)
+      if (this.clickNode.name == "项目预算") {
+        this.projectDialogVisible = true;
+      } else {
+        this.$emit('confirm', this.clickNode)
+      }
+    },
+    remoteMethod(val) {
+      let params1 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    handleProjectConfirm() {
+      if (!this.projectId) {
+        this.$message.warning('请选择项目');
+        return;
+      }
+      const selectedData = {
+        ...this.clickNode,
+        projectId: this.projectId,
+      };
+      this.$emit('confirm', selectedData);
+      this.projectDialogVisible = false;
     }
   },
 };