更新核算编制，修改预算、核算的内业绩效额

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

@@ -131,6 +131,7 @@ public class CmcCheckPriceController extends BaseController
         JSONObject price = new JSONObject();
         price.put("id", cmcCheckPriceList.get(0).getId());
         price.put("unit", cmcCheckPriceList.get(0).getUnit());
+        price.put("remark", cmcCheckPriceList.get(0).getRemark());
         if (groundType.equals("0"))
             price.put("price", cmcCheckPriceList.get(0).getCommonPrice());
         else

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcWage.java

@@ -71,7 +71,7 @@ public class CmcWage extends BaseEntity
     private BigDecimal payableWage;
 
     /** 公积金 */
-    @Excel(name = "公积金")
+    @Excel(name = "公积金单位部分")
     private BigDecimal houseFund;
 
     /** 养老保险 */

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settle"    column="settle"    />
         <result property="remark"    column="remark"    />
         <association property="cmcPrice"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
+        <association property="cmcCheckPrice"    javaType="CmcCheckPrice"         resultMap="CmcCheckPriceResult" />
     </resultMap>
 
     <resultMap type="CmcPrice" id="CmcPriceResult">
@@ -29,8 +30,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="complexPrice"    column="complex_price"    />
     </resultMap>
 
+    <resultMap type="CmcCheckPrice" id="CmcCheckPriceResult">
+        <result property="id"    column="id"    />
+        <result property="workType"    column="check_work_type"    />
+        <result property="workItem"    column="check_work_item"    />
+        <result property="subItem"    column="check_sub_item"    />
+        <result property="scaleGrade"    column="check_scale_grade"    />
+        <result property="unit"    column="check_unit"    />
+        <result property="commonPrice"    column="check_common_price"    />
+        <result property="complexPrice"    column="check_complex_price"    />
+        <result property="remark"    column="check_remark"    />
+    </resultMap>
+
     <sql id="selectCmcBudgetSettleVo">
-        select bs.budget_settle_id, bs.budget_id, bs.content, bs.price_id, bs.check_price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.ground_type, bs.settle , bs.remark from cmc_budget_settle as bs
+        select bs.budget_settle_id, bs.budget_id, bs.content, bs.price_id, bs.check_price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, 
+        p.common_price, p.complex_price, cp.work_type as check_work_type, cp.work_item as check_work_item, cp.sub_item as check_sub_item, cp.scale_grade as check_scale_grade, 
+        cp.unit as check_unit, cp.common_price as check_common_price, cp.complex_price as check_complex_price, cp.remark as check_remark, bs.workload, bs.coefficient, 
+        bs.ground_type, bs.settle , bs.remark from cmc_budget_settle as bs
         left join cmc_price as p on p.id = bs.price_id
         left join cmc_check_price as cp on cp.id = bs.check_price_id
     </sql>

oa-ui/src/api/oa/wage/wage.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-09-19 16:09:52
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-27 11:21:46
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-15 10:26:51
  */
 import request from '@/utils/request'
 
@@ -22,6 +22,15 @@ export function getWage(wageId) {
     method: 'get'
   })
 }
