Merge branch 'main' of http://192.168.65.198:3000/Front_Team/SPDM

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;

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,
@@ -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();
     }