修改新增预算模块，新建预算信息表

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

@@ -1,8 +1,7 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +36,6 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 查询cmc预算外开支列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetOther cmcBudgetOther)
     {
@@ -49,7 +47,6 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 导出cmc预算外开支列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:export')")
     @Log(title = "cmc预算外开支", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetOther cmcBudgetOther)
@@ -62,7 +59,6 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 获取cmc预算外开支详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:query')")
     @GetMapping(value = "/{expenseId}")
     public AjaxResult getInfo(@PathVariable("expenseId") Long expenseId)
     {
@@ -72,7 +68,6 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 新增cmc预算外开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:add')")
     @Log(title = "cmc预算外开支", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetOther cmcBudgetOther)
@@ -83,7 +78,6 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 修改cmc预算外开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:edit')")
     @Log(title = "cmc预算外开支", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetOther cmcBudgetOther)
@@ -94,11 +88,10 @@ public class CmcBudgetOtherController extends BaseController
     /**
      * 删除cmc预算外开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:other:remove')")
     @Log(title = "cmc预算外开支", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{expenseIds}")
     public AjaxResult remove(@PathVariable Long[] expenseIds)
     {
-        return toAjax(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(expenseIds));
+        return success(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(expenseIds));
     }
 }

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

@@ -1,8 +1,7 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +36,6 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 查询cmc现场开支列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcBudgetSite cmcBudgetSite)
     {
@@ -49,7 +47,6 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 导出cmc现场开支列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:export')")
     @Log(title = "cmc现场开支", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcBudgetSite cmcBudgetSite)
@@ -62,7 +59,6 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 获取cmc现场开支详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:query')")
     @GetMapping(value = "/{expenseId}")
     public AjaxResult getInfo(@PathVariable("expenseId") Long expenseId)
     {
@@ -72,7 +68,6 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 新增cmc现场开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:add')")
     @Log(title = "cmc现场开支", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudgetSite cmcBudgetSite)
@@ -83,7 +78,6 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 修改cmc现场开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:edit')")
     @Log(title = "cmc现场开支", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudgetSite cmcBudgetSite)
@@ -94,11 +88,10 @@ public class CmcBudgetSiteController extends BaseController
     /**
      * 删除cmc现场开支
      */
-    @PreAuthorize("@ss.hasPermi('oa:site:remove')")
     @Log(title = "cmc现场开支", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{expenseIds}")
-    public AjaxResult remove(@PathVariable Long[] expenseIds)
+	@DeleteMapping("/{budgetIds}")
+    public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetSiteService.deleteCmcBudgetSiteByExpenseIds(expenseIds));
+        return success(cmcBudgetSiteService.deleteCmcBudgetSiteByExpenseIds(budgetIds));
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcBudgetSiteMapper.java

@@ -54,8 +54,8 @@ public interface CmcBudgetSiteMapper
     /**
      * 批量删除cmc现场开支
      * 
-     * @param expenseIds 需要删除的数据主键集合
+     * @param budgetIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds);
+    public int deleteCmcBudgetSiteByExpenseIds(String[] budgetIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcBudgetSiteService.java

@@ -46,10 +46,10 @@ public interface ICmcBudgetSiteService
     /**
      * 批量删除cmc现场开支
      * 
-     * @param expenseIds 需要删除的cmc现场开支主键集合
+     * @param budgetIds 需要删除的cmc现场开支主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds);
+    public int deleteCmcBudgetSiteByExpenseIds(String[] budgetIds);
 
     /**
      * 删除cmc现场开支信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBudgetSiteServiceImpl.java

@@ -70,13 +70,13 @@ public class CmcBudgetSiteServiceImpl implements ICmcBudgetSiteService
     /**
      * 批量删除cmc现场开支
      * 
-     * @param expenseIds 需要删除的cmc现场开支主键
+     * @param budgetIds 需要删除的cmc现场开支主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetSiteByExpenseIds(Long[] expenseIds)
+    public int deleteCmcBudgetSiteByExpenseIds(String[] budgetIds)
     {
-        return cmcBudgetSiteMapper.deleteCmcBudgetSiteByExpenseIds(expenseIds);
+        return cmcBudgetSiteMapper.deleteCmcBudgetSiteByExpenseIds(budgetIds);
     }
 
     /**

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

@@ -67,9 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcBudgetSiteByExpenseIds" parameterType="String">
-        delete from cmc_budget_site where expense_id in 
-        <foreach item="expenseId" collection="array" open="(" separator="," close=")">
-            #{expenseId}
+        delete from cmc_budget_site where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
         </foreach>
     </delete>
 </mapper>

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

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and bs.user_id = #{userId}</if>
             <if test="days != null "> and bs.days = #{days}</if>
             <if test="staffCost != null "> and bs.staff_cost = #{staffCost}</if>
+            <if test="type != null "> and bs.type = #{type}</if>
         </where>
     </select>
     

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

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-05-12 11:03:30
+ * @LastEditors: 
+ * @LastEditTime: 2025-05-12 11:03:36
+ */
+import request from '@/utils/request'
+
+// 查询cmc现场开支列表
+export function listSite(query) {
+  return request({
+    url: '/oa/site/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc现场开支详细
+export function getSite(expenseId) {
+  return request({
+    url: '/oa/site/' + expenseId,
+    method: 'get'
+  })
+}
+
+// 新增cmc现场开支
+export function addSite(data) {
+  return request({
+    url: '/oa/site',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc现场开支
+export function updateSite(data) {
+  return request({
+    url: '/oa/site',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc现场开支
+export function delSite(expenseId) {
+  return request({
+    url: '/oa/site/' + expenseId,
+    method: 'delete'
+  })
+}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-09 17:29:35
+ * @LastEditTime: 2025-05-12 17:25:07
 -->
 <template>
   <div class="app-container">
@@ -50,11 +50,11 @@
     <!-- 分割线 -->
     <!-- <el-divider><b>直接成本</b></el-divider> -->
     <!-- 现场开支 -->
-    <site-expenses :outer-users="outerUsers" @expensesList="getExpensesList"></site-expenses>
-    <!-- 经营填写 -->
-
-    <!-- 其他成本 -->
-    <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"></other-table>
+    <site-expenses :budgetId="budgetForm.budgetId" :outer-users="outerUsers" @expensesList="getExpensesList"
+      @siteSum="getSiteSum"></site-expenses>
+    <!-- 经营相关 -->
+    <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"
+      :disabled="taskName != '经营审核'"></other-table>
     <!-- 预算备注 -->
     <el-form :model="budgetForm" style="padding: 20px 100px 0">
       <el-form-item label="预算表单备注" label-width="100px">
@@ -72,21 +72,58 @@
             :underline="false" target="_blank">
             <span class="el-icon-download">下载文件</span>
           </el-link>
+          <el-link class="ml20" type="warning" :underline="false" target="_blank" v-if="taskName == '预算编制'">
+            <span class="el-icon-delete" style="color:#F56C6C" @click="budgetForm.document = ''">删除文件</span>
+          </el-link>
           <FileUpload v-if="taskName == '预算编制'" :limit="1" :filePathName="'预算编制/附件上传'"
             :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload>
         </div>
       </el-form-item>
+      <el-form-item label="统计" label-width="100px">
+        <!-- <div style="padding: 0 200px;"> -->
+        <table border="1" style="width:600px;" class="budget-summary">
+          <tr class="header">
+            <td><b>名称</b></td>
+            <td><b>金额</b></td>
+          </tr>
+          <tr>
+            <td>人员成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : budgetForm.staffCost }}</td>
+          </tr>
+          <tr>
+            <td>车辆成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.carCost) ? 0 : budgetForm.carCost }}</td>
+          </tr>
+          <tr>
+            <td>设备成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.deviceCost) ? 0 : budgetForm.deviceCost }}</td>
+          </tr>
+          <tr>
+            <td>现场开支成本</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : budgetForm.siteSum }}</td>
+          </tr>
+          <tr>
+            <td>经营相关成本</td>
+            <td style="text-align:right;">{{ Number(this.budgetForm.outExpense) +
+              Number(this.budgetForm.letterExpense) +
+              Number(this.budgetForm.winExpense) + Number(this.budgetForm.taxExpense)
+              + Number(this.budgetForm.travelExpense) }}</td>
+          </tr>
+          <tr class="total">
+            <td><b>预算总成本</b></td>
+            <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
+          </tr>
+        </table>
+        <!-- </div> -->
+      </el-form-item>
     </el-form>
+    <!-- <div class="text-center mb10">
+      <el-tag class="ml10 mr10" type="primary">
+        内业预算绩效总额：{{ isNaN(budgetForm.settleExpense) ? 0 : budgetForm.settleExpense }}
+      </el-tag>
+    </div> -->
     <!-- 统计 -->
-    <div class="text-center">
-      <el-tag class="ml10 mr10" type="success">间接成本：{{ isNaN(budgetForm.fixCost) ? 0 : budgetForm.fixCost }}</el-tag>
-      <el-tag class="ml10 mr10">直接成本：{{
-        isNaN(budgetForm.directExpense) ? 0 : budgetForm.directExpense
-        }}</el-tag>
-      <el-tag class="ml10 mr10" type="danger">预算总成本：{{
-        isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget
-        }}</el-tag>
-    </div>
+
     <div class="mt20 text-center" style="color: #909399; font-size: 12px">
       tips:预览表单，请先保存之后刷新再查看
     </div>
@@ -98,7 +135,8 @@
       <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
     </div>
     <el-dialog title="表单预览" :visible.sync="viewOpen" width="70%" append-to-body>
-      <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info>
+      <!-- <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info> -->
+      <new-budget-info :taskName="taskName" :taskForm="taskForm"></new-budget-info>
     </el-dialog>
   </div>
 </template>
@@ -111,6 +149,7 @@ import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budge
 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 { getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import budgetInfo from "./budgetInfo.vue";
@@ -122,6 +161,8 @@ import PeopleTable from "./staffTable.vue";
 import DeviceTable from "./deviceTable.vue";
 import OtherTable from "./otherTable.vue";
 import SiteExpenses from "./siteExpenses.vue";
+import BudgetAdjust from "./adjust/budgetAdjust.vue";
+import NewBudgetInfo from './adjust/newBudgetInfo.vue';
 export default {
   components: {
     ReturnComment,
@@ -132,7 +173,9 @@ export default {
     MoneyTable,
     OtherTable,
     budgetInfo,
-    SiteExpenses
+    SiteExpenses,
+    BudgetAdjust,
+    NewBudgetInfo
   },
   data() {
     return {
@@ -203,7 +246,6 @@ export default {
     // 保存
     preserve() {
       console.log(this.budgetForm)
-      return
       if (!this.flag) {
         this.addBudgetForm(this.budgetForm);
         this.flag = true;
@@ -241,54 +283,63 @@ export default {
         });
       });
     },
-    addBudgetForm(form) {
-      addBudget(form);
+    async addBudgetForm(form) {
+      await addBudget(form);
       for (let user of form.chooseUser) {
         user.budgetId = form.budgetId;
-        addBudgetStaff(user);
+        await addBudgetStaff(user);
       }
       for (let car of form.chooseCar) {
         car.budgetId = form.budgetId;
-        addBudgetCar(car);
+        await addBudgetCar(car);
       }
       for (let device of form.chooseDevice) {
         device.budgetId = form.budgetId;
-        addBudgetDevice(device);
+        await addBudgetDevice(device);
       }
       for (let work of form.contentList) {
         work.budgetId = form.budgetId;
-        addBudgetSettle(work).then(res => {
-          this.$message.success("预算添加成功");
-        });
+        await addBudgetSettle(work)
+      }
+      for (let site of form.expensesList) {
+        site.budgetId = form.budgetId;
+        await addSite(site)
       }
+      this.$message.success("预算添加成功");
     },
     updateBudgetForm(form) {
       updateBudget(form);
-      delBudgetStaff(form.budgetId).then(res => {
+      delBudgetStaff(form.budgetId).then(async res => {
         for (let user of form.chooseUser) {
           user.budgetId = form.budgetId;
-          addBudgetStaff(user);
+          await addBudgetStaff(user);
         }
       });
-      delBudgetCar(form.budgetId).then(res => {
+      delBudgetCar(form.budgetId).then(async res => {
         for (let car of form.chooseCar) {
           car.budgetId = form.budgetId;
-          addBudgetCar(car);
+          await addBudgetCar(car);
         }
       });
-      delBudgetDevice(form.budgetId).then(res => {
+      delBudgetDevice(form.budgetId).then(async res => {
         for (let device of form.chooseDevice) {
           device.budgetId = form.budgetId;
-          addBudgetDevice(device);
+          await addBudgetDevice(device);
         }
       });
-      delBudgetSettle(form.budgetId).then(res => {
+      delBudgetSettle(form.budgetId).then(async res => {
         for (let work of form.contentList) {
           work.budgetId = form.budgetId;
-          addBudgetSettle(work);
+          await addBudgetSettle(work);
         }
-        this.$message.success("预算添加成功");
       });
+      delSite(form.budgetId).then(async res => {
+        for (let site of form.expensesList) {
+          site.budgetId = form.budgetId;
+          await addSite(site);
+        }
+        this.$message.success("预算添加成功");
+      })
     },
     getChooseUser(val) {
       this.$set(this.budgetForm, "chooseUser", val);
@@ -310,6 +361,9 @@ export default {
     getExpensesList(val) {
       this.$set(this.budgetForm, "expensesList", val);
     },
+    getSiteSum(val) {
+      this.$set(this.budgetForm, "siteSum", val);
+    },
     getDeviceCost(val) {
       this.$set(this.budgetForm, "deviceCost", val);
     },
@@ -318,6 +372,7 @@ export default {
     },
     getSettleExpense(val) {
       this.innerSettleLimit = val;
+      this.$set(this.budgetForm, "settleExpense", val);
     },
     handleInnerSettleExceeded(data) {
       // this.$message.error(`内业预算绩效总额(${data.current.toFixed(2)})超出限制(${data.limit})`);
@@ -359,7 +414,9 @@ export default {
     },
     getTotalBudget() {
       this.budgetForm.totalBudget = (
-        Number(this.budgetForm.fixCost) + Number(this.budgetForm.directExpense)
+        Number(this.budgetForm.staffCost) + Number(this.budgetForm.carCost) + Number(this.budgetForm.deviceCost) + Number(this.budgetForm.siteSum)
+        + Number(this.budgetForm.outExpense) + Number(this.budgetForm.letterExpense) + Number(this.budgetForm.winExpense) + Number(this.budgetForm.taxExpense)
+        + Number(this.budgetForm.travelExpense)
       ).toFixed(2);
     },
     isReturn(val) {
@@ -384,7 +441,50 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 .mylabel {
   font-weight: bold;
 }
+
+table {
+  width: 100%;
+  /*居中*/
+  // margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #c4c6ca;
+}
+
+.budget-summary {
+  border-collapse: collapse;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  background: #fff;
+}
+
+.budget-summary td {
+  padding: 8px 12px;
+  border: 1px solid #EBEEF5;
+}
+
+.budget-summary .header {
+  background-color: #F5F7FA;
+  color: #606266;
+}
+
+.budget-summary .header td {
+  font-weight: 500;
+}
+
+.budget-summary .total {
+  background-color: #F5F7FA;
+  color: #303133;
+  font-weight: bold;
+}
+
+.budget-summary tr:hover {
+  background-color: #F5F7FA;
+}
 </style>

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-07 11:01:39
+ * @LastEditors: 
+ * @LastEditTime: 2025-05-12 17:18:35
+-->
 <template>
   <div class="main">
     <h2 class="text-center">项目直接生产成本预算—核算表</h2>
@@ -101,18 +107,18 @@
           </tr>
         </table>
       </el-descriptions-item>
-      <el-descriptions-item label="内业人员成本" :span="3">
+      <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
         <inner-staff-cost :staffList.sync="innerStaffList"
           @update:staffList="handleInnerStaffChange"></inner-staff-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="外业人员成本" :span="3">
+      <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
         <outer-staff-cost :staffList.sync="outerStaffList"
           @update:staffList="handleOuterStaffChange"></outer-staff-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="车辆成本" :span="3">
+      <el-descriptions-item label="车辆成本" :span="3" v-if="carList.length > 0">
         <car-cost :carList.sync="carList"></car-cost>
       </el-descriptions-item>
-      <el-descriptions-item label="设备成本" :span="3">
+      <el-descriptions-item label="设备成本" :span="3" v-if="deviceList.length > 0">
         <device-cost :deviceList.sync="deviceList"></device-cost>
       </el-descriptions-item>
       <el-descriptions-item label="现场开支" :span="3">
@@ -157,6 +163,15 @@ export default {
     CarCost,
     DeviceCost
   },
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    },
+    taskName: {
+      type: String,
+    }
+  },
   data() {
     return {
       loading: true,
@@ -177,7 +192,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: '1897087448425566208' }).then(async res => {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(async res => {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
@@ -218,10 +233,10 @@ export default {
       });
     },
     getProjectWorkList() {
-      getProject('1897087448425566208').then(res => {
+      getProject(this.taskForm.formId).then(res => {
         this.project = res.data;
       })
-      listProjectWork({ pageSize: 999, projectId: '1897087448425566208' }).then(res => {
+      listProjectWork({ pageSize: 999, projectId: this.taskForm.formId }).then(res => {
         this.workContentList = res.rows;
       })
     },

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

@@ -22,7 +22,7 @@
         </td>
         <td>{{ index + 1 }}</td>
         <td>{{ staff.user ? staff.user.nickName : '' }}</td>
-        <td>{{ staff.staffCost }}</td>
+        <td>{{ staff.dayCost }}</td>
         <td>{{ staff.days }}</td>
         <td>{{ staff.performance }}</td>
         <td>{{ staff.amount }}</td>

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

@@ -8,11 +8,9 @@
         <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">
@@ -23,10 +21,9 @@
         </td>
         <td>{{ index + 1 }}</td>
         <td>{{ staff.user ? staff.user.nickName : '' }}</td>
-        <td>{{ staff.staffCost }}</td>
+        <td>{{ staff.dayCost }}</td>
         <td>{{ staff.days }}</td>
         <td>{{ staff.coefficient }}</td>
-        <td>{{ staff.otherCoefficient }}</td>
         <td>{{ staff.amount }}</td>
         <td>
           <el-input-number :controls="false" style="width:100%;" v-model="staff.daysAdjust"
@@ -36,10 +33,6 @@
           <el-input-number :controls="false" style="width:100%;" v-model="staff.coefficientAdjust"
             @change="handleChange(staff)"></el-input-number>
         </td>
-        <td>
-          <el-input-number :controls="false" style="width:100%;" v-model="staff.otherCoefficientAdjust"
-            @change="handleChange(staff)"></el-input-number>
-        </td>
         <td>
           {{ staff.amountAdjust }}
         </td>

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

@@ -0,0 +1,421 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-07 11:01:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-12 17:51:37
+-->
+<template>
+  <div class="main">
+    <h2 class="text-center">项目直接生产成本预算—核算表</h2>
+    <p style="text-align: center">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+    <el-divider></el-divider>
+    <el-descriptions :column="3" border class="descriptions">
+      <el-descriptions-item label="项目编号">
+        {{ project.projectNumber }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目名称">
+        {{ project.projectName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目负责人">
+        {{ getUserName(project.projectLeader) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="承担部门">
+        {{ getDeptNames(project.undertakingDept) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目备注" :span="3">
+        {{ project.remark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="预算表单备注" :span="5">
+        {{ budgetForm.remark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目计划工作量" :span="3">
+        <div>
+          <table border="1" style="width: 100%;">
+            <tr style="background-color:#f8f8f9">
+              <td style="width: 250px">工作内容</td>
+              <td style="width: 100px">比例尺/等级</td>
+              <td style="width: 100px">单位</td>
+              <td style="width: 100px">工作量</td>
+              <td style="width: 100px">要求完成时间</td>
+              <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>
+                {{ work.remark }}
+              </td>
+            </tr>
+          </table>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="内业绩效额" :span="3">
+        <table border="1" style="width:100%">
+          <tr style="background-color:#f8f8f9" v-if="workList.length != 0">
+            <td style="min-width:50px">工作简述</td>
+            <td style="min-width:50px">工作内容</td>
+            <td style="min-width:50px">比例尺/等级</td>
+            <td style="min-width:50px">数量</td>
+            <td style="min-width:50px">单价</td>
+            <td style="min-width:50px">单位</td>
+            <td style="min-width:50px">系数</td>
+            <td style="min-width:80px">金额</td>
+            <td style="min-width: 150px;">备注</td>
+          </tr>
+          <tr v-for="work in workList">
+            <td>{{ work.content }}</td>
+            <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
+            <td>
+              {{ work.scaleGrade }}
+            </td>
+            <td>
+              {{ work.workload }}
+            </td>
+            <td>{{ work.price }}</td>
+            <td>{{ work.unit }}</td>
+            <td>
+              {{ work.coefficient }}
+            </td>
+            <td style="text-align:right;">{{ work.settle ? work.settle.toFixed(2) : '0.00' }}</td>
+            <td>{{ work.remark ? work.remark : '' }}</td>
+          </tr>
+          <tr>
+            <td :colspan="7" class="head amount">内业绩效额合计</td>
+            <td :colspan="1" class="head amount" style="text-align:right;">
+              {{ budgetForm.settleExpense ? budgetForm.settleExpense.toFixed(2) : '0.00' }}
+            </td>
+            <td></td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
+        <table border="1" style="width:100%">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>姓名</td>
+            <td>固定成本（天）</td>
+            <td style="width:120px">预算天数</td>
+            <td>固定成本合计</td>
+            <td>绩效成本合计</td>
+            <td style="width:120px">金额</td>
+          </tr>
+          <tr v-for="staff, index in innerStaffList" :key="'user' + staff.userId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ staff.user ? staff.user.nickName : '' }}</td>
+            <td>{{ staff.dayCost }}</td>
+            <td>{{ staff.days }}</td>
+            <td>{{ (Number(staff.dayCost) * Number(staff.days)).toFixed(2) }}</td>
+            <td>{{ staff.performance }}</td>
+            <td>{{ staff.amount }}</td>
+          </tr>
+          <tr>
+            <td colspan="5" class="head amount">内业人员成本合计</td>
+            <td class="head amount">{{ innerStaffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0).toFixed(2) }}</td>
+            <td class="head amount">{{ innerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0).toFixed(2) }}</td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
+        <table border="1" style="width:100%">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>姓名</td>
+            <td>固定成本（天）</td>
+            <td>单价</td>
+            <td style="width:120px">预算天数</td>
+            <td>预算系数</td>
+            <td>固定成本合计</td>
+            <td>绩效成本合计</td>
+            <td style="width:120px">金额</td>
+          </tr>
+          <tr v-for="staff, index in outerStaffList" :key="'user' + staff.userId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ staff.user ? staff.user.nickName : '' }}</td>
+            <td>{{ staff.dayCost }}</td>
+            <td>200</td>
+            <td>{{ staff.days }}</td>
+            <td>{{ staff.coefficient }}</td>
+            <td>{{ (Number(staff.dayCost) * Number(staff.days)).toFixed(2) }}</td>
+            <td>{{ staff.performance }}</td>
+            <td>{{ staff.amount }}</td>
+          </tr>
+          <tr>
+            <td colspan="8" class="head amount">外业人员成本合计</td>
+            <td class="head amount">{{ outerStaffList.reduce((sum, staff) => sum + (Number(staff.amount) || 0), 0).toFixed(2) }}</td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="车辆成本" :span="3" v-if="carList.length > 0">
+        <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>{{ index + 1 }}</td>
+            <td>{{ car.car ? car.car.licensePlate : '' }}</td>
+            <td>{{ car.car ? car.car.dayCost : '' }}</td>
+            <td>{{ car.days }}</td>
+            <td>{{ car.amount }}</td>
+          </tr>
+          <tr>
+            <td colspan="4" class="head amount">车辆成本合计</td>
+            <td class="head amount">{{ carList.reduce((sum, car) => sum + (Number(car.amount) || 0), 0).toFixed(2) }}</td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="设备成本" :span="3" v-if="deviceList.length > 0">
+        <table border="1" style="width:100%;">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>设备名称</td>
+            <td>规格型号</td>
+            <td>品牌</td>
+            <td>折旧成本（天）</td>
+            <td>预算天数</td>
+            <td>金额</td>
+          </tr>
+          <tr v-for="device, index in deviceList" :key="'device' + device.deviceId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ device.device ? device.device.name : '' }}</td>
+            <td>{{ device.device ? device.device.series : '' }}</td>
+            <td>{{ device.device ? device.device.brand : '' }}</td>
+            <td>{{ device.device ? device.device.dayCost : '' }}</td>
+            <td>{{ device.days }}</td>
+            <td>{{ device.amount }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" class="head amount">设备成本合计</td>
+            <td class="head amount">{{ deviceList.reduce((sum, device) => sum + (Number(device.amount) || 0), 0).toFixed(2) }}</td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="现场开支" :span="3">
+        <table border="1" style="width:100%;">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>开支项</td>
+            <td>金额</td>
+            <td>备注</td>
+          </tr>
+          <tr v-for="site, index in siteList" :key="'site' + site.expenseId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ site.name }}</td>
+            <td>{{ site.amount }}</td>
+            <td>{{ site.remark }}</td>
+          </tr>
+          <tr>
+            <td colspan="2" class="head amount">现场开支合计</td>
+            <td class="head amount">{{ siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0).toFixed(2) }}</td>
+            <td></td>
+          </tr>
+        </table>
+      </el-descriptions-item>
+      <el-descriptions-item label="经营相关" :span="3">
+
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+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 { listProjectWork } from "@/api/oa/project/projectWork";
+import { listSite } from "@/api/oa/budget/budgetSite.js";
+import { getProject } from "@/api/oa/project/project";
+import InnerStaffCost from './components/InnerStaffCost.vue';
+import OuterStaffCost from './components/OuterStaffCost.vue';
+import CarCost from './components/CarCost.vue';
+import DeviceCost from './components/DeviceCost.vue';
+
+export default {
+  components: {
+    InnerStaffCost,
+    OuterStaffCost,
+    CarCost,
+    DeviceCost
+  },
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    },
+    taskName: {
+      type: String,
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      budgetForm: {},
+      project: {},
+      workContentList: [],
+      workList: [],
+      innerStaffList: [],
+      outerStaffList: [],
+      carList: [],
+      deviceList: [],
+      siteList: [],
+    }
+  },
+  created() {
+    this.initBudgetForm();
+    this.getProjectWorkList();
+  },
+  methods: {
+    initBudgetForm() {
+      this.loading = true;
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(async res => {
+        this.budgetForm = res.rows[0];
+        if (this.budgetForm) {
+          const budgetId = this.budgetForm.budgetId;
+          // 获取设备数据
+          let deviceRes = await listBudgetDevice({ pageSize: 100, budgetId });
+          this.deviceList = deviceRes.rows;
+
+          // 获取车辆数据
+          let carRes = await listBudgetCar({ pageSize: 100, budgetId });
+          this.carList = carRes.rows;
+
+          // 获取内业人员数据
+          let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
+          this.innerStaffList = innerStaffRes.rows;
+
+          // 获取外业人员数据
+          let outerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '外业' });
+          this.outerStaffList = outerStaffRes.rows;
+
+          // 获取内业绩效额数据
+          let settleRes = await listBudgetSettle({ pageSize: 100, budgetId });
+          this.workList = settleRes.rows;
+          for (let work of this.workList) {
+            if (work.groundType == '0') {
+              work.price = work.cmcPrice.commonPrice
+              work.scaleGrade = work.cmcPrice.scaleGrade
+              work.unit = work.cmcPrice.unit
+            } else {
+              work.price = work.cmcPrice.complexPrice
+              work.scaleGrade = work.cmcPrice.scaleGrade
+              work.unit = work.cmcPrice.unit
+            }
+          }
+          // 获取现场开支
+          let siteRes = await listSite({ pageSize: 100, budgetId });
+          this.siteList = siteRes.rows;
+        }
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    getProjectWorkList() {
+      getProject(this.taskForm.formId).then(res => {
+        this.project = res.data;
+      })
+      listProjectWork({ pageSize: 999, projectId: this.taskForm.formId }).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);
+      }, 0);
+
+      // 更新预算表单中的内业人员成本
+      if (this.budgetForm) {
+        this.budgetForm.innerStaffAmount = totalAmount;
+        // 可以在这里调用API保存数据
+        // updateBudget(this.budgetForm);
+      }
+    },
+
+    // 处理外业人员数据变化
+    handleOuterStaffChange(newList) {
+      this.outerStaffList = newList;
+      // 计算外业人员总成本
+      const totalAmount = this.outerStaffList.reduce((sum, staff) => {
+        return sum + (staff.amountAdjust || 0);
+      }, 0);
+
+      // 更新预算表单中的外业人员成本
+      if (this.budgetForm) {
+        this.budgetForm.outerStaffAmount = totalAmount;
+        // 可以在这里调用API保存数据
+        // updateBudget(this.budgetForm);
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.mylabel {
+  font-weight: bold;
+}
+
+.main {
+  width: 85%;
+  margin: 0 auto;
+  text-align: center;
+}
+
+.descriptions {
+  width: 100%;
+  margin: 0 auto;
+}
+
+.amount {
+  font-weight: bold;
+  font-family:Arial, Helvetica, sans-serif;
+}
+
+table {
+  text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+.adjust {
+  color: #F56C6C;
+  width: 120px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #838894;
+}
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #434141;
+  background: #eaeaea;
+}
+</style>

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

@@ -27,13 +27,14 @@
               {{ car.dayCost }}
             </td>
             <td>
-              <el-input-number  :controls="false" v-model="car.days" placeholder="请输入天数" @blur="calculateCarTotal(car)"></el-input-number>
+              <el-input-number  :controls="false" v-model="car.days" placeholder="请输入天数"
+                @blur="calculateCarTotal(car)"></el-input-number>
             </td>
-            <td class="carCost">{{ car.expense }}</td>
+            <td class="carCost">{{ car.amount }}</td>
           </tr>
           <tr>
-            <td colspan="3">车辆成本合计</td>
-            <td>{{ form.carCost }}</td>
+            <td colspan="3"><b>车辆成本合计</b></td>
+            <td><b>{{ form.carCost }}</b></td>
           </tr>
         </table>
       </el-form-item>
@@ -107,21 +108,21 @@ export default {
     initCarCost() {
       let carCost = 0;
       for (let car of this.chooseCar) {
-        carCost = carCost + Number(car.expense);
+        carCost = carCost + Number(car.amount);
       }
       this.form.carCost = carCost.toFixed(2)
     },
     getChooseCar(val) {
       this.chooseCar = val;
       this.openCar = false;
-      this.recalculateCost(val, 'expense', 'carCost');
+      this.recalculateCost(val, 'amount', 'carCost');
     },
     calculateCarTotal(car) {
       let total = Number(car.dayCost) * Number(car.days);
       let sum = total.toFixed(2);
       this.$set(car, "depreciation", car.dayCost);
-      this.$set(car, "expense", sum);
-      this.getCost("expense", "carCost", this.chooseCar);
+      this.$set(car, "amount", sum);
+      this.getCost("amount", "carCost", this.chooseCar);
     },
     recalculateCost(arr, name, formName) {
       let sum = arr.reduce((accumulator, item) => {

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

@@ -28,16 +28,17 @@
             <td>{{ device.series }}</td>
             <td>{{ device.brand }}</td>
             <td>
-              {{ device.dayCost }}
+              {{ device.depreciation }}
             </td>
             <td>
-              <el-input v-model="device.days" placeholder="请输入天数" @blur="calculateDeviceTotal(device)"></el-input>
+              <el-input-number :controls="false" v-model="device.days" placeholder="请输入天数"
+                @blur="calculateDeviceTotal(device)"></el-input-number>
             </td>
-            <td class="deviceCost">{{ device.depreciation }}</td>
+            <td class="deviceCost">{{ device.amount }}</td>
           </tr>
           <tr>
-            <td colspan="5">设备成本合计</td>
-            <td>{{ form.deviceCost }}</td>
+            <td colspan="5"><b>设备成本合计</b></td>
+            <td><b>{{ form.deviceCost }}</b></td>
           </tr>
         </table>
       </el-form-item>
@@ -98,7 +99,7 @@ export default {
           this.chooseDevice = res.rows;
           for (let device of this.chooseDevice) {
             device.brand = device.device.brand
-            device.dayCost = device.device.dayCost
+            device.depreciation = device.device.dayCost
             device.name = device.device.name
             device.series = device.device.series
           }
@@ -109,19 +110,19 @@ export default {
     initDeviceCost() {
       let deviceCost = 0;
       for (let device of this.chooseDevice) {
-        deviceCost = deviceCost + Number(device.depreciation);
+        deviceCost = deviceCost + Number(device.amount);
       }
       this.form.deviceCost = deviceCost.toFixed(2)
     },
     getChooseDevice(val) {
       this.chooseDevice = val;
       this.openDevice = false;
-      this.recalculateCost(val, 'depreciation', 'deviceCost');
+      this.recalculateCost(val, 'amount', 'deviceCost');
     },
     calculateDeviceTotal(device) {
-      let total = Number(device.dayCost) * Number(device.days);
-      this.$set(device, "depreciation", total.toFixed(2));
-      this.getCost("depreciation", "deviceCost", this.chooseDevice);
+      let total = Number(device.depreciation) * Number(device.days);
+      this.$set(device, "amount", total.toFixed(2));
+      this.getCost("amount", "deviceCost", this.chooseDevice);
     },
     recalculateCost(arr, name, formName) {
       let sum = arr.reduce((accumulator, item) => {

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

@@ -135,7 +135,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="10">内业预算绩效合计</td>
+            <td colspan="10">内业预算绩效总额</td>
             <td colspan="1">{{ Number(settle).toFixed(2) }}</td>
           </tr>
         </table>

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

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-12-11 17:21:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-06 17:15:03
+ * @LastEditTime: 2025-05-12 16:16:45
 -->
 <template>
   <div>
-    <el-form :model="form" style="padding: 20px 100px 0">
+    <el-form :model="form" style="padding: 20px 100px 0" :disabled="disabled">
       <el-form-item label="经营相关:">
         <table border="1">
           <tr class="head">
@@ -64,6 +64,11 @@
               <el-input type="textarea" v-model="form.businessRemark"></el-input>
             </td>
           </tr>
+          <tr>
+            <td><b>经营相关总计</b></td>
+            <td><b>{{ totalAmount }}</b></td>
+            <td></td>
+          </tr>
         </table>
       </el-form-item>
     </el-form>
@@ -77,6 +82,10 @@ export default {
     budgetForm: {
       type: Object,
       default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -90,6 +99,15 @@ export default {
       }
     }
   },
+  computed: {
+    totalAmount() {
+      return this.safeNumber(this.form.outExpense) +
+        this.safeNumber(this.form.letterExpense) +
+        this.safeNumber(this.form.winExpense) +
+        this.safeNumber(this.form.taxExpense) +
+        this.safeNumber(this.form.travelExpense);
+    }
+  },
   watch: {
     budgetForm: {
       handler(newVal) {

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

@@ -1,177 +1,225 @@
-<template>
-  <div>
-    <el-form ref="form" :model="form" style="padding: 20px 100px 0">
-      <el-form-item label="现场开支：">
-        <div style="color:#F56C6C">现场开支与借款挂钩,请慎重填写</div>
-        <table border="1">
-          <tr>
-            <td colspan="5" class="head">现场开支表</td>
-          </tr>
-          <tr>
-            <td>序号</td>
-            <td>名称</td>
-            <td>金额</td>
-            <td>备注</td>
-            <td>操作</td>
-          </tr>
-          <tr v-for="item, index in expensesList">
-            <td>{{ index + 1 }}</td>
-            <td>
-              <el-select v-model="item.name" placeholder="请选择开支项" clearable @change="handleExpenseChange"
-                style="width: 100%;">
-                <el-option v-for="dict in dict.type.borrow_expenses" clearable :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-                <el-option label="+新增更多开支项..." value="new_expense" />
-              </el-select>
-            </td>
-            <td>
-              <el-input-number style="width: 100%;" :controls="false" v-model="item.amount"
-                placeholder="请输入金额"></el-input-number>
-            </td>
-            <td>
-              <el-input type="textarea" v-model="item.remark"></el-input>
-            </td>
-            <td>
-              <el-button icon="el-icon-delete" type="text" style="color:#F56C6C"
-                @click="deletExpensesList(index)">删除</el-button>
-            </td>
-          </tr>
-        </table>
-        <el-button type="primary" plain icon="el-icon-plus" @click="addExpensesList" size="mini"></el-button>
-      </el-form-item>
-    </el-form>
-    <el-dialog title="新增开支项" :visible.sync="open" width="400px" append-to-body>
-      <el-form ref="newExpenseForm" :model="newExpenseForm" :rules="newExpenseRules" label-width="120px">
-        <el-form-item label="开支项名称" prop="name">
-          <el-input v-model="newExpenseForm.name" placeholder="请输入开支项名称" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitNewExpense">确 定</el-button>
-        <el-button @click="open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-export default {
-  dicts: ['borrow_expenses', 'cmc_unit'],
-  props: {
-    outerUsers: {
-      type: Array,
-      default: () => []
-    }
-  },
-  watch: {
-    expensesList: {
-      handler(newVal) {
-        this.$emit('expensesList', [...newVal])
-      },
-    }
-  },
-  data() {
-    return {
-      open: false,
-      form: {},
-      expensesList: [{
-        name: '',
-        amount: 0,
-      }],
-      newExpenseForm: {
-        name: ''
-      },
-      newExpenseRules: {
-        name: [
-          { required: true, message: "开支项不能为空", trigger: "blur" }
-        ],
-      }
-    }
-  },
-  created() {
-    console.log(this.dict);
-  },
-  methods: {
-    addExpensesList() {
-      this.expensesList.push({
-        name: '',
-        amount: 0,
-      });
-    },
-    deletExpensesList(index) {
-      let arr = this.expensesList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
-    handleExpenseChange(value) {
-      if (value === 'new_expense') {
-        this.open = true;
-      } else if (value === '食宿') {
-        const currentIndex = this.expensesList.findIndex(item => item.name === value);
-        if (currentIndex !== -1) {
-          const totalDays = this.outerUsers.reduce((sum, user) => sum + (user.days || 0), 0);
-          this.expensesList[currentIndex].amount = 130 * totalDays;
-          this.expensesList[currentIndex].remark = '130元/人天，共计' + totalDays + '人天';
-        }
-      }
-    },
-    submitNewExpense() {
-      this.$refs["newExpenseForm"].validate(valid => {
-        if (valid) {
-          this.newExpenseForm.dictType = 'borrow_expenses';
-          this.newExpenseForm.dictLabel = this.newExpenseForm.name;
-          this.newExpenseForm.dictValue = this.newExpenseForm.name;
-          this.newExpenseForm.listClass = 'default'
-          addData(this.newExpenseForm).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            this.open = false;
-            this.newExpenseForm.name = '';
-            // 刷新字典数据
-            this.getDicts("borrow_expenses").then(response => {
-              console.log(response.data);
-              // 更新字典数据
-              this.dict.type.borrow_expenses = response.data;
-              // 重新加载字典数据后，更新当前选中项
-              if (this.expensesList.length > 0) {
-                const lastItem = this.expensesList[this.expensesList.length - 1];
-                lastItem.name = this.newExpenseForm.dictValue;
-              }
-            });
-          });
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-table {
-  width: 100%;
-  /*居中*/
-  // margin: 0 auto;
-  /*边框*/
-  /* border: 1px solid black; */
-  text-align: center;
-  border-collapse: collapse;
-  border: 1px solid #DCDFE6;
-
-  /*设置背景颜色*/
-  /* background-color: #bfa; */
-  td {
-    padding: 1px;
-  }
-
-  .head {
-    background-color: #e7f6f3;
-    font-family: '微软雅黑';
-    font-size: 18;
-    font-weight: bold;
-  }
-}
+<template>
+  <div>
+    <el-form ref="form" :model="form" style="padding: 20px 100px 0">
+      <el-form-item label="现场开支：">
+        <div style="color:#F56C6C">现场开支与借款挂钩,请慎重填写</div>
+        <table border="1">
+          <tr>
+            <td colspan="5" class="head">现场开支表</td>
+          </tr>
+          <tr>
+            <td>序号</td>
+            <td>名称</td>
+            <td>金额</td>
+            <td>备注</td>
+            <td>操作</td>
+          </tr>
+          <tr v-for="item, index in expensesList">
+            <td>{{ index + 1 }}</td>
+            <td>
+              <el-select v-model="item.name" placeholder="请选择开支项" clearable @change="handleExpenseChange"
+                style="width: 100%;">
+                <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+                <el-option label="+新增更多开支项..." value="new_expense" />
+              </el-select>
+            </td>
+            <td>
+              <el-input-number style="width: 100%;" :controls="false" v-model="item.amount"
+                placeholder="请输入金额"></el-input-number>
+            </td>
+            <td>
+              <el-input type="textarea" v-model="item.remark"></el-input>
+            </td>
+            <td>
+              <el-button icon="el-icon-delete" type="text" style="color:#F56C6C"
+                @click="deletExpensesList(index)">删除</el-button>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2" style="text-align: right; font-weight: bold;">现场开支总计：</td>
+            <td style="font-weight: bold;">{{ totalAmount }}</td>
+            <td colspan="2"></td>
+          </tr>
+        </table>
+        <el-button type="primary" plain icon="el-icon-plus" @click="addExpensesList" size="mini"></el-button>
+      </el-form-item>
+    </el-form>
+    <el-dialog title="新增开支项" :visible.sync="open" width="400px" append-to-body>
+      <el-form ref="newExpenseForm" :model="newExpenseForm" :rules="newExpenseRules" label-width="120px">
+        <el-form-item label="开支项名称" prop="name">
+          <el-input v-model="newExpenseForm.name" placeholder="请输入开支项名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitNewExpense">确 定</el-button>
+        <el-button @click="open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import { listSite, getSite, delSite, addSite, updateSite } from "@/api/oa/budget/budgetSite.js";
+export default {
+  dicts: ['cmc_borrow_expense', 'cmc_unit'],
+  props: {
+    outerUsers: {
+      type: Array,
+      default: () => []
+    },
+    budgetId: {
+      type: String,
+      default: ''
+    },
+  },
+  watch: {
+    expensesList: {
+      handler(newVal) {
+        this.$emit('expensesList', [...newVal])
+      },
+    },
+    budgetId() {
+      this.initTable()
+    },
+  },
+  data() {
+    return {
+      open: false,
+      form: {},
+      expensesList: [{
+        name: '',
+        amount: 0,
+        remark: '',
+      }],
+      newExpenseForm: {
+        name: ''
+      },
+      newExpenseRules: {
+        name: [
+          { required: true, message: "开支项不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  computed: {
+    totalAmount() {
+      let sum = this.expensesList.reduce((sum, item) => sum + (Number(item.amount) || 0), 0);
+      this.$emit('siteSum', sum.toFixed(2))
+      return sum.toFixed(2);
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    initTable() {
+      if (this.budgetId != '') {
+        listSite({ pageSize: 100, budgetId: this.budgetId }).then(res => {
+          if (res.rows.length > 0) {
+            this.expensesList = res.rows;
+          } else {
+            this.expensesList = [{
+              name: '',
+              amount: 0,
+              remark: '',
+            }];
+          }
+        })
+      }
+    },
+    addExpensesList() {
+      this.expensesList.push({
+        name: '',
+        amount: 0,
+      });
+    },
+    deletExpensesList(index) {
+      let arr = this.expensesList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        const item = arr[index];
+        if (item.id) {
+          // If the item has an ID, it exists in the database, so delete it
+          delSite(item.id).then(response => {
+            this.$modal.msgSuccess("删除成功");
+            arr.splice(index, 1);
+          }).catch(() => {
+            this.$modal.msgError("删除失败");
+          });
+        } else {
+          // If the item doesn't have an ID, just remove it from the array
+          arr.splice(index, 1);
+        }
+      }
+    },
+    handleExpenseChange(value) {
+      if (value === 'new_expense') {
+        this.open = true;
+      } else if (value === '食宿') {
+        const currentIndex = this.expensesList.findIndex(item => item.name === value);
+        if (currentIndex !== -1) {
+          const totalDays = this.outerUsers.reduce((sum, user) => sum + (user.days || 0), 0);
+          this.expensesList[currentIndex].amount = 130 * totalDays;
+          this.expensesList[currentIndex].remark = '130元/人天，共计' + totalDays + '人天';
+        }
+      }
+    },
+    submitNewExpense() {
+      this.$refs["newExpenseForm"].validate(valid => {
+        if (valid) {
+          this.newExpenseForm.dictType = 'cmc_borrow_expense';
+          this.newExpenseForm.dictLabel = this.newExpenseForm.name;
+          this.newExpenseForm.dictValue = this.newExpenseForm.name;
+          this.newExpenseForm.listClass = 'default'
+          addData(this.newExpenseForm).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.open = false;
+            this.newExpenseForm.name = '';
+            // 刷新字典数据
+            this.getDicts("cmc_borrow_expense").then(response => {
+              console.log(response.data);
+              // 更新字典数据
+              this.dict.type.cmc_borrow_expense = response.data;
+              // 重新加载字典数据后，更新当前选中项
+              if (this.expensesList.length > 0) {
+                const lastItem = this.expensesList[this.expensesList.length - 1];
+                lastItem.name = this.newExpenseForm.dictValue;
+              }
+            });
+          });
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  width: 100%;
+  /*居中*/
+  // margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #DCDFE6;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 1px;
+  }
+
+  .head {
+    background-color: #e7f6f3;
+    font-family: '微软雅黑';
+    font-size: 18;
+    font-weight: bold;
+  }
+}
 </style>

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

@@ -37,7 +37,7 @@
             <td>{{ user.nickName }}</td>
             <td>{{ user.dept ? user.dept.deptName : user.deptName }}</td>
             <td>
-              {{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}
+              {{ user.dayCost }}
             </td>
             <td>
               <el-input-number :controls="false" v-model="user.days" placeholder="请输入天数"
@@ -95,7 +95,7 @@
             <td>{{ user.nickName }}</td>
             <td>{{ user.dept ? user.dept.deptName : user.deptName }}</td>
             <td>
-              {{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}
+              {{ user.dayCost }}
             </td>
             <td>
               <el-input-number :controls="false" v-model="user.days" placeholder="请输入天数"
@@ -212,8 +212,8 @@ export default {
       if (this.budgetId != '') {
         listBudgetStaff({ pageSize: 100, budgetId: this.budgetId }).then((res) => {
           const allUsers = res.rows;
-          this.innerUsers = allUsers.filter(user => user.type === 'inner');
-          this.outerUsers = allUsers.filter(user => user.type === 'outer');
+          this.innerUsers = allUsers.filter(user => user.type === '内业');
+          this.outerUsers = allUsers.filter(user => user.type === '外业');
           for (let user of [...this.innerUsers, ...this.outerUsers]) {
             user.nickName = this.getUserName(user.userId);
             user.deptName = this.getDeptName(user.user.deptId);
@@ -285,6 +285,7 @@ export default {
         v.staffCost = 0; // 初始化成本为0
         v.coefficient = 1; // 初始化系数为1
         v.otherCoefficient = 1; // 初始化其他系数为1
+        v.userDays = parseFloat(((v.salary.salary + 1780) * 12) / 365).toFixed(2);
       }
       if (this.currentType === 'inner') {
         this.innerUsers = val;
@@ -312,12 +313,20 @@ export default {
       let total = 0;
       if (user.type === '内业') {
         // 内业人员计算方式不变
-        total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days) + Number(user.performance);
+        // if (user.dayCost) {
+        // } else {
+        //   user.dayCost = parseFloat(((user.salary.salary + 1780) * 12) / 365).toFixed(2)
+        // }
+        // total = user.dayCost * Number(user.days) + Number(user.performance);
       } else {
         // 外业人员计算方式
-        user.performance = 200 * Number(user.days) * Number(user.coefficient) * Number(user.otherCoefficient);
-        total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days) + Number(user.performance);
+        user.performance = 200 * Number(user.days) * Number(user.coefficient);
       }
+      if (user.dayCost) {
+      } else {
+        user.dayCost = parseFloat(((user.salary.salary + 1780) * 12) / 365).toFixed(2)
+      }
+      total = user.dayCost * Number(user.days) + Number(user.performance);
 
       if (isNaN(total)) {
         total = 0