+// 查询员工工资详细
+export function getUserDayValue(query) {
+  return request({
+    url: '/oa/wage/userDayValue',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 新增员工工资
 export function addWage(data) {

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-13 16:51:36
+ * @LastEditTime: 2025-05-15 18:12:10
 -->
 <template>
   <div class="app-container">
@@ -135,7 +135,7 @@
       <el-button type="primary" @click="submitNextFlow" v-if="taskName == '预算批准'">提交下一个流程</el-button>
       <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
     </div>
-    <el-dialog title="表单预览" :visible.sync="viewOpen" width="70%" append-to-body>
+    <el-dialog title="表单预览" :visible.sync="viewOpen" width="75%" append-to-body>
       <!-- <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info> -->
       <new-budget-info :taskName="taskName" :taskForm="taskForm"></new-budget-info>
     </el-dialog>
@@ -162,17 +162,17 @@ import ReturnComment from "@/views/flowable/form/components/flowBtn/returnCommen
 import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
 import CarTable from "./carTable.vue";
 import MoneyTable from "./moneyTable.vue";
-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,
     ReturnBtn,
-    PeopleTable,
+    PeopleTable: () => import("./staffTable.vue"),
     CarTable,
     DeviceTable,
     MoneyTable,

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-14 18:27:04
+ * @LastEditTime: 2025-05-15 18:32:55
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -40,24 +40,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>
-                {{ work.remark }}
-              </td>
+              <td>{{ work.content }}</td>
+              <td>{{ work.scale }}</td>
+              <td>{{ work.unit }}</td>
+              <td>{{ work.workload }}</td>
+              <td>{{ work.deadline }}</td>
+              <td style="text-align:left;">{{ work.remark }}</td>
             </tr>
           </table>
         </div>
@@ -67,6 +55,7 @@
           <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>
@@ -77,7 +66,8 @@
           </tr>
           <tr v-for="work in workList">
             <td>{{ work.content }}</td>
-            <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
+            <td>{{ work.workItem }}</td>
+            <td>{{ work.subItem }}</td>
             <td>
               {{ work.scaleGrade }}
             </td>
@@ -93,14 +83,14 @@
             <td>{{ work.remark ? work.remark : '' }}</td>
           </tr>
           <tr>
-            <td :colspan="7" class="head">内业绩效额合计</td>
+            <td :colspan="8" class="head">内业绩效额合计</td>
             <td :colspan="1" class="head" style="text-align:right;">
               {{ budgetForm.settleExpense ? budgetForm.settleExpense.toFixed(2) : '0.00' }}
             </td>
             <td></td>
           </tr>
           <tr style="color:#F56C6C">
-            <td :colspan="7" class="head">内业核算绩效额</td>
+            <td :colspan="8" class="head">内业核算绩效额</td>
             <td :colspan="1" class="head">
               <el-input-number v-model="budgetForm.settleAdjust" :controls="false" style="width:100%"></el-input-number>
             </td>
@@ -109,32 +99,23 @@
       </el-descriptions-item>
       <el-descriptions-item label="内业人员成本" :span="3" v-if="innerStaffList.length > 0">
         <inner-staff-cost :staffList.sync="innerStaffList" :settleExpense="budgetForm.settleExpense"
-          @update:staffList="handleInnerStaffChange"></inner-staff-cost>
+          :settleAdjust="budgetForm.settleAdjust" @update:staffList="handleInnerStaffChange"></inner-staff-cost>
       </el-descriptions-item>
       <el-descriptions-item label="外业人员成本" :span="3" v-if="outerStaffList.length > 0">
         <outer-staff-cost :staffList.sync="outerStaffList"
           @update:staffList="handleOuterStaffChange"></outer-staff-cost>
       </el-descriptions-item>
       <el-descriptions-item label="车辆成本" :span="3" v-if="carList.length > 0">
-        <car-cost :carList.sync="carList"></car-cost>
+        <car-cost :carList.sync="carList" @update:carList="handleCarChange"></car-cost>
       </el-descriptions-item>
       <el-descriptions-item label="设备成本" :span="3" v-if="deviceList.length > 0">
-        <device-cost :deviceList.sync="deviceList"></device-cost>
+        <device-cost :deviceList.sync="deviceList" @update:deviceList="handleDeviceChange"></device-cost>
       </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 class="adjust">核算金额</td>
-          </tr>
-          <tr>
-
-          </tr>
-        </table>
+        <site-cost :siteList.sync="siteList" @update:siteList="handleSiteChange"></site-cost>
       </el-descriptions-item>
       <el-descriptions-item label="经营相关" :span="3">
-
+        <business-cost :budgetForm.sync="budgetForm" @update:budgetForm="handleBusinessChange"></business-cost>
       </el-descriptions-item>
       <el-descriptions-item label="预算外开销" :span="3">
 
@@ -161,13 +142,16 @@ import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 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';
 export default {
   components: {
     InnerStaffCost,
     OuterStaffCost,
     CarCost,
-    DeviceCost
+    DeviceCost,
+    SiteCost,
+    BusinessCost
   },
   props: {
     taskForm: {
@@ -192,6 +176,7 @@ export default {
       outerStaffList: [],
       carList: [],
       deviceList: [],
+      siteList: []
     }
   },
   created() {
@@ -205,13 +190,34 @@ export default {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
+          this.budgetForm.outExpense = Number(this.budgetForm.outExpense).toFixed(2);
+          this.budgetForm.letterExpense = Number(this.budgetForm.letterExpense).toFixed(2);
+          this.budgetForm.winExpense = Number(this.budgetForm.winExpense).toFixed(2);
+          this.budgetForm.taxExpense = Number(this.budgetForm.taxExpense).toFixed(2);
+          this.budgetForm.travelExpense = Number(this.budgetForm.travelExpense).toFixed(2);
+          this.budgetForm.totalBudget = Number(this.budgetForm.totalBudget).toFixed(2);
           // 获取设备数据
           let deviceRes = await listBudgetDevice({ pageSize: 100, budgetId });
           this.deviceList = deviceRes.rows;
-
+          this.deviceList = this.deviceList.map(device => {
+            return {
+              ...device,
+              depreciation: Number(device.depreciation).toFixed(2),
+              amount: Number(device.amount).toFixed(2),
+              amountAdjust: device.amountAdjust ? Number(device.amountAdjust).toFixed(2) : 0
+            };
+          });
           // 获取车辆数据
           let carRes = await listBudgetCar({ pageSize: 100, budgetId });
           this.carList = carRes.rows;
+          this.carList = this.carList.map(car => {
+            return {
+              ...car,
+              depreciation: Number(car.depreciation).toFixed(2),
+              amount: Number(car.amount).toFixed(2),
+              amountAdjust: car.amountAdjust ? Number(car.amountAdjust).toFixed(2) : 0
+            };
+          });
 
           // 获取内业人员数据
           let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
@@ -249,16 +255,41 @@ export default {
           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
+            if (work.checkPriceId) {
+              work.workType = work.cmcCheckPrice.workType
+              work.workItem = work.cmcCheckPrice.workItem
+              work.subItem = work.cmcCheckPrice.subItem
+              work.scaleGrade = work.cmcCheckPrice.scaleGrade
+              work.unit = work.cmcCheckPrice.unit
+              if (work.groundType == '0') {
+                work.price = work.cmcCheckPrice.commonPrice
+              } else {
+                work.price = work.cmcCheckPrice.complexPrice
+              }
             } else {
-              work.price = work.cmcPrice.complexPrice
+              work.workType = work.cmcPrice.workType
+              work.workItem = work.cmcPrice.workItem
+              work.subItem = work.cmcPrice.subItem
               work.scaleGrade = work.cmcPrice.scaleGrade
               work.unit = work.cmcPrice.unit
+              if (work.groundType == '0') {
+                work.price = work.cmcPrice.commonPrice
+              } else {
+                work.price = work.cmcPrice.complexPrice
+              }
             }
           }
+
+          // 获取现场开支
+          let siteRes = await listSite({ pageSize: 100, budgetId });
+          this.siteList = siteRes.rows;
+          this.siteList = this.siteList.map(site => {
+            return {
+              ...site,
+              amount: Number(site.amount).toFixed(2),
+              amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
+            };
+          });
         }
         this.loading = false;
       }).catch(() => {
@@ -276,33 +307,29 @@ export default {
     // 处理内业人员数据变化
     handleInnerStaffChange(newList) {
       this.innerStaffList = 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);
-      }
+      console.log(this.innerStaffList);
     },
 
     // 处理外业人员数据变化
     handleOuterStaffChange(newList) {
       this.outerStaffList = newList;
-      // 计算外业人员总成本
-      const totalAmount = this.outerStaffList.reduce((sum, staff) => {
-        return sum + (staff.amountAdjust || 0);
-      }, 0);
+    },
+    // 处理车辆数据变化
+    handleCarChange(newList) {
+      this.carList = newList;
+    },
+    // 处理设备数据变化
+    handleDeviceChange(newList) {
+      this.deviceList = newList;
+    },
+    // 处理现场开支数据变化
+    handleSiteChange(newList) {
+      this.siteList = newList;
+      console.log(this.siteList);
+    },
+    // 处理经营相关数据变化
+    handleBusinessChange(newData) {
 
-      // 更新预算表单中的外业人员成本
-      if (this.budgetForm) {
-        this.budgetForm.outerStaffAmount = totalAmount;
-        // 可以在这里调用API保存数据
-        // updateBudget(this.budgetForm);
-      }
     },
     async preserve() {
       let obj = {
@@ -323,6 +350,18 @@ export default {
           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);
+        }
+      })
       this.$message.success('保存成功');
     },
     confirmSucess() {

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

@@ -1,7 +1,14 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-08 14:18:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-15 14:55:55
+-->
 <template>
   <div class="car-cost">
     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
+        <td></td>
         <td>车牌号</td>
         <td>折旧成本（天）</td>
         <td>预算天数</td>
@@ -9,33 +16,107 @@
         <td class="adjust">核算天数</td>
         <td class="adjust">核算金额</td>
       </tr>
-      <tr v-for="car in carList" :key="'car' + car.carId">
-        <td>{{ car.car ? car.car.licensePlate : '' }}</td>
-        <td>{{ car.car ? car.car.dayCost : '' }}</td>
-        <td>{{ car.days }}</td>
-        <td>{{ car.amount }}</td>
+      <tr v-for="car, index in carList" :key="'car' + car.carId">
         <td>
-          <el-input-number :controls="false" style="width:100%;" v-model="car.daysAdjust" @change="handleChange"></el-input-number>
+          <div class="delete-btn" @click="removeCar(car, index)"><i class="el-icon-remove-outline"
+              style="color:#F56C6C"></i>
+          </div>
         </td>
-        <td>
-          <el-input-number :controls="false" style="width:100%;" v-model="car.amountAdjust" @change="handleChange"></el-input-number>
+        <td>{{ car.car ? car.car.licensePlate : '' }}</td>
+        <td style="text-align:right;">{{ car.car ? car.car.dayCost : '' }}</td>
+        <td style="text-align:right;">{{ car.days }}</td>
+        <td style="text-align:right;">{{ car.amount }}</td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" style="width:100%;" v-model="car.daysAdjust"
+            @change="handleChange(car)"></el-input-number>
+        </td>
+        <td style="text-align:right;">
+          {{ car.amountAdjust }}
         </td>
       </tr>
+      <tr>
+        <td colspan="2" class="amount">车辆成本合计</td>
+        <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
+          (Number(car.depreciation) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
+          (Number(car.days) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
+          (Number(car.amount) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
+          (Number(car.daysAdjust) || 0), 0).toFixed(2)}}</td>
+        <td class="amount" style="text-align:right;">{{carList.reduce((sum, car) => sum +
+          (Number(car.amountAdjust) || 0), 0).toFixed(2)}}</td>
+      </tr>
     </table>
+    <div class="mt10">
+      <el-button type="success" plain icon="el-icon-plus" @click="openCar" size="mini">新增车辆</el-button>
+    </div>
+    <!-- 选择车辆对话框 -->
+    <el-dialog title="选择车辆" :visible.sync="isOpenCar" width="700px" append-to-body>
+      <choose-car @chooseList="getChooseCar"></choose-car>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import ChooseCar from '../../components/chooseCar.vue'
+
 export default {
   name: 'CarCost',
+  components: {
+    ChooseCar
+  },
   props: {
     carList: {
       type: Array,
       default: () => []
     }
   },
+  data() {
+    return {
+      isOpenCar: false
+    }
+  },
   methods: {
-    handleChange() {
+    handleChange(car) {
+      car.amountAdjust = (Number(car.car.dayCost) * Number(car.daysAdjust)).toFixed(2);
+      this.$emit('update:carList', this.carList);
+    },
+    openCar() {
+      this.isOpenCar = true;
+    },
+    removeCar(car, index) {
+      this.$confirm('确实移除【' + car.car.licensePlate + '】吗', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let arr = this.carList;
+        if (arr.length == 1) {
+          return;
+        }
+        if (index >= 0 && index < arr.length) {
+          arr.splice(index, 1);
+        }
+        this.$emit('update:carList', this.carList);
+      }).catch(() => { });
+    },
+    getChooseCar(val) {
+      let arr = [];
+      for (let car of val) {
+        let obj = {
+          carId: car.carId,
+          car: car,
+          days: 0,
+          depreciation: car.dayCost,
+          amount: 0,
+          daysAdjust: 0,
+          amountAdjust: 0,
+        }
+        arr.push(obj);
+      }
+      this.carList.push(...arr);
+      this.isOpenCar = false;
       this.$emit('update:carList', this.carList);
     }
   }
@@ -48,13 +129,25 @@ export default {
     text-align: center;
     border-collapse: collapse;
     margin: 0 auto;
+
     td {
       padding: 5px;
     }
   }
+
   .adjust {
     color: #F56C6C;
     width: 120px;
   }
 }
-</style> 
+
+.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/adjust/components/DeviceCost.vue

@@ -2,44 +2,115 @@
   <div class="device-cost">
     <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>
-        <td>金额</td>
-        <td class="adjust">核算天数</td>
-        <td class="adjust">核算金额</td>
+        <td style="min-width: 120px;">折旧成本（天）</td>
+        <td style="min-width: 80px;">预算天数</td>
+        <td style="min-width: 80px;">金额</td>
+        <td style="min-width: 80px;" class="adjust">核算天数</td>
+        <td style="min-width: 80px;" class="adjust">核算金额</td>
       </tr>
-      <tr v-for="device in deviceList" :key="'device' + device.deviceId">
+      <tr v-for="device, index in deviceList" :key="'device' + device.deviceId">
+        <td>
+          <div class="delete-btn" @click="removeDevice(device, index)">
+            <i class="el-icon-remove-outline" style="color:#F56C6C"></i>
+          </div>
+        </td>
         <td>{{ device.device ? device.device.name : '' }}</td>
+        <td>{{ device.device ? device.device.code : '' }}</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>
-        <td>
-          <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust" @change="handleChange"></el-input-number>
+        <td style="text-align:right;">{{ device.device ? device.device.dayCost : '' }}</td>
+        <td style="text-align:right;">{{ device.days }}</td>
+        <td style="text-align:right;">{{ device.amount }}</td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" style="width:100%;" v-model="device.daysAdjust" @change="handleChange(device)"></el-input-number>
         </td>
-        <td>
-          <el-input-number :controls="false" style="width:100%;" v-model="device.amountAdjust" @change="handleChange"></el-input-number>
+        <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> -->
     </table>
+    <div class="mt10">
+      <el-button type="success" plain icon="el-icon-plus" @click="openDevice" size="mini">新增设备</el-button>
+    </div>
+    <!-- 选择设备对话框 -->
+    <el-dialog title="选择设备" :visible.sync="isOpenDevice" width="700px" append-to-body>
+      <choose-device @chooseList="getChooseDevice"></choose-device>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import ChooseDevice from '../../components/chooseDevice.vue'
+
 export default {
   name: 'DeviceCost',
+  components: {
+    ChooseDevice
+  },
   props: {
     deviceList: {
       type: Array,
       default: () => []
     }
   },
+  data() {
+    return {
+      isOpenDevice: false
+    }
+  },
   methods: {
-    handleChange() {
+    handleChange(device) {
+      device.amountAdjust = (Number(device.device.dayCost) * Number(device.daysAdjust)).toFixed(2);
+      this.$emit('update:deviceList', this.deviceList);
+    },
+    openDevice() {
+      this.isOpenDevice = true;
+    },
+    removeDevice(device, index) {
+      this.$confirm('确实移除【' + device.device.name + '】吗', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let arr = this.deviceList;
+        if (arr.length == 1) {
+          return;
+        }
+        if (index >= 0 && index < arr.length) {
+          arr.splice(index, 1);
+        }
+        this.$emit('update:deviceList', this.deviceList);
+      }).catch(() => { });
+    },
+    getChooseDevice(val) {
+      let arr = [];
+      for (let device of val) {
+        let obj = {
+          deviceId: device.deviceId,
+          device: device,
+          days: 0,
+          depreciation: device.dayCost,
+          amount: 0,
+          daysAdjust: 0,
+          amountAdjust: 0,
+        }
+        arr.push(obj);
+      }
+      this.deviceList.push(...arr);
+      this.isOpenDevice = false;
       this.$emit('update:deviceList', this.deviceList);
     }
   }
@@ -60,5 +131,13 @@ export default {
     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/adjust/components/InnerStaffCost.vue

@@ -3,22 +3,22 @@
     <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 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>
+        <td style="min-width:50px;">序号</td>
+        <td style="min-width:80px;">姓名</td>
+        <td style="min-width:80px;">人员成本（天）</td>
+        <td style="min-width:80px;">预算天数</td>
+        <td style="min-width:80px;">固定成本合计</td>
+        <td style="min-width:80px;">绩效成本合计</td>
+        <td style="width:120px;min-width:80px;">预算金额</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算固定成本</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算天数</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算绩效</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算金额</td>
       </tr>
       <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"
+          <div class="delete-btn" @click="removeStaff(staff, index)"><i class="el-icon-remove-outline"
               style="color:#F56C6C"></i>
           </div>
         </td>
@@ -46,7 +46,7 @@
         <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 +
+        <td class="head amount"  :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.performance) || 0), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum + (Number(staff.amount)
           || 0), 0).toFixed(2)}}</td>
@@ -54,9 +54,9 @@
           ((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;">
+        <td class="head amount" :class="{ 'performance-error': isPerformanceAdjustExceeded() }" style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0).toFixed(2)}}</td>
-        <td class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }" style="text-align:right;">
+        <td class="head amount" style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
@@ -86,19 +86,21 @@ export default {
     settleExpense: {
       type: Number,
       default: 0
+    },
+    settleAdjust: {
+      type: Number,
+      default: 0
     }
   },
   data() {
     return {
       isOpenPeople: false,
-      lens: 0,
     }
   },
   watch: {
 
   },
   mounted() {
-    this.lens = this.staffList.length;
   },
   methods: {
     handleChange(staff) {
@@ -109,24 +111,31 @@ export default {
       this.isOpenPeople = true;
     },
     getChooseUser(val) {
+      let arr = [];
       for (let v of val) {
-        v.days = 0;
-        v.settle = 0;
-        v.amount = 0;
-        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;
+        let dayCost = (parseFloat(((v.salary.salary + 1780) * 12) / 365) + v.socialSecurityUnit + v.houseFund).toFixed(2);
+        let obj = {};
+        obj.days = 0;
+        obj.settle = 0;
+        obj.amount = 0;
+        obj.user = v;
+        obj.dayCost = dayCost;
+        obj.staffCost = 0;
+        obj.performance = 0;
+        obj.salary = v.salary;
+        obj.userId = v.userId;
+        this.$set(obj, 'type', '内业');
+        this.$set(obj, 'daysAdjust', 0);
+        this.$set(obj, 'performanceAdjust', 0);
+        this.$set(obj, 'amountAdjust', 0);
+        arr.push(obj);
       }
-      this.staffList.push(...val);
+      this.staffList.push(...arr);
       this.isOpenPeople = false;
       this.$emit('update:staffList', this.staffList);
     },
-    removeStaff(index) {
-      this.$confirm('确实移除该人员吗', '提示', {
+    removeStaff(staff, index) {
+      this.$confirm('确实移除【' + staff.user.nickName + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -141,8 +150,12 @@ export default {
       }).catch(() => { });
     },
     isPerformanceExceeded() {
-      const totalPerformance = this.staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0);
+      const totalPerformance = this.staffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0);
       return totalPerformance > Number(this.settleExpense);
+    },
+    isPerformanceAdjustExceeded() {
+      const totalPerformanceAdjust = this.staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0);
+      return totalPerformanceAdjust > Number(this.settleAdjust);
     }
   }
 }

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

