From f7ad2273cd84ed0fd5228857cc584ff1121d0ee9 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 27 Feb 2024 15:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=90=E9=A1=B9=E9=AB=98=E4=BA=AE=E6=95=B4=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectorder/ProjectOrderServiceImpl.java     | 15 ++++++++-------
 .../src/views/heli/projectorder/detail.vue        |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
index 3e275b82..7c371e30 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
@@ -31,10 +31,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -259,9 +256,13 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
                     Map<String, List<ProjectOrderSubDO>> nameGroups = lastSnapshotSubDOList.stream().collect(Collectors.groupingBy(ProjectOrderSubDO::getName));
                     projectOrderSubDOList.forEach(projectOrderSubDO -> {
                         List<ProjectOrderSubDO> lastSnapshotSubs = nameGroups.get(projectOrderSubDO.getName());
-                        if(lastSnapshotSubs == null || lastSnapshotSubs.isEmpty()) return;
-                        List<FieldInfo> diffFields = FIELD_EQUATOR.getDiffFields(projectOrderSubDO, lastSnapshotSubs.get(0));
-                        projectOrderSubDO.setAlterFieldNames(diffFields.stream().map(FieldInfo::getFieldName).collect(Collectors.toSet()));
+                        if(lastSnapshotSubs == null || lastSnapshotSubs.isEmpty()){
+                            // 如为新增行 则整行标记
+                            projectOrderSubDO.setAlterFieldNames(new HashSet<String>(1){{add("NEW");}});
+                        }else{
+                            List<FieldInfo> diffFields = FIELD_EQUATOR.getDiffFields(projectOrderSubDO, lastSnapshotSubs.get(0));
+                            projectOrderSubDO.setAlterFieldNames(diffFields.stream().map(FieldInfo::getFieldName).collect(Collectors.toSet()));
+                        }
                     });
                 }
             }catch (Exception e){
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 7a323c7f..7c1b351f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -283,7 +283,7 @@
                 <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem">新增</el-button>
               </el-col>
               <el-form ref="projectOrderSubFormRef" :model="formData.projectOrderSubs" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
-                <el-table :data="formData.projectOrderSubs" class="hl-table">
+                <el-table :data="formData.projectOrderSubs" class="hl-table" :row-class-name="({row,rowIndex}) => { return fieldHasAlterInRow('NEW', row) ? 'alter-class' : ''}">
                   <el-table-column label="序号" type="index" width="80" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>子项目名称 </template>