修改核算，新增预算外开支

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

@@ -90,8 +90,8 @@ public class CmcBudgetOtherController extends BaseController
      */
     @Log(title = "cmc预算外开支", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{expenseIds}")
-    public AjaxResult remove(@PathVariable Long[] expenseIds)
+    public AjaxResult remove(@PathVariable String[] budgetId)
     {
-        return success(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(expenseIds));
+        return success(cmcBudgetOtherService.deleteCmcBudgetOtherByExpenseIds(budgetId));
     }
 }

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

@@ -54,8 +54,8 @@ public interface CmcBudgetOtherMapper
     /**
      * 批量删除cmc预算外开支
      * 
-     * @param expenseIds 需要删除的数据主键集合
+     * @param budgetId 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds);
+    public int deleteCmcBudgetOtherByExpenseIds(String[] budgetId);
 }

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

@@ -46,10 +46,10 @@ public interface ICmcBudgetOtherService
     /**
      * 批量删除cmc预算外开支
      * 
-     * @param expenseIds 需要删除的cmc预算外开支主键集合
+     * @param budgetId 需要删除的cmc预算外开支主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds);
+    public int deleteCmcBudgetOtherByExpenseIds(String[] budgetId);
 
     /**
      * 删除cmc预算外开支信息

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

@@ -70,13 +70,13 @@ public class CmcBudgetOtherServiceImpl implements ICmcBudgetOtherService
     /**
      * 批量删除cmc预算外开支
      * 
-     * @param expenseIds 需要删除的cmc预算外开支主键
+     * @param budgetId 需要删除的cmc预算外开支主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBudgetOtherByExpenseIds(Long[] expenseIds)
+    public int deleteCmcBudgetOtherByExpenseIds(String[] budgetId)
     {
-        return cmcBudgetOtherMapper.deleteCmcBudgetOtherByExpenseIds(expenseIds);
+        return cmcBudgetOtherMapper.deleteCmcBudgetOtherByExpenseIds(budgetId);
     }
 
     /**

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

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

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

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-05-16 10:38:45
+ * @LastEditors: 
+ * @LastEditTime: 2025-05-16 10:39:10
+ */
+import request from '@/utils/request'
+
+// 查询cmc预算外开支列表
+export function listOther(query) {
+  return request({
+    url: '/oa/other/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc预算外开支详细
+export function getOther(expenseId) {
+  return request({
+    url: '/oa/other/' + expenseId,
+    method: 'get'
+  })
+}
+
+// 新增cmc预算外开支
+export function addOther(data) {
+  return request({
+    url: '/oa/other',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc预算外开支
+export function updateOther(data) {
+  return request({
+    url: '/oa/other',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc预算外开支
+export function delOther(expenseId) {
+  return request({
+    url: '/oa/other/' + 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-15 18:12:10
+ * @LastEditTime: 2025-05-16 09:43:29
 -->
 <template>
   <div class="app-container">
@@ -130,10 +130,9 @@
     <el-divider></el-divider>
     <div style="text-align: center">
       <el-button type="warning" @click="preserve()">保存</el-button>
-      <el-button type="danger" @click="returnOpen = true">退 回</el-button>
+      <el-button type="danger" @click="returnOpen = true" v-if="taskName != '预算编制'">退 回</el-button>
       <el-button type="success" @click="viewForm()">预览表单</el-button>
-      <el-button type="primary" @click="submitNextFlow" v-if="taskName == '预算批准'">提交下一个流程</el-button>
-      <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
+      <el-button type="primary" @click="submitNextFlow" v-if="taskName == '预算编制'">提交下一个流程</el-button>
     </div>
     <el-dialog title="表单预览" :visible.sync="viewOpen" width="75%" append-to-body>
       <!-- <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info> -->

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-15 18:32:55
+ * @LastEditTime: 2025-05-16 11:15:36
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -118,6 +118,9 @@
         <business-cost :budgetForm.sync="budgetForm" @update:budgetForm="handleBusinessChange"></business-cost>
       </el-descriptions-item>
       <el-descriptions-item label="预算外开销" :span="3">
+        <other-cost :otherList.sync="otherList" @update:otherList="handleOtherChange"></other-cost>
+      </el-descriptions-item>
+      <el-descriptions-item label="分管审核意见" :span="3">
 
       </el-descriptions-item>
     </el-descriptions>
@@ -135,8 +138,9 @@ import { listBudgetCar, updateBudgetCar, addBudgetCar, delBudgetCar } from "@/ap
 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 { listOther, addOther, updateOther, delOther } from "@/api/oa/budget/budgetOther";
 import { listProjectWork } from "@/api/oa/project/projectWork";
-import { listSite, delSite, addSite } from "@/api/oa/budget/budgetSite";
+import { listSite, updateSite, 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';
@@ -144,6 +148,7 @@ import CarCost from './components/CarCost.vue';
 import DeviceCost from './components/DeviceCost.vue';
 import SiteCost from '@/views/flowable/form/budget/adjust/components/SiteCost.vue';
 import BusinessCost from '@/views/flowable/form/budget/adjust/components/businessCost.vue';
+import OtherCost from '@/views/flowable/form/budget/adjust/components/otherCost.vue';
 export default {
   components: {
     InnerStaffCost,
@@ -151,7 +156,8 @@ export default {
     CarCost,
     DeviceCost,
     SiteCost,
-    BusinessCost
+    BusinessCost,
+    OtherCost
   },
   props: {
     taskForm: {
@@ -176,7 +182,8 @@ export default {
       outerStaffList: [],
       carList: [],
       deviceList: [],
-      siteList: []
+      siteList: [],
+      otherList: []
     }
   },
   created() {
@@ -283,6 +290,7 @@ export default {
           // 获取现场开支
           let siteRes = await listSite({ pageSize: 100, budgetId });
           this.siteList = siteRes.rows;
+
           this.siteList = this.siteList.map(site => {
             return {
               ...site,
@@ -290,6 +298,17 @@ export default {
               amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
             };
           });
+
+          // 获取预算外开销
+          let otherRes = await listOther({ pageSize: 100, budgetId });
+          this.otherList = otherRes.rows;
+          this.otherList = this.otherList.map(other => {
+            return {
+              ...other,
+              amount: Number(other.amount).toFixed(2),
+              amountAdjust: other.amountAdjust ? Number(other.amountAdjust).toFixed(2) : 0
+            };
+          });
         }
         this.loading = false;
       }).catch(() => {
@@ -307,7 +326,6 @@ export default {
     // 处理内业人员数据变化
     handleInnerStaffChange(newList) {
       this.innerStaffList = newList;
-      console.log(this.innerStaffList);
     },
 
     // 处理外业人员数据变化
@@ -325,11 +343,18 @@ export default {
     // 处理现场开支数据变化
     handleSiteChange(newList) {
       this.siteList = newList;
-      console.log(this.siteList);
     },
     // 处理经营相关数据变化
     handleBusinessChange(newData) {
-
+      this.budgetForm.outAdjust = newData.outAdjust;
+      this.budgetForm.letterAdjust = newData.letterAdjust;
+      this.budgetForm.winAdjust = newData.winAdjust;
+      this.budgetForm.taxAdjust = newData.taxAdjust;
+      this.budgetForm.travelAdjust = newData.travelAdjust;
+    },
+    // 处理预算外开销数据变化
+    handleOtherChange(newList) {
+      this.otherList = newList;
     },
     async preserve() {
       let obj = {
@@ -344,24 +369,38 @@ export default {
       }
       await updateBudget(this.budgetForm);
       let staffList = this.innerStaffList.concat(this.outerStaffList);
+      // 更新人员
       delBudgetStaff(this.row.budgetId).then(async res => {
         for (let staff of staffList) {
           staff.budgetId = this.row.budgetId;
           await addBudgetStaff(staff);
         }
       })
+      // 更新车辆
       delBudgetCar(this.row.budgetId).then(async res => {
         for (let car of this.carList) {
           car.budgetId = this.row.budgetId;
           await addBudgetCar(car);
         }
       })
+      // 更新设备
       delBudgetDevice(this.row.budgetId).then(async res => {
         for (let device of this.deviceList) {
           device.budgetId = this.row.budgetId;
           await addBudgetDevice(device);
         }
       })
+      // 更新现场开支
+      for (let site of this.siteList) {
+        await updateSite(site);
+      }
+      // 更新预算外开销
+      delOther(this.row.budgetId).then(async res => {
+        for (let other of this.otherList) {
+          other.budgetId = this.row.budgetId;
+          await addOther(other);
+        }
+      })
       this.$message.success('保存成功');
     },
     confirmSucess() {

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

@@ -27,20 +27,26 @@
         <td style="text-align:right;">{{ device.days }}</td>
         <td style="text-align:right;">{{ device.amount }}</td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust" @change="handleChange(device)"></el-input-number>
+          <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust"
+            @change="handleChange(device)"></el-input-number>
         </td>
         <td style="text-align:right;">
           {{ device.amountAdjust }}
         </td>
       </tr>
-      <!-- <tr>
-        <td colspan="4" class="amount">设备成本合计</td>
-        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.device?.dayCost) || 0), 0).toFixed(2)}}</td>
-        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.days) || 0), 0).toFixed(2)}}</td>
-        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.amount) || 0), 0).toFixed(2)}}</td>
-        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.daysAdjust) || 0), 0).toFixed(2)}}</td>
-        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.amountAdjust) || 0), 0).toFixed(2)}}</td>
-      </tr> -->
+      <tr>
+        <td colspan="5" class="amount">设备成本合计</td>
+        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.device ?
+          device.device.dayCost : 0) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.days) ||
+          0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum + (Number(device.amount) ||
+          0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum +
+          (Number(device.daysAdjust) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{deviceList.reduce((sum, device) => sum +
+          (Number(device.amountAdjust) || 0), 0).toFixed(2)}}</td>
+      </tr>
     </table>
     <div class="mt10">
       <el-button type="success" plain icon="el-icon-plus" @click="openDevice" size="mini">新增设备</el-button>
@@ -123,21 +129,25 @@ export default {
     text-align: center;
     border-collapse: collapse;
     margin: 0 auto;
+
     td {
       padding: 5px;
     }
   }
+
   .adjust {
     color: #F56C6C;
     width: 120px;
   }
+
   .delete-btn {
     cursor: pointer;
     font-size: 18px;
   }
+
   .amount {
     font-weight: bold;
     font-family: Arial, Helvetica, sans-serif;
   }
 }
