Переглянути джерело

修改预算中计划工作量显示不全的问题,去掉不足600按600算的限制

余思翰 1 місяць тому
джерело
коміт
fc96d9f80d

+ 6
- 3
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Переглянути файл

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-03 16:28:09
3
  * @Date: 2024-04-03 16:28:09
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-04-14 09:37:59
5
+ * @LastEditTime: 2025-04-17 10:21:51
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="main">
8
   <div class="main">
9
-    <div>
9
+    <div v-loading="loading">
10
       <h2 class="text-center">项目直接生产成本预算表</h2>
10
       <h2 class="text-center">项目直接生产成本预算表</h2>
11
       <p style="text-align: center;">编制人:{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
11
       <p style="text-align: center;">编制人:{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
12
       <el-descriptions :column="3" border class="descriptions">
12
       <el-descriptions :column="3" border class="descriptions">
416
       contract: {},
416
       contract: {},
417
       profit: 0,
417
       profit: 0,
418
       returnOpen: false,
418
       returnOpen: false,
419
+      loading: true,
419
     };
420
     };
420
   },
421
   },
421
   created() {
422
   created() {
423
   },
424
   },
424
   methods: {
425
   methods: {
425
     initBudgetForm() {
426
     initBudgetForm() {
427
+      this.loading = true;
426
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
428
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
427
         this.budgetForm = res.rows[0];
429
         this.budgetForm = res.rows[0];
428
         this.setSignName();
430
         this.setSignName();
460
                 work.unit = work.cmcPrice.unit
462
                 work.unit = work.cmcPrice.unit
461
               }
463
               }
462
             }
464
             }
465
+            this.loading = false;
463
             this.getProjectWorkList();
466
             this.getProjectWorkList();
464
           })
467
           })
465
           this.getProjectList();
468
           this.getProjectList();
495
       });
498
       });
496
     },
499
     },
497
     getProjectWorkList() {
500
     getProjectWorkList() {
498
-      listProjectWork({ projectId: this.taskForm.formId }).then(res => {
501
+      listProjectWork({ pageSize: 999, projectId: this.taskForm.formId }).then(res => {
499
         this.workContentList = res.rows;
502
         this.workContentList = res.rows;
500
       })
503
       })
501
     },
504
     },

+ 1
- 5
oa-ui/src/views/flowable/form/budget/moneyTable.vue Переглянути файл

218
   methods: {
218
   methods: {
219
     initTable() {
219
     initTable() {
220
       if (this.projectId != '') {
220
       if (this.projectId != '') {
221
-        listProjectWork({ projectId: this.projectId }).then(res => {
221
+        listProjectWork({ pageSize: 999, projectId: this.projectId }).then(res => {
222
           this.workList = res.rows;
222
           this.workList = res.rows;
223
         })
223
         })
224
       }
224
       }
326
     /* 获取总额 */
326
     /* 获取总额 */
327
     getTotal(work) {
327
     getTotal(work) {
328
       let total = this.calculateTotal(work.price, work.coefficient, work.workload, 1);
328
       let total = this.calculateTotal(work.price, work.coefficient, work.workload, 1);
329
-      if (total < 600) {
330
-        total = 600
331
-        work.remark = '不足600,按600算'
332
-      }
333
       this.$set(work, 'settle', total)
329
       this.$set(work, 'settle', total)
334
       this.getSettleSum();
330
       this.getSettleSum();
335
     },
331
     },

Завантаження…
Відмінити
Зберегти