Quellcode durchsuchen

优化预算编制时选择人员与选择设备;

修复预算没有内业绩效时,无法添加现场开支的问题;
修复核算中,人员成本统计错误的问题
余思翰 vor 2 Tagen
Ursprung
Commit
da0a754a65

+ 8
- 6
oa-ui/src/views/flowable/form/budget/addBudget.vue Datei anzeigen

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-06-21 18:51:51
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-07-03 16:10:00
5
+ * @LastEditTime: 2025-07-08 10:23:25
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -328,16 +328,18 @@ export default {
328 328
         device.budgetId = form.budgetId;
329 329
         await addBudgetDevice(device);
330 330
       }
331
-      await delBudgetSettle(form.budgetId);
332
-      for (let work of form.contentList) {
333
-        work.budgetId = form.budgetId;
334
-        await addBudgetSettle(work);
335
-      }
336 331
       await delSite(form.budgetId);
337 332
       for (let site of form.expensesList) {
338 333
         site.budgetId = form.budgetId;
339 334
         await addSite(site);
340 335
       }
336
+      await delBudgetSettle(form.budgetId);
337
+      if (form.contentList && Array.isArray(form.contentList)) {
338
+        for (let work of form.contentList) {
339
+          work.budgetId = form.budgetId;
340
+          await addBudgetSettle(work);
341
+        }
342
+      }
341 343
       this.$message.success("预算添加成功");
342 344
     },
343 345
     getChooseUser(val) {

+ 7
- 3
oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue Datei anzeigen

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2025-05-07 11:01:39
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-06-19 16:25:11
5
+ * @LastEditTime: 2025-07-09 17:04:27
6 6
 -->
7 7
 <template>
8 8
   <div class="main">
@@ -726,14 +726,18 @@ export default {
726 726
     // 处理内业人员数据变化
727 727
     handleInnerStaffChange(newList) {
728 728
       this.innerStaffList = newList;
729
-      this.checkStaffCost = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2);
729
+      let innerSum =  this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
730
+      let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
731
+      this.checkStaffCost = (innerSum + outerSum).toFixed(2);
730 732
       this.getTotalBudgetAdjust();
731 733
     },
732 734
 
733 735
     // 处理外业人员数据变化
734 736
     handleOuterStaffChange(newList) {
735 737
       this.outerStaffList = newList;
736
-      this.checkStaffCost = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0).toFixed(2);
738
+      let innerSum =  this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
739
+      let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
740
+      this.checkStaffCost = (innerSum + outerSum).toFixed(2);
737 741
       this.getTotalBudgetAdjust();
738 742
     },
739 743
     // 处理车辆数据变化

+ 0
- 3
oa-ui/src/views/flowable/form/budget/staffTable.vue Datei anzeigen

@@ -294,9 +294,6 @@ export default {
294 294
       const processedUsers = val.map(v => {
295 295
         const userCopy = JSON.parse(JSON.stringify(v));
296 296
         
297
-        if (userCopy.deptId === 115) {
298
-          userCopy.salary = { salary: 7898.75 }
299
-        }
300 297
         let dayCost;
301 298
         if (!userCopy.salary) {
302 299
           userCopy.salary = { salary: 0 }

Laden…
Abbrechen
Speichern