@@ -3,22 +3,23 @@
     <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>
-        <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>
+        <td style="min-width:50px;">序号</td>
+        <td style="min-width:80px;">姓名</td>
+        <td style="min-width:80px;">人员成本（天）</td>
+        <td style="min-width:80px;">预算天数</td>
+        <td style="min-width:80px;">预算系数</td>
+        <td style="min-width:100px;">固定成本合计</td>
+        <td style="min-width:100px;">绩效成本合计</td>
+        <td style="width:120px;min-width:80px;">预算金额</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算固定成本</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算天数</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算系数</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算绩效</td>
+        <td class="adjust" style="width:120px;min-width:80px;">核算金额</td>
       </tr>
       <tr v-for="staff, index in staffList" :key="'user' + staff.userId">
         <td>
-          <div class="delete-btn" v-if="index + 1 > lens" @click="removeStaff(index)">
+          <div class="delete-btn" @click="removeStaff(staff, index)">
             <i class="el-icon-remove-outline" style="color:#F56C6C"></i>
           </div>
         </td>
@@ -39,6 +40,9 @@
           <el-input-number :controls="false" style="width:100%;" v-model="staff.coefficientAdjust"
             @change="handleChange(staff)"></el-input-number>
         </td>
+        <td style="text-align:right;">
+          {{ staff.performanceAdjust }}
+        </td>
         <td style="text-align:right;">
           {{ staff.amountAdjust }}
         </td>
