项目成本归集更改

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

@@ -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)

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

@@ -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>