-</style> 
+</style>

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

@@ -3,7 +3,7 @@
     <table border="1" style="width:100%">
       <tr style="background-color:#f8f8f9">
         <td></td>
-        <td style="min-width:50px;">序号</td>
+        <td style="width:50px;">序号</td>
         <td style="min-width:80px;">姓名</td>
         <td style="min-width:80px;">人员成本（天）</td>
         <td style="min-width:80px;">预算天数</td>

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

@@ -1,21 +1,31 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-15 15:30:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-16 09:59:30
+-->
 <template>
   <div class="site-cost">
     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
+        <td style="width: 50px;">序号</td>
         <td>开支项</td>
         <td>金额</td>
         <td class="adjust">核算金额</td>
+        <td>备注</td>
       </tr>
-      <tr v-for="site in siteList" :key="site.id">
+      <tr v-for="site, index in siteList" :key="site.id">
+        <td>{{ index + 1 }}</td>
         <td>{{ site.name }}</td>
         <td style="text-align: right;">{{ site.amount }}</td>
         <td>
           <el-input-number :controls="false" v-model="site.amountAdjust" placeholder="请输入核算金额"
             @change="handleSiteChange(site)" />
         </td>
+        <td style="text-align: left;">{{ site.remark }}</td>
       </tr>
       <tr>
