From 466d963c369c0191d77fe973cbcbe5f14045de1b Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Mon, 2 Mar 2026 11:03:13 +0800
Subject: [PATCH 1/2] Revert "feat: baseTable params"

This reverts commit 31c1cd715c8bc57c24f51446d0ad9ed11c098bd9.
---
 src/components/common/table/baseTable.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/common/table/baseTable.vue b/src/components/common/table/baseTable.vue
index 5edc137f..6e9aab30 100644
--- a/src/components/common/table/baseTable.vue
+++ b/src/components/common/table/baseTable.vue
@@ -213,7 +213,7 @@ import HeadSearch from './headSearch.vue';
 import { getFormConfigureApi } from '@/api/system/systemData';
 import { formOptionsFormat } from './lib';
 import { exportFile, fileUploadAllocationIconFun } from '@/utils/file';
-import { cloneDeep, isString, isEqual } from 'lodash-es';
+import { cloneDeep, isString } from 'lodash-es';
 import { CommonStore } from '@/stores/common';
 
 const commonStore = CommonStore();
@@ -346,10 +346,8 @@ watch(
 
 watch(
   () => props.params,
-  (newVal: any, oldVal: any) => {
-    if (!isEqual(newVal, oldVal)) {
-      resetSearchFun(newVal);
-    }
+  (val: any) => {
+    resetSearchFun(val);
   },
   { deep: true }
 );

From 96e2dc6d7cd3cac7469bdd8c4a3fda24dd5510e9 Mon Sep 17 00:00:00 2001
From: zhouyang <zhouyang@honeycombtech.com>
Date: Mon, 2 Mar 2026 11:18:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update:=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=96=E5=88=92=E5=AE=A1=E6=89=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=86=85=E5=AE=B9=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80=E5=8D=87=E7=89=88=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/planningRecord.vue             | 13 ++-
 .../components/planningRecordDetail.vue       | 82 +++++++++++++++++++
 .../projectList/components/taskDialog.vue     |  2 +-
 3 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 src/views/task/projectDetail/components/planningRecordDetail.vue

diff --git a/src/views/task/projectDetail/components/planningRecord.vue b/src/views/task/projectDetail/components/planningRecord.vue
index 3f9a0de9..2321cc57 100644
--- a/src/views/task/projectDetail/components/planningRecord.vue
+++ b/src/views/task/projectDetail/components/planningRecord.vue
@@ -23,6 +23,8 @@
         </el-form>
       </template>
     </BaseTable>
+
+    <planningRecordDetail v-if="showDetail" :plan-info="currentRow" @close="closeDetailFun"></planningRecordDetail>
   </div>
 </template>
 
@@ -31,6 +33,7 @@ import { getChildrenNodeListApi } from '@/api/project/node';
 import { nextTick, onMounted, reactive, ref } from 'vue';
 import BaseTable from '@/components/common/table/baseTable.vue';
 import { queryDesignVersionsApi } from '@/api/project/project';
+import planningRecordDetail from './planningRecordDetail.vue';
 
 const props = defineProps({
   projectInfo: {
@@ -41,6 +44,7 @@ const props = defineProps({
 
 const phaseList = ref<any>([]);
 const baseTableRef = ref();
+const showDetail = ref(false);
 const formData = reactive<any>({
   projectId: '',
   phaseId: '',
@@ -65,13 +69,14 @@ const getProjectPhaseListFun = async () => {
   } catch {}
 };
 
+const currentRow = ref<any>({});
 const actionList = ref([
   {
     title: '详情',
     type: 'primary',
     click: (row: any) => {
-      const data = JSON.parse(row.versionContents);
-      console.log(data);
+      currentRow.value = row;
+      showDetail.value = true;
     },
   },
 ]);
@@ -93,6 +98,10 @@ const getTableDataFun = async () => {
   } catch {}
 };
 
+const closeDetailFun = () => {
+  showDetail.value = false;
+};
+
 onMounted(async () => {
   if (props.projectInfo) {
     formData.projectId = props.projectInfo.uuid;
diff --git a/src/views/task/projectDetail/components/planningRecordDetail.vue b/src/views/task/projectDetail/components/planningRecordDetail.vue
new file mode 100644
index 00000000..cccd0b2a
--- /dev/null
+++ b/src/views/task/projectDetail/components/planningRecordDetail.vue
@@ -0,0 +1,82 @@
+<template>
+  <Dialog v-model="visible" diaTitle="策划详情" :width="'70%'" :height="'70%'" @close="closeFun">
+    <div class="detail-page">
+      <simulationPlan v-if="cidFlowId" :page-data="approvalData"></simulationPlan>
+      <loadCaseTable
+        v-else
+        :editMode="false"
+        ref="treeTableRef"
+        readonly
+        tableName="PROJECT_TASK_PLANNING"
+        :data="mergedPreviewTree"
+        :hasOperationColumn="false"
+        :showCheckBox="false"
+      >
+      </loadCaseTable>
+    </div>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import Dialog from '@/components/common/dialog/index.vue';
+import simulationPlan from '@/views/index/approvalPreview/components/simulationPlan.vue';
+import { systemQueryApproveInstanceApi } from '@/api/system/systemApprove';
+import loadCaseTable from '@/components/common/treeCaseTable/loadCaseTable.vue';
+import { translateLoadcaseTree } from '@/utils/node';
+
+const emits = defineEmits(['close']);
+const props = defineProps({
+  planInfo: {
+    type: Object,
+    default: () => {},
+  },
+});
+
+const visible = ref(true);
+const cidFlowId = ref<any>('');
+const approvalData = ref<any>({});
+const mergedPreviewTree = ref<any>([]);
+const closeFun = () => {
+  emits('close');
+};
+
+const getApprovalInfo = async () => {
+  const param = {
+    flowId: cidFlowId.value,
+  };
+  try {
+    const res: any = await systemQueryApproveInstanceApi(param);
+    if (res && res.code === 200) {
+      approvalData.value = res.data;
+    }
+  } catch {}
+};
+
+watch(
+  () => props.planInfo,
+  async (newVal) => {
+    if (newVal) {
+      console.log(newVal, 'newVal');
+      cidFlowId.value = newVal?.cidFlowId;
+
+      if (cidFlowId.value) {
+        await getApprovalInfo();
+      } else {
+        mergedPreviewTree.value = translateLoadcaseTree(JSON.parse(newVal.versionContents || '{}'));
+      }
+    }
+  },
+  {
+    immediate: true,
+    deep: true,
+  }
+);
+</script>
+
+<style lang="scss" scoped>
+.detail-page {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/task/projectList/components/taskDialog.vue b/src/views/task/projectList/components/taskDialog.vue
index af28c9f5..5bc592c2 100644
--- a/src/views/task/projectList/components/taskDialog.vue
+++ b/src/views/task/projectList/components/taskDialog.vue
@@ -292,7 +292,7 @@
     v-model="dialogApproveUserVisible"
     :isInitial="isEmptyPool"
     :moduleCode="'SIMULATION_PLAN_APPROVAL'"
-    :show-b-new-version="false"
+    :show-b-new-version="true"
     @confirm="onAddApproveConfirmFun"
     @close="closeApproveFun"
   />