From 9b4e84037a9d49a5a0be5d0dcf3156e55090ca55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=98=8A=E9=A3=9E?= <zhanghaofei0519@163.com>
Date: Fri, 12 Sep 2025 09:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E4=BF=AE=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pRepairFormProjectDispatchServiceImpl.java |  3 +-
 .../repairFormProjectDispatch/index.vue       | 59 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java
index a1b57fa..5768cc2 100644
--- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java
+++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java
@@ -146,7 +146,7 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr
             projectDispatch.setActualManHour(hour);
 //            projectDispatch.setDeductManHour(hour);
             // 汇总实际总工时
-            formProject.setActualTime(formProject.getActualTime().add(hour));
+            formProject.setActualTime(hour);
             return projectDispatch;
         }).collect(Collectors.toList());
         formProject.setIsDispatch(IsEnableStatus.YES.getCode());
@@ -160,6 +160,7 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr
     @Override
     public Boolean updateByBo(ErpRepairFormProjectDispatchBo bo) {
         ErpRepairFormProjectDispatch projectDispatch = baseMapper.selectById(bo.getId());
+        projectDispatch.setDispatchManHour(bo.getDispatchManHour());
         projectDispatch.setActualManHour(bo.getDispatchManHour().subtract(bo.getDeductManHour()));
         projectDispatch.setDeductManHour(bo.getDeductManHour());
         return baseMapper.updateById(projectDispatch) > 0;
diff --git a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
index 9b04962..68143d8 100644
--- a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
+++ b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
@@ -20,7 +20,20 @@
       <el-table-column label="人员名称" align="center" prop="maintainUserName" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
 <!--      <el-table-column label="在岗状态" align="center" prop="state" />-->
-      <el-table-column label="分配工时" align="center" prop="dispatchManHour" />
+      <el-table-column label="分配工时" align="center" prop="dispatchManHour">
+        <template slot-scope="scope">
+          <el-input-number 
+            v-model="scope.row.dispatchManHour" 
+            @change="handleDispatchManHourChange(scope.row)" 
+            controls-position="right" 
+            size="mini" 
+            :class="{ 'input-error': !isDispatchValid(scope.row) }"
+            :min="0" 
+            :max="Number(scope.row.standardManHour)" 
+            :precision="1" 
+            style="width: 100%" />
+        </template>
+      </el-table-column>
       <el-table-column label="扣罚工时" align="center" prop="deductManHour">
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.deductManHour" @change="submitForm(scope.row)" controls-position="right" size="mini" :min="0" :max="Number(scope.row.dispatchManHour)" :precision="1" style="width: 100%" />
@@ -28,7 +41,7 @@
       </el-table-column>
       <el-table-column label="实际工时" align="center" prop="actualManHour">
         <template slot-scope="scope">
-          {{scope.row.actualManHour = Number(scope.row.dispatchManHour) - Number(scope.row.deductManHour).toFixed(1)}}
+          {{ (Number(scope.row.dispatchManHour) - Number(scope.row.deductManHour)).toFixed(1) }}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -185,6 +198,16 @@ export default {
       }
     };
   },
+  computed: {
+    // 检查总分配工时是否超过标准工时
+    isTotalExceedStandard() {
+      if (!this.data.standardManHour) return false;
+      const totalDispatchManHour = this.repairFormProjectDispatchList.reduce((total, item) => {
+        return total + (Number(item.dispatchManHour) || 0);
+      }, 0);
+      return totalDispatchManHour !== Number(this.data.standardManHour);
+    }
+  },
   created() {
     this.getList();
   },
@@ -262,6 +285,32 @@ export default {
         this.title = "修改报修单-报修项目-派工";
       });
     },
+    // 检查分配工时是否有效
+    isDispatchValid(row) {
+      if (!this.data.standardManHour) return true;
+      const totalDispatchManHour = this.repairFormProjectDispatchList.reduce((total, item) => {
+        return total + (Number(item.dispatchManHour) || 0);
+      }, 0);
+      return totalDispatchManHour === Number(this.data.standardManHour);
+    },
+    /** 分配工时变化处理 */
+    handleDispatchManHourChange(row) {
+      // 检查总分配工时是否等于标准工时
+      const totalDispatchManHour = this.repairFormProjectDispatchList.reduce((total, item) => {
+        return total + (Number(item.dispatchManHour) || 0);
+      }, 0);
+
+      // 如果总分配工时不等于标准工时，显示提示
+      if (this.data.standardManHour && totalDispatchManHour !== Number(this.data.standardManHour)) {
+        this.$message.warning(`总分配工时(${totalDispatchManHour})不等于项目标准工时(${this.data.standardManHour})`);
+        return false;
+      }
+      // 更新实际工时
+      row.actualManHour = (Number(row.dispatchManHour) - Number(row.deductManHour)).toFixed(1);
+      
+      // 提交更新
+      this.submitForm(row);
+    },
     /** 提交按钮 */
     submitForm(row) {
       this.buttonLoading = true;
@@ -312,3 +361,9 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+.input-error ::v-deep .el-input__inner {
+  border-color: #f56c6c !important;
+}
+</style>
\ No newline at end of file
-- 
2.22.0