From fef5f45851e350f6753e024bc168cc8bd4598653 Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Tue, 25 Nov 2025 10:57:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/competenceCenter/condition/components/taskPool.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/competenceCenter/condition/components/taskPool.vue b/src/views/competenceCenter/condition/components/taskPool.vue
index 3c7cd8ee..16145d08 100644
--- a/src/views/competenceCenter/condition/components/taskPool.vue
+++ b/src/views/competenceCenter/condition/components/taskPool.vue
@@ -954,6 +954,7 @@ const onImportPoolOkFun = async (formData: any) => {
     isEmptyPool.value = true;
     const tree = transformPoolNodesToTree(res.data.nodes);
     tableData.value = tree;
+    expandAllFun();
     if (currentTableType.value === 'list') {
       mergeListTableColumnsFun();
     }

From 5ff853a4475d6696c140106978bdfc3780901b81 Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Tue, 25 Nov 2025 13:48:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=B7=A5=E5=86=B5=E5=BA=93=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/{addApproveUsers.vue => addApprove.vue}   | 9 ++-------
 .../competenceCenter/condition/components/taskPool.vue   | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename src/views/competenceCenter/condition/components/{addApproveUsers.vue => addApprove.vue} (96%)

diff --git a/src/views/competenceCenter/condition/components/addApproveUsers.vue b/src/views/competenceCenter/condition/components/addApprove.vue
similarity index 96%
rename from src/views/competenceCenter/condition/components/addApproveUsers.vue
rename to src/views/competenceCenter/condition/components/addApprove.vue
index cb10ec9a..70da1906 100644
--- a/src/views/competenceCenter/condition/components/addApproveUsers.vue
+++ b/src/views/competenceCenter/condition/components/addApprove.vue
@@ -111,13 +111,8 @@ const onConfirmFun = async () => {
 };
 const onShowFun = () => {
   resetFun();
-  if (props.isInitial) {
-    form.bNewVersion = true;
-    form.versionType = 1;
-  } else {
-    form.bNewVersion = false;
-    form.versionType = 0;
-  };
+  form.bNewVersion = false;
+  form.versionType = 0;
 };
 const onApproveChangeFun = (data:any) => {
   form.approveTemplateName = data.label;
diff --git a/src/views/competenceCenter/condition/components/taskPool.vue b/src/views/competenceCenter/condition/components/taskPool.vue
index 16145d08..71573c37 100644
--- a/src/views/competenceCenter/condition/components/taskPool.vue
+++ b/src/views/competenceCenter/condition/components/taskPool.vue
@@ -166,11 +166,11 @@
     </div>
   </div>
 
-  <addApproveUser
+  <addApprove
     v-model="dialogApproveUserVisible"
     :isInitial="isEmptyPool"
     @ok="onConfirmFun"
-  ></addApproveUser>
+  ></addApprove>
   <add-pool-modal
     v-model="addPoolModalVisible"
     mode="add"
@@ -193,7 +193,7 @@ import { cloneDeep, groupBy, isEqual, uniqBy } from 'lodash-es';
 import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import loadCaseTable from '@/components/common/treeCaseTable/loadCaseTable.vue';
 import { initProjectDicts, taskPoolDictOptions } from '@/utils/project';
-import addApproveUser from './addApproveUsers.vue';
+import addApprove from './addApprove.vue';
 import {
   transformPoolNodesToTree,
   transformTreeToPoolNodes,