licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目成本归集更改

Browse Source
This commit is contained in:
z 2025-05-16 15:01:33 +08:00
parent e7342dbcb7
commit 2213313cce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
View File

@ -161,7 +161,7 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
default List<TaskDispatchDO> getListJg(Long id, Long projectSubId){
MPJLambdaWrapper<TaskDispatchDO> query = new MPJLambdaWrapper<>();
query.selectAll(TaskDispatchDO.class)
.select("z.name as materialName", "z.procedure_type as materialType", "SUM(COALESCE(d.work_time, 0)) as amount")
.select("z.name as materialName", "z.procedure_type as materialType", "CASE WHEN d.work_type = 1 THEN SUM(COALESCE(d.work_time, 0)) ELSE '' as amount")
.select("p.grade_cost as shiJiMoney","u1.nickname as ownerName","p.name as name")
.select(" ROUND(SUM(CASE WHEN d.work_type = 1 THEN COALESCE(d.work_time, 0) * p.grade_cost ELSE COALESCE(d.work_time, 0) END), 2) as zanGuMoney")
.leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getDispatchId,TaskDispatchDO::getId)

2
mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue
View File

@ -14,7 +14,7 @@
<el-input v-model="formData.amount" placeholder="请输入报工数量" />
</el-form-item>
<el-form-item label="原因说明" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入原因说明" />
<el-input type="textarea" :rows="5" v-model="formData.remark" placeholder="请输入原因说明" />
</el-form-item>
</el-form>
<template #footer>