From cab790efcf0934df0cc110c76b83b43f9e3b1c94 Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Tue, 18 Nov 2025 17:01:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=86=B5=E5=BA=93=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/treeCaseTable/loadCaseTable.vue    |   4 +-
 .../condition/components/taskPool.vue         |  16 ++-
 .../approvalPreview/components/taskPool.vue   | 123 ++++++++++++++++--
 3 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/src/components/common/treeCaseTable/loadCaseTable.vue b/src/components/common/treeCaseTable/loadCaseTable.vue
index 7510240b..79196b08 100644
--- a/src/components/common/treeCaseTable/loadCaseTable.vue
+++ b/src/components/common/treeCaseTable/loadCaseTable.vue
@@ -3,7 +3,7 @@
     <TreeCaseTable
       ref="loadcaseTableRef"
       :tableName="tableName"
-      showCheckbox
+      :showCheckbox="showCheckBox"
       :data="disposeTreeData(data)"
       :actionsWidth="95"
       @checkbox-change="checkboxChangeFun"
@@ -202,6 +202,7 @@ interface Props {
   projectUuid?: string; // 项目uuid
   phaseUuid?: string; // 阶段uuid
   exportBtnVisible?: boolean; // 阶段uuid
+  showCheckBox?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -222,6 +223,7 @@ const props = withDefaults(defineProps<Props>(), {
   projectUuid: '',
   phaseUuid: '',
   exportBtnVisible: false,
+  showCheckBox: true,
 });
 const tagKeyMap = getTagKeyMap();
 const disposeTreeData = (treeData: any[]) => {
diff --git a/src/views/competenceCenter/condition/components/taskPool.vue b/src/views/competenceCenter/condition/components/taskPool.vue
index d991934d..8a934e87 100644
--- a/src/views/competenceCenter/condition/components/taskPool.vue
+++ b/src/views/competenceCenter/condition/components/taskPool.vue
@@ -111,6 +111,8 @@
         :data="extractTableData"
         :loading="loading"
         :editMode="false"
+        :showCheckBox="false"
+        @update="onListTableUpdateFun"
       >
       </loadCaseTable>
       <!-- <loadcase-pro-table
@@ -444,6 +446,9 @@ const createTaskPoolFun = async (formData: any) => {
     approveTemplateName: formData.approveTemplateName,
     fullTableColumns: cloneDeep(columns),
     fullTableData: cloneDeep(fullData),
+    approvePreviewInfo: {
+      fullData: fullData,
+    },
   };
   const res: any = await createTaskPoolApi(req);
   if (res.code === 200) {
@@ -493,6 +498,11 @@ const updateTaskPoolFun = async (formData: any) => {
     deletePerformanceExtras: [],
     fullTableColumns: cloneDeep(columns),
     fullTableData: cloneDeep(fullData),
+    approvePreviewInfo: {
+      insertRecords: insertRecords,
+      removeRecords: removeRecords,
+      updateRecords: normalizedUpdateRecords,
+    },
   };
   if (insertRecords.length > 0) {
     const addObj = formatAddFun(cloneDeep(insertRecords), cloneDeep(normalizedUpdateRecords));
@@ -903,7 +913,7 @@ const calcMergeCellsFun = (tableData: any) => {
         if (rowspan > 1 && startVal !== null) {
           mergeCells.push({
             row: start,
-            col: colIdx + 1,
+            col: colIdx,
             rowspan,
             colspan: 1,
           });
@@ -1107,6 +1117,10 @@ const onExportPoolFun = async () => {
   exportLoading.value = false;
 };
 
+const onListTableUpdateFun = (params: any) => {
+  console.log('onListTableUpdateFun params', params);
+};
+
 onMounted(async () => {
   // await getColumnsFun();
   initProjectDicts();
diff --git a/src/views/index/approvalPreview/components/taskPool.vue b/src/views/index/approvalPreview/components/taskPool.vue
index 2a38afb6..0d343bb7 100644
--- a/src/views/index/approvalPreview/components/taskPool.vue
+++ b/src/views/index/approvalPreview/components/taskPool.vue
@@ -1,14 +1,53 @@
 <template>
   <div class="gl-page-content-full">
-    <div>工况清单库：{{ poolName }}</div>
-    <loadCaseTable
-      :editMode="false"
-      ref="treeTableRef"
-      readonly
-      tableName="TASK_POOL"
-      :data="fullTableData"
-      :hasOperationColumn="false"
-    > </loadCaseTable>
+    <div class="left">
+      <loadCaseTable
+        :editMode="false"
+        ref="treeTableRef"
+        readonly
+        tableName="TASK_POOL"
+        :data="fullTableData"
+        :hasOperationColumn="false"
+        :showCheckBox="false"
+      > </loadCaseTable>
+    </div>
+    <div class="right">
+      <div class="label">工况清单库</div>
+      <div class="content">
+        {{ poolName }}
+      </div>
+      <div class="label">新增数据</div>
+      <div class="content">
+        <ul v-if="addedItems.length">
+          <li v-for="(item, idx) in addedItems" :key="'add-'+idx">
+            <el-tag type="success">  {{ item.nodeName }}</el-tag>
+          </li>
+        </ul>
+        <div v-else class="empty">无新增数据</div>
+      </div>
+
+      <div class="label">修改数据</div>
+      <div class="content">
+        <ul v-if="updatedItems.length">
+          <li v-for="(item, idx) in updatedItems" :key="'upd-'+idx">
+            <el-tag type="primary">  {{ item.nodeName }}</el-tag>
+          </li>
+        </ul>
+        <div v-else class="empty">无修改数据</div>
+      </div>
+
+      <div class="label">删除数据</div>
+      <div class="content">
+        <ul v-if="deletedItems.length">
+          <li v-for="(item, idx) in deletedItems" :key="'del-'+idx">
+            <el-tag type="danger">  {{ item.nodeName }}</el-tag>
+          </li>
+        </ul>
+        <div v-else class="empty">无删除数据</div>
+      </div>
+
+    </div>
+
   </div>
 
 </template>
@@ -30,12 +69,78 @@ const approveContents = ref<any>(null);
 
 const fullTableData = ref<any>([]);
 
+const addedItems = ref<any[]>([]);
+const updatedItems = ref<any[]>([]);
+const deletedItems = ref<any[]>([]);
+
+const flattenAddGroups = (c: any) => {
+  return c.insertRecords;
+};
+
+const flattenUpdateGroups = (c: any) => {
+  return c.updateRecords;
+};
+
+const flattenDeleteGroups = (c: any) => {
+  return c.removeRecords;
+};
+
 watchEffect(() => {
   fullTableData.value = [];
+  addedItems.value = [];
+  updatedItems.value = [];
+  deletedItems.value = [];
+
   if (props.data) {
     approveContents.value = JSON.parse(props.data?.approveContents || '{}');
     fullTableData.value = approveContents.value?.fullTableData;
     poolName.value = approveContents.value?.poolBrief?.poolName;
+    const approvePreviewInfo = approveContents.value?.approvePreviewInfo || {};
+    try {
+      addedItems.value = flattenAddGroups(approvePreviewInfo || {});
+      updatedItems.value = flattenUpdateGroups(approvePreviewInfo || {});
+      deletedItems.value = flattenDeleteGroups(approvePreviewInfo || {});
+    } catch (e) {
+      console.error('flatten approvePreviewInfo fail', e);
+      addedItems.value = [];
+      updatedItems.value = [];
+      deletedItems.value = [];
+    }
   }
 });
 </script>
+<style lang="scss" scoped >
+.left {
+  width: 70%;
+  float: left;
+  padding-right: 10px;
+  border-right: 1px solid #e8e8e8;
+  height: 100%;
+}
+.right {
+  width: 30%;
+  float: left;
+  padding-left: 10px;
+  height: 100%;
+  overflow: auto;
+}
+.label {
+  font-weight: 600;
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
+.content {
+  max-height: 500px;
+  overflow: auto;
+  background: #fff;
+  padding: 8px;
+  border: 1px solid #f0f0f0;
+}
+.empty {
+  color: #999;
+  font-size: 12px;
+}
+ul>li {
+  margin-bottom: 6px;
+}
+</style>