-        <td class="amount" colspan="1">现场开支合计</td>
+        <td class="amount" colspan="2">现场开支合计</td>
         <td class="amount" style="text-align: right;">{{siteList.reduce((sum, site) => sum + (Number(site.amount)
           || 0), 0).toFixed(2)}}</td>
         <td class="amount" style="text-align: right;">{{siteList.reduce((sum, site) => sum + (Number(site.amountAdjust)

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

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2025-05-15 18:24:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-15 18:37:17
+ * @LastEditTime: 2025-05-16 10:33:48
 -->
 <template>
   <div class="business-cost">
     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
-        <td>序号</td>
+        <td style="width: 50px;">序号</td>
         <td>名称</td>
         <td>金额</td>
         <td class="adjust">核算金额</td>
@@ -21,7 +21,7 @@
           {{ budgetForm.outExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.outExpenseAdjust" :min="0" :step="0.01"
+          <el-input-number :controls="false" v-model="budgetForm.outAdjust" :min="0" :step="0.01"
             @change="updateTotalJYAmount"></el-input-number>
         </td>
         <td class="remark-cell">{{ budgetForm.outRemark }}</td>
@@ -33,7 +33,7 @@
           {{ budgetForm.letterExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.letterExpenseAdjust" :min="0" :step="0.01"
+          <el-input-number :controls="false" v-model="budgetForm.letterAdjust" :min="0" :step="0.01"
             @change="updateTotalJYAmount"></el-input-number>
         </td>
         <td class="remark-cell">{{ budgetForm.letterRemark }}</td>
@@ -44,6 +44,10 @@
         <td style="text-align:right;">
           {{ budgetForm.winExpense }}
         </td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" v-model="budgetForm.winAdjust" :min="0" :step="0.01"
+            @change="updateTotalJYAmount"></el-input-number>
+        </td>
         <td class="remark-cell">{{ budgetForm.winRemark }}</td>
       </tr>
       <tr>
@@ -53,7 +57,7 @@
           {{ budgetForm.taxExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.taxExpenseAdjust" :min="0" :step="0.01"
+          <el-input-number :controls="false" v-model="budgetForm.taxAdjust" :min="0" :step="0.01"
             @change="updateTotalJYAmount"></el-input-number>
         </td>
         <td class="remark-cell">{{ budgetForm.taxRemark }}</td>
@@ -65,7 +69,7 @@
           {{ budgetForm.travelExpense }}
         </td>
         <td style="text-align:right;">
-          <el-input-number :controls="false" v-model="budgetForm.travelExpenseAdjust" :min="0" :step="0.01"
+          <el-input-number :controls="false" v-model="budgetForm.travelAdjust" :min="0" :step="0.01"
             @change="updateTotalJYAmount"></el-input-number>
         </td>
         <td class="remark-cell">{{ budgetForm.travelRemark }}</td>
@@ -99,13 +103,14 @@ export default {
   },
   created() {
     this.initTotalJYAmount();
+    this.updateTotalJYAmount();
   },
   methods: {
     initTotalJYAmount() {
       this.totalJYAmount = ((Number(this.budgetForm.outExpense) || 0) + (Number(this.budgetForm.letterExpense) || 0) + (Number(this.budgetForm.winExpense) || 0) + (Number(this.budgetForm.taxExpense) || 0) + (Number(this.budgetForm.travelExpense) || 0)).toFixed(2)
     },
     updateTotalJYAmount() {
-      this.totalJYAmountAdjust = ((Number(this.budgetForm.outExpenseAdjust) || 0) + (Number(this.budgetForm.letterExpenseAdjust) || 0) + (Number(this.budgetForm.winExpenseAdjust) || 0) + (Number(this.budgetForm.taxExpenseAdjust) || 0) + (Number(this.budgetForm.travelExpenseAdjust) || 0)).toFixed(2)
+      this.totalJYAmountAdjust = ((Number(this.budgetForm.outAdjust) || 0) + (Number(this.budgetForm.letterAdjust) || 0) + (Number(this.budgetForm.winAdjust) || 0) + (Number(this.budgetForm.taxAdjust) || 0) + (Number(this.budgetForm.travelAdjust) || 0)).toFixed(2)
     }
   }
 }

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

@@ -0,0 +1,137 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-16 10:34:57
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-16 11:06:49
+-->
+<template>
+  <div class="other-cost">
+    <table border="1" style="width:100%;">
+      <tr style="background-color:#f8f8f9">
+        <td></td>
+        <td style="width: 50px;">序号</td>
+        <td>名称</td>
+        <td class="adjust">核算金额</td>
+        <td>备注</td>
+      </tr>
+      <tr v-for="other, index in otherList" :key="other.id">
+        <td>
+          <div class="delete-btn" @click="removeOther(other, index)"><i class="el-icon-remove-outline"
+              style="color:#F56C6C"></i>
+          </div>
+        </td>
+        <td>{{ index + 1 }}</td>
+        <td>
+          <el-input v-model="other.name" placeholder="请输入名称" />
+        </td>
+        <td>
+          <el-input-number :controls="false" v-model="other.amountAdjust" placeholder="请输入核算金额"
+            @change="handleOtherChange(other)" />
+        </td>
+        <td>
+          <el-input type="textarea" :rows="2" v-model="other.remark" placeholder="请输入备注" />
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3" class="amount">预算外开支合计</td>
+        <td class="amount" style="text-align: right;">{{otherList.reduce((sum, other) => sum + (Number(other.amountAdjust) || 0), 0).toFixed(2)}}</td>
+      </tr>
+    </table>
+    <div class="add-staff mt10">
+      <el-button type="success" plain icon="el-icon-plus" @click="addOther" size="mini">新增项</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    otherList: {
+      type: Array,
+      default: () => [{
+        id: Date.now(),
+        name: '',
+        amountAdjust: null,
+        remark: ''
+      }]
+    }
+  },
+  watch: {
+    otherList: {
+      handler(newVal) {
+        if (!newVal || newVal.length === 0) {
+          this.$emit('update:otherList', [{
+            id: Date.now(),
+            name: '',
+            amountAdjust: null,
+            remark: ''
+          }]);
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    handleOtherChange(other) {
+      this.$emit('update:otherList', this.otherList);
+    },
+    addOther() {
+      this.otherList.push({
+        id: Date.now(),
+        name: '',
+        amountAdjust: null,
+        remark: ''
+      });
+    },
+    removeOther(other, index) {
+      this.$confirm('确实移除【' + other.name + '】吗', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let arr = this.otherList;
+        if (arr.length == 1) {
+          return;
+        }
+        if (index >= 0 && index < arr.length) {
+          arr.splice(index, 1);
+        }
+        this.$emit('update:otherList', arr);
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.other-cost {
+  .add-staff {
+    margin-bottom: 10px;
+  }
+
+  table {
+    text-align: center;
+    border-collapse: collapse;
+    margin: 0 auto;
+
+    td {
+      padding: 5px;
+    }
+  }
+
+  .adjust {
+    color: #F56C6C;
+    width: 120px;
+  }
+}
+
+.delete-btn {
+  cursor: pointer;
+  font-size: 18px;
+}
+
+.amount {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+}
+</style>

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

@@ -10,20 +10,21 @@
         <el-form ref="form" :model="item" label-width="100px">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="工作类别">
-                <el-select v-model="item.workType" placeholder="请选择工作类别"
-                  @change="(val) => handleWorkTypeChange(val, index)">
-                  <el-option v-for="type in workTypeList" :key="type.value" :label="type.label" :value="type.value">
+              <el-form-item label="工作项目">
+                <el-select v-model="item.workItem" placeholder="请选择工作项目"
+                  @change="(val) => handleWorkItemChange(val, index)">
+                  <el-option v-for="workItem in workItemList" :key="workItem.value" :label="workItem.label"
+                    :value="workItem.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工作项目">
-                <el-select v-model="item.workItem" placeholder="请选择工作项目"
-                  @change="(val) => handleWorkItemChange(val, index)">
-                  <el-option v-for="workItem in item.workItemList" :key="workItem.value" :label="workItem.label"
-                    :value="workItem.value">
+              <el-form-item label="内容细项">
+                <el-select v-model="item.subItem" placeholder="请选择内容细项"
+                  @change="(val) => handleSubItemChange(val, index)">
+                  <el-option v-for="subItem in item.workSelect.subItemList" :key="subItem.value" :label="subItem.label"
+                    :value="subItem.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -34,7 +35,7 @@
               <el-form-item label="比例尺/等级">
                 <el-select v-model="item.scaleGrade" placeholder="请选择比例尺/等级"
                   @change="(val) => handleScaleGradeChange(val, index)">
-                  <el-option v-for="scale in item.scaleGradeList" :key="scale.value" :label="scale.label"
+                  <el-option v-for="scale in item.workSelect.scaleGradeList" :key="scale.value" :label="scale.label"
                     :value="scale.value">
                   </el-option>
                 </el-select>
@@ -47,7 +48,8 @@
                   <el-option key="一般地类" label="一般地类" value="0"></el-option>
                   <el-option key="复杂地类" label="复杂地类" value="1"></el-option>
                 </el-select>
-              </el-form-item></el-col>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-row>
@@ -65,18 +67,21 @@
               <el-form-item label="工作量">
                 <el-input-number v-model="item.workload" :precision="2" :step="0.1" :min="0"
                   @change="() => calculateTotal(index)"></el-input-number>
-              </el-form-item></el-col>
+              </el-form-item>
+            </el-col>
           </el-row>
 
-
           <el-form-item label="单价">
             <el-tag>{{ item.price }}/ {{ item.unit }}</el-tag>
           </el-form-item>
 
-
           <el-form-item label="单项总额">
             <el-tag>{{ item.total }}</el-tag>
           </el-form-item>
+
+          <el-form-item label="备注">
+            {{ item.remark }}
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -98,14 +103,14 @@
 </template>
 
 <script>
-import { getWorkTypeList, getWorkItemList, getScaleGradeList, getUnitPrice, getPriceRemarkByWorkType } from '@/api/oa/price/price'
+import { getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice, getPriceRemarkByWorkType } from '@/api/oa/price/checkPrice'
 
 export default {
   name: 'CalculatePerformance',
   data() {
     return {
       visible: false,
-      workTypeList: [],
+      workItemList: [],
       performanceList: [this.getDefaultItem()]
     }
   },
@@ -119,22 +124,25 @@ export default {
   methods: {
     getDefaultItem() {
       return {
-        workType: '',
         workItem: '',
+        subItem: '',
         scaleGrade: '',
         groundType: '0',
         price: 0,
         workload: 0,
         coefficient: 1,
         total: 0,
-        workItemList: [],
-        scaleGradeList: []
+        remark: '',
+        workSelect: {
+          subItemList: [],
+          scaleGradeList: []
+        }
       }
     },
     open() {
       this.visible = true
       this.resetForm()
-      this.initWorkTypeList()
+      this.initWorkItemList()
     },
     resetForm() {
       this.performanceList = [this.getDefaultItem()]
@@ -145,43 +153,58 @@ export default {
     removeItem(index) {
       this.performanceList.splice(index, 1)
     },
-    initWorkTypeList() {
-      getWorkTypeList().then(res => {
+    initWorkItemList() {
+      getWorkItemList({ workType: '内业' }).then(res => {
         if (res) {
-          this.workTypeList = this.setArray(res)
+          this.workItemList = this.setArray(res)
         }
       })
     },
-    handleWorkTypeChange(value, index) {
+    handleWorkItemChange(value, index) {
       const item = this.performanceList[index]
-      item.workItem = ''
+      item.subItem = ''
       item.scaleGrade = ''
       item.price = 0
-      item.workItemList = []
-      item.scaleGradeList = []
+      item.workSelect.subItemList = []
+      item.workSelect.scaleGradeList = []
       this.calculateTotal(index)
 
       if (value) {
-        getWorkItemList({ workType: value }).then(res => {
-          if (res) {
-            item.workItemList = this.setArray(res)
-          }
-        })
+        this.getWorkSubItemList(item, value)
       }
     },
-    handleWorkItemChange(value, index) {
+    getWorkSubItemList(item, workItem) {
+      getSubItemList({ workItem }).then(res => {
+        if (res) {
+          let subItemList = this.setArray(res)
+          item.workSelect.subItemList = subItemList
+          if (subItemList.length > 0) {
+            item.subItem = subItemList[0].value
+            this.handleSubItemChange(item.subItem, this.performanceList.indexOf(item))
+          }
+        }
+      })
+    },
+    handleSubItemChange(value, index) {
       const item = this.performanceList[index]
       item.scaleGrade = ''
       item.price = 0
-      item.scaleGradeList = []
+      item.workSelect.scaleGradeList = []
       this.calculateTotal(index)
 
-      if (value) {
-        getScaleGradeList({ workItem: value }).then(res => {
+      // Set remark based on selected subItem
+      const selectedSubItem = item.workSelect.subItemList.find(sub => sub.value === value)
+      if (selectedSubItem) {
+        item.remark = selectedSubItem.remark || ''
+      }
+
+      if (value && item.workItem) {
+        getScaleGradeList({ workItem: item.workItem }).then(res => {
           if (res) {
-            item.scaleGradeList = this.setArray(res)
-            if (item.scaleGradeList.length > 0) {
-              item.scaleGrade = item.scaleGradeList[0].value
+            let scaleGradeList = this.setArray(res)
+            item.workSelect.scaleGradeList = scaleGradeList
+            if (scaleGradeList.length > 0) {
+              item.scaleGrade = scaleGradeList[0].value
               this.handleScaleGradeChange(item.scaleGrade, index)
             }
           }
@@ -193,7 +216,7 @@ export default {
       item.price = 0
       this.calculateTotal(index)
 
-      if (value && item.workItem) {
+      if (value && item.workItem && item.subItem) {
         this.getUnitPrice(index)
       }
     },
@@ -202,7 +225,7 @@ export default {
       item.price = 0
       this.calculateTotal(index)
 
-      if (item.scaleGrade && item.workItem) {
+      if (item.scaleGrade && item.workItem && item.subItem) {
         this.getUnitPrice(index)
       }
     },
@@ -210,12 +233,14 @@ export default {
       const item = this.performanceList[index]
       getUnitPrice({
         workItem: item.workItem,
+        subItem: item.subItem,
         scaleGrade: item.scaleGrade,
         groundType: item.groundType
       }).then(res => {
         if (res.length != 0) {
           item.price = res.data.price
           item.unit = res.data.unit
+          item.remark = res.data.remark || ''
           this.calculateTotal(index)
         }
       })