@@ -58,8 +62,11 @@
           ((staff.dayCost * staff.daysAdjust)), 0).toFixed(2)}}</td>
         <td class="head amount" style="text-align:right;">{{staffList.reduce((sum, staff) => sum +
           (Number(staff.daysAdjust) || 0), 0).toFixed(2)}}</td>
+        <td class="head amount">
+          ——
+        </td>
         <td class="head amount" style="text-align:right;">
-         ——
+          {{staffList.reduce((sum, staff) => sum + (Number(staff.performanceAdjust) || 0), 0).toFixed(2)}}
         </td>
         <td class="head amount" style="text-align:right;">
           {{staffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2)}}</td>
@@ -92,42 +99,54 @@ export default {
   data() {
     return {
       isOpenPeople: false,
-      lens: 0
     }
   },
   watch: {
     staffList(newval, oldval) {
       if (oldval.length == 0) {
-        this.lens = newval.length;
+
       }
     }
   },
   mounted() {
-    this.lens = this.staffList.length;
+
   },
   methods: {
     handleChange(staff) {
       // 计算调整后的金额
-      staff.amountAdjust = (Number(staff.dayCost) * Number(staff.daysAdjust) + (200 * Number(staff.daysAdjust) * Number(staff.coefficient))).toFixed(2)
+      staff.performanceAdjust = (200 * Number(staff.daysAdjust) * Number(staff.coefficientAdjust)).toFixed(2)
+      staff.amountAdjust = (Number(staff.dayCost) * Number(staff.daysAdjust) + Number(staff.performanceAdjust)).toFixed(2)
       this.$emit('update:staffList', this.staffList);
     },
     openPeople() {
       this.isOpenPeople = true;
     },
     getChooseUser(val) {
+      let arr = [];
       for (let v of val) {
-        v.daysAdjust = 0;
-        v.coefficientAdjust = 1;
-        v.otherCoefficientAdjust = 1;
-        v.amountAdjust = 0;
-        v.user = v;
+        let dayCost = (parseFloat(((v.salary.salary + 1780) * 12) / 365) + v.socialSecurityUnit + v.houseFund).toFixed(2);
+        let obj = {};
+        obj.user = v;
+        obj.dayCost = dayCost;
+        obj.staffCost = 0;
+        obj.performance = 0;
+        obj.amount = 0;
+        obj.days = 0;
+        obj.coefficient = 1;
+        obj.salary = v.salary;
+        obj.userId = v.userId;
+        this.$set(obj, 'type', '外业');
+        this.$set(obj, 'daysAdjust', 0);
+        this.$set(obj, 'coefficientAdjust', 0);
+        this.$set(obj, 'amountAdjust', 0);
+        arr.push(obj);
       }
-      this.staffList.push(...val);
+      this.staffList.push(...arr);
       this.isOpenPeople = false;
       this.$emit('update:staffList', this.staffList);
     },
-    removeStaff(index) {
-      this.$confirm('确实移除该人员吗', '提示', {
+    removeStaff(staff, index) {
+      this.$confirm('确实移除【' + staff.user.nickName + '】吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -0,0 +1,70 @@
+<template>
+  <div class="site-cost">
+    <table border="1" style="width:100%;">
+      <tr style="background-color:#f8f8f9">
+        <td>开支项</td>
+        <td>金额</td>
+        <td class="adjust">核算金额</td>
+      </tr>
+      <tr v-for="site in siteList" :key="site.id">
+        <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>
+      </tr>
+      <tr>
+        <td class="amount" colspan="1">现场开支合计</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)
+          || 0), 0).toFixed(2)}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    siteList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    handleSiteChange(site) {
+      this.$emit('update:siteList', this.siteList);
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.site-cost {
+  .add-staff {
+    margin-bottom: 10px;
+  }
+
+  table {
+    text-align: center;
+    border-collapse: collapse;
+    margin: 0 auto;
+
+    td {
+      padding: 5px;
+    }
+  }
+
+  .adjust {
+    color: #F56C6C;
+    width: 120px;
+  }
+}
+
+.amount {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+}
+</style>

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

@@ -0,0 +1,144 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-05-15 18:24:27
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-15 18:37:17
+-->
+<template>
+  <div class="business-cost">
+    <table border="1" style="width:100%;">
+      <tr style="background-color:#f8f8f9">
+        <td>序号</td>
+        <td>名称</td>
+        <td>金额</td>
+        <td class="adjust">核算金额</td>
+        <td>备注</td>
+      </tr>
+      <tr>
+        <td>{{ 1 }}</td>
+        <td>外协费用</td>
+        <td style="text-align:right;">
+          {{ budgetForm.outExpense }}
+        </td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" v-model="budgetForm.outExpenseAdjust" :min="0" :step="0.01"
+            @change="updateTotalJYAmount"></el-input-number>
+        </td>
+        <td class="remark-cell">{{ budgetForm.outRemark }}</td>
+      </tr>
+      <tr>
+        <td>{{ 2 }}</td>
+        <td>保函费用</td>
+        <td style="text-align:right;">
+          {{ budgetForm.letterExpense }}
+        </td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" v-model="budgetForm.letterExpenseAdjust" :min="0" :step="0.01"
+            @change="updateTotalJYAmount"></el-input-number>
+        </td>
+        <td class="remark-cell">{{ budgetForm.letterRemark }}</td>
+      </tr>
+      <tr>
+        <td>{{ 3 }}</td>
+        <td>中标服务费</td>
+        <td style="text-align:right;">
+          {{ budgetForm.winExpense }}
+        </td>
+        <td class="remark-cell">{{ budgetForm.winRemark }}</td>
+      </tr>
+      <tr>
+        <td>{{ 4 }}</td>
+        <td>税费</td>
+        <td style="text-align:right;">
+          {{ budgetForm.taxExpense }}
+        </td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" v-model="budgetForm.taxExpenseAdjust" :min="0" :step="0.01"
+            @change="updateTotalJYAmount"></el-input-number>
+        </td>
+        <td class="remark-cell">{{ budgetForm.taxRemark }}</td>
+      </tr>
+      <tr>
+        <td>{{ 5 }}</td>
+        <td>差旅费用</td>
+        <td style="text-align:right;">
+          {{ budgetForm.travelExpense }}
+        </td>
+        <td style="text-align:right;">
+          <el-input-number :controls="false" v-model="budgetForm.travelExpenseAdjust" :min="0" :step="0.01"
+            @change="updateTotalJYAmount"></el-input-number>
+        </td>
+        <td class="remark-cell">{{ budgetForm.travelRemark }}</td>
+      </tr>
+      <tr>
+        <td colspan="2" class="amount">经营相关合计</td>
+        <td class="amount" style="text-align:right;">
+          {{ totalJYAmount }}
+        </td>
+        <td class="amount" style="text-align:right;">
+          {{ totalJYAmountAdjust }}
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    budgetForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      totalJYAmount: 0,
+      totalJYAmountAdjust: 0
+    }
+  },
+  created() {
+    this.initTotalJYAmount();
+  },
+  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)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.business-cost {
+  .add-staff {
+    margin-bottom: 10px;
+  }
+
+  table {
+    text-align: center;
+    border-collapse: collapse;
+    margin: 0 auto;
+
+    td {
+      padding: 5px;
+    }
+  }
+
+  .adjust {
+    color: #F56C6C;
+    width: 120px;
+  }
+}
+
+.amount {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+.remark-cell {
+  text-align: left;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-14 14:18:45
+ * @LastEditTime: 2025-05-15 17:40:52
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -61,6 +61,7 @@
           <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>
@@ -71,7 +72,8 @@
           </tr>
           <tr v-for="work in workList">
             <td>{{ work.content }}</td>
-            <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
+            <td>{{ work.workItem }}</td>
+            <td>{{ work.subItem }}</td>
             <td>
               {{ work.scaleGrade }}
             </td>
@@ -95,7 +97,7 @@
             <td class="remark-cell">{{ work.remark ? work.remark : '' }}</td>
           </tr>
           <tr>
-            <td :colspan="7" class="head amount">内业绩效额合计</td>
+            <td :colspan="8" class="head amount">内业绩效额合计</td>
             <td :colspan="1" class="head amount" :class="{ 'performance-error': isPerformanceExceeded() }"
               style="text-align:right;">
               {{ budgetForm.settleExpense ? budgetForm.settleExpense.toFixed(2) : '0.00' }}
@@ -130,7 +132,7 @@
               <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>{{ staff.performance }}</td>
+            <td v-else style="text-align:right;">{{ staff.performance }}</td>
             <td style="text-align:right;">{{ staff.amount }}</td>
             <td class="remark-cell">{{ staff.remark }}</td>
           </tr>
@@ -576,14 +578,28 @@ export default {
           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
+            if (work.checkPriceId) {
+              work.workType = work.cmcCheckPrice.workType
+              work.workItem = work.cmcCheckPrice.workItem
+              work.subItem = work.cmcCheckPrice.subItem
+              work.scaleGrade = work.cmcCheckPrice.scaleGrade
+              work.unit = work.cmcCheckPrice.unit
+              if (work.groundType == '0') {
+                work.price = work.cmcCheckPrice.commonPrice
+              } else {
+                work.price = work.cmcCheckPrice.complexPrice
+              }
             } else {
-              work.price = work.cmcPrice.complexPrice
+              work.workType = work.cmcPrice.workType
+              work.workItem = work.cmcPrice.workItem
+              work.subItem = work.cmcPrice.subItem
               work.scaleGrade = work.cmcPrice.scaleGrade
               work.unit = work.cmcPrice.unit
+              if (work.groundType == '0') {
+                work.price = work.cmcPrice.commonPrice
+              } else {
+                work.price = work.cmcPrice.complexPrice
+              }
             }
           }
           // 获取现场开支

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

@@ -58,6 +58,7 @@
 <script>
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
+import { getUserDayValue } from "@/api/oa/wage/wage";
 export default {
   dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel'],
   props: {
@@ -93,6 +94,15 @@ export default {
     getList() {
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows.filter(item => item.status != '1' && item.status != '2')
+        let month = this.parseTime(new Date(), '{y}-{m}')
+        this.userList.forEach(item => {
+          getUserDayValue({ userId: item.userId, payMonth: month }).then(res => {
+            if (res.data) {
+              item.socialSecurityUnit = res.data.socialSecurityUnit
+              item.houseFund = res.data.houseFund
+            }
+          })
+        })
         this.total = response.total;
       });
     },

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

@@ -16,27 +16,13 @@
             <td colspan="4">备注</td>
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
-            <td>
-              {{ index + 1 }}
-            </td>
-            <td colspan="2">
-              {{ work.content }}
-            </td>
-            <td>
-              {{ work.scale }}
-            </td>
-            <td>
-              {{ work.unit }}
-            </td>
-            <td>
-              {{ work.workload }}
-            </td>
-            <td>
-              {{ work.deadline }}
-            </td>
-            <td colspan="4">
-              {{ work.remark }}
-            </td>
+            <td>{{ index + 1 }}</td>
+            <td colspan="2">{{ work.content }}</td>
+            <td>{{ work.scale }}</td>
+            <td>{{ work.unit }}</td>
+            <td>{{ work.workload }}</td>
+            <td> {{ work.deadline }}</td>
+            <td colspan="4">{{ work.remark }}</td>
           </tr>
         </table>
       </el-form-item>
@@ -47,8 +33,9 @@
           </tr>
           <tr class="content-head">
             <td style="width: 100px;">工作简述</td>
-            <td style="width: 100px;">工作类别</td>
-            <td style="width: 100px;">工作项目</td>
+            <!-- <td style="width: 100px;">工作类别</td> -->
+            <td style="width: 100px;">工作内容</td>
+            <td style="width: 100px;">内容细项</td>
             <td style="width: 80px;">比例尺/等级</td>
             <td style="width: 80px;">地类类型</td>
             <td style="width: 50px;">单价</td>
@@ -67,18 +54,26 @@
               <el-input type="textarea" v-model="work.content"></el-input>
             </td>
             <!-- 选择工作类别 -->
-            <td>
+            <!-- <td>
               <el-select v-model="work.workType" :style="{ width: '100%' }"
                 @change="getWorkItemList(work, work.workType)">
                 <el-option v-for="item in workTypeList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
-            </td>
+            </td> -->
             <!-- 选择工作项目 -->
             <td>
               <el-select v-model="work.workItem" :style="{ width: '100%' }" :remote="true"
                 @change="getScaleGradeList(work, work.workItem)">
-                <el-option v-for="item in work.workSelect.workItemList" :key="item.value" :label="item.label"
+                <el-option v-for="item in workItemList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </td>
+            <!-- 选择内容细项 -->
+            <td>
+              <el-select v-model="work.subItem" :style="{ width: '100%' }" :remote="true"
+                @change="setRemarkBySubItem(work, work.subItem)">
+                <el-option v-for="item in work.workSelect.subItemList" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
               </el-select>
@@ -120,9 +115,9 @@
               <el-input-number v-model="work.coefficient" :controls="false" :precision="2" :step="0.01" :max="10"
                 @blur="getTotal(work)" style="width:60px;">
               </el-input-number>
-              <el-tooltip content="系数备注" placement="right-start">
+              <!-- <el-tooltip content="系数备注" placement="right-start">
                 <el-button icon="el-icon-info" type="text" @click="getCoefficientRemark(work.workType)"></el-button>
-              </el-tooltip>
+              </el-tooltip> -->
 
             </td>
             <!-- 备注 -->
@@ -149,7 +144,8 @@
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 import { listBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
-import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice } from '@/api/oa/price/price'
+// import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice } from '@/api/oa/price/price'
+import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice } from '@/api/oa/price/checkPrice'
 export default {
   props: {
     projectId: {
@@ -166,11 +162,13 @@ export default {
       form: {},
       workList: [],//项目概况工作列表
       workTypeList: [],
+      workItemList: [],
       contentList: [
         {
           content: '',
           workType: '',
           workItem: '',
+          subItem: '',
           scaleGrade: '',
           groundType: '0',
           price: '',
@@ -204,7 +202,7 @@ export default {
     },
     contentList: {
       handler(newVal) {
-        let list = newVal.filter(item => item.priceId);
+        let list = newVal.filter(item => item.checkPriceId);
         this.$emit('contentList', list)
       },
       immediate: true, // 立即生效
@@ -213,7 +211,8 @@ export default {
   },
   created() {
     this.initTable();
-    this.initWorkTypeList();
+    // this.initWorkTypeList();
+    this.initWorkItemList();
   },
   methods: {
     initTable() {
@@ -249,14 +248,28 @@ export default {
           subItemLoading: true,
           scaleGradeLoading: true,
         })
-        this.$set(c, 'workType', c.cmcPrice.workType)
-        this.$set(c, 'scaleGrade', c.cmcPrice.scaleGrade)
-        this.$set(c, 'workItem', c.cmcPrice.workItem)
-        this.$set(c, 'unit', c.cmcPrice.unit)
-        if (c.groundType == '0') {
-          this.$set(c, 'price', c.cmcPrice.commonPrice)
+        if (c.checkPriceId) {
+          this.$set(c, 'workType', c.cmcCheckPrice.workType)
+          this.$set(c, 'workItem', c.cmcCheckPrice.workItem)
+          this.$set(c, 'subItem', c.cmcCheckPrice.subItem)
+          this.$set(c, 'scaleGrade', c.cmcCheckPrice.scaleGrade)
+          this.$set(c, 'unit', c.cmcCheckPrice.unit)
+          if (c.groundType == '0') {
+            this.$set(c, 'price', c.cmcCheckPrice.commonPrice)
+          } else {
+            this.$set(c, 'price', c.cmcCheckPrice.complexPrice)
+          }
         } else {
-          this.$set(c, 'price', c.cmcPrice.complexPrice)
+          this.$set(c, 'workType', c.cmcPrice.workType)
+          this.$set(c, 'scaleGrade', c.cmcPrice.scaleGrade)
+          this.$set(c, 'workItem', c.cmcPrice.workItem)
+          this.$set(c, 'unit', c.cmcPrice.unit)
+          this.$set(c, 'groundType', c.cmcPrice.groundType)
+          if (c.groundType == '0') {
+            this.$set(c, 'price', c.cmcPrice.commonPrice)
+          } else {
+            this.$set(c, 'price', c.cmcPrice.complexPrice)
+          }
         }
         this.getTotal(c)
       }
@@ -269,6 +282,13 @@ export default {
         }
       });
     },
+    initWorkItemList() {
+      getWorkItemList({ workType: '内业' }).then(res => {
+        if (res) {
+          this.workItemList = this.setArray(res);
+        }
+      })
+    },
     /* 获取工作项目 */
     getWorkItemList(work, workType) {
       getWorkItemList({ workType: workType }).then(res => {
@@ -281,8 +301,24 @@ export default {
         }
       })
     },
+    // 获取内容细项
+    getWorkSubItemList(work, workItem) {
+      getSubItemList({ workItem }).then(res => {
+        if (res) {
+          let subItemList = this.setArray(res);
+          work.workSelect.subItemList = subItemList;
+          this.$set(work, 'subItem', subItemList[0].label);
+          this.$set(work, 'remark', subItemList[0].remark);
+        }
+      })
+    },
+    // 设置备注
+    setRemarkBySubItem(work) {
+      this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+    },
     /* 获取比例尺 */
     getScaleGradeList(work, workItem) {
+      this.getWorkSubItemList(work, workItem);
       if (work.scale) {
         this.$set(work, 'scaleGrade', work.scale);
         if (work.groundType == undefined) {
@@ -295,8 +331,7 @@ export default {
             let scaleGradeList = this.setArray(res);
             work.workSelect.scaleGradeLoading = false;
             work.workSelect.scaleGradeList = scaleGradeList;
-            this.$set(work, 'scaleGrade', scaleGradeList[0].label)
-            // work.scaleGrade = scaleGradeList[0].label;
+            this.$set(work, 'scaleGrade', scaleGradeList[0].label);
             if (work.scaleGrade == undefined) {
               this.$set(work, 'scaleGrade', '无');
             }
@@ -312,12 +347,12 @@ export default {
     getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
       getUnitPrice({ workItem, subItem, scaleGrade, groundType: groundType }).then(res => {
         if (res.length != 0) {
-          work.priceId = res.data.id;
+          work.checkPriceId = res.data.id;
           this.$set(work, 'price', res.data.price)
           this.$set(work, 'unit', res.data.unit)
           this.$set(work, 'coefficient', 1)
+          this.$set(work, 'remark', res.data.remark)
           if (work.workload != undefined || work.workload != '') {
-
             this.getTotal(work);
           }
         }

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

@@ -280,12 +280,13 @@ export default {
         if (v.deptId === 115) {
           v.salary = { salary: 7898.75 }
         }
+        let dayCost = (parseFloat(((v.salary.salary + 1780) * 12) / 365) + v.socialSecurityUnit + v.houseFund).toFixed(2);
         v.type = this.currentType === 'inner' ? '内业' : '外业';
         v.days = 0; // 初始化天数为0
         v.staffCost = 0; // 初始化成本为0
         v.coefficient = 1; // 初始化系数为1
         v.otherCoefficient = 1; // 初始化其他系数为1
-        v.userDays = parseFloat(((v.salary.salary + 1780) * 12) / 365).toFixed(2);
+        v.dayCost = dayCost;
       }
       if (this.currentType === 'inner') {
         this.innerUsers = val;
@@ -316,7 +317,7 @@ export default {
         user.performance = 200 * Number(user.days) * Number(user.coefficient);
       }
       if (!user.dayCost) {
-        user.dayCost = parseFloat(((user.salary.salary + 1780) * 12) / 365).toFixed(2)
+        user.dayCost = (parseFloat(((user.salary.salary + 1780) * 12) / 365) + user.socialSecurityUnit + user.houseFund).toFixed(2);
       }
       let staffCost = Number(user.dayCost) * Number(user.days)
       total = user.dayCost * Number(user.days) + Number(user.performance);

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

@@ -8,13 +8,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="发放日期" prop="payDay">
-        <el-date-picker clearable v-model="queryParams.payDay" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择发放日期">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="发放月份" prop="payMonth">
-        <el-date-picker clearable v-model="queryParams.payMonth" type="date" value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.payMonth" type="month" value-format="yyyy-MM-dd"
           placeholder="请选择发放月份">
         </el-date-picker>
       </el-form-item>
@@ -43,9 +38,9 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-          v-hasPermi="['oa:wage:export']">导入</el-button>
+          v-hasPermi="['oa:wage:export']">上传社保公积金</el-button>
       </el-col>
-    
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -64,7 +59,7 @@
       <el-table-column label="高温补贴" align="center" prop="highTemperatureSubsidy" />
       <el-table-column label="考勤扣款" align="center" prop="attendanceDeduct" />
       <el-table-column label="应发小计" align="center" prop="payableWage" /> -->
-      <el-table-column label="公积金" align="center" prop="houseFund" />
+      <el-table-column label="公积金单位部分" align="center" prop="houseFund" />
       <!-- <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
       <el-table-column label="失业保险" align="center" prop="unemploymentInsurance" />
       <el-table-column label="医疗保险" align="center" prop="medicalInsurance" />
@@ -73,14 +68,14 @@
       <el-table-column label="社保单位部分" align="center" prop="socialSecurityUnit" />
       <!-- <el-table-column label="个税" align="center" prop="individualIncomeTax" />
       <el-table-column label="实发工资" align="center" prop="paidWage" /> -->
-      <el-table-column label="发放日期" align="center" prop="payDay" width="180">
+      <!-- <el-table-column label="发放日期" align="center" prop="payDay" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payDay, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="发放月份" align="center" prop="payMonth" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payMonth, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.payMonth, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -97,7 +92,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改员工工资对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="员工id" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入员工id" />
@@ -173,11 +168,35 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-change="handleFileUploadChange"
+        :on-success="handleFileSuccess" :auto-upload="false" drag v-loading="uploadLoading"
+        element-loading-text="正在上传，请稍等">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitUpload">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listWage, getWage, delWage, addWage, updateWage } from "@/api/oa/wage/wage";
+import { downloadTemplate } from "@/api/file/project";
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Wage",
@@ -232,7 +251,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "上传社保公积金",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部'Content-Type': 'multipart/form-data', 
+        headers: { 'Authorization': "Bearer " + getToken() },
+        data: undefined,
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/oa/wage/uploadSheet"
+      },
+      uploadLoading: false,
+      uploadFormData: undefined,
     };
   },
   created() {
@@ -351,8 +387,47 @@ export default {
       }, `wage_${new Date().getTime()}.xlsx`)
     },
     handleImport() {
-
-    }
+      this.upload.open = true;
+    },
+    /**Excel文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadLoading = true;
+    },
+    /* Excel文件改变时 */
+    handleFileUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.uploadFormData = new FormData();
+      this.uploadFormData.append("file", file);
+      this.upload.data = this.uploadFormData;
+    },
+    /** Excel文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.uploadLoading = false;
+      this.fileList = [];
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$refs["uploadRef"].clearFiles();
+      this.getList();
+    },
+    /* Excel上传提交按钮 */
+    submitUpload() {
+      this.$refs['uploadRef'].submit();
+    },
+    /* 下载模板 */
+    importTemplate() {
+      const path = "http://127.0.0.1:8080/profile/template/userWage.xlsx"
+      // const path = "http://oa.sccehui.com:6104/prod-api/profile/template/cg-template.xlsx"
+      downloadTemplate(path).then(res => {
+        const blob = new Blob([res])
+        saveAs(blob, '社保公积金模版.xlsx');
+      });
+      // this.download("file/achievement/importTemplate", {
+      // }, `成果表模板.xlsx`);
+    },
   }
 };
 </script>