diff --git a/src/views/competenceCenter/condition/components/taskPool.vue b/src/views/competenceCenter/condition/components/taskPool.vue index 013f37a3..cdd4a940 100644 --- a/src/views/competenceCenter/condition/components/taskPool.vue +++ b/src/views/competenceCenter/condition/components/taskPool.vue @@ -381,10 +381,13 @@ const openAddApproveUserFun = () => { ElMessage.warning('不能提交空数据'); return; } - if (!isHaveNotSave()) { - ElMessage.warning('没有修改的数据需要提交审批'); - return; + if (!isEmptyPool.value ) { + if (!isHaveNotSave()) { + ElMessage.warning('没有修改的数据需要提交审批'); + return; + } } + dialogApproveUserVisible.value = true; }; @@ -980,8 +983,24 @@ const onImportPoolOkFun = async (formData: any) => { }; const res: any = await importTaskPoolApi(req); if (res.code === 200) { - ElMessage.success('导入成功'); - refreshPoolFun(); + const newPool = { + tenantId, + poolName: formData.poolName, + }; + currentPoolBrief.value = newPool; + currentPoolBriefVersion.value = null; + poolList.value.unshift(newPool); + versionList.value = []; + isEmptyPool.value = true; + const tree = transformPoolNodesToTree(res.data.nodes); + tableData.value = tree; + extractTableData.value = extractLeafNodesWithParentTypes(res.data.nodes); + const vxeInstance = listTableRef?.value?.loadcaseTableRef?.TreeTableRef?.treeTableRef; + const mergeCells = calcMergeCellsFun(cloneDeep(extractTableData.value)); + nextTick(() => { + vxeInstance.setMergeCells(mergeCells); + // treeTableRef.value?.changeLevel('全部展开'); + }); } // let excelJson = []; // if (res.code === 200) { diff --git a/src/views/competenceCenter/knowledge/index.vue b/src/views/competenceCenter/knowledge/index.vue index f229d1c9..a506d031 100644 --- a/src/views/competenceCenter/knowledge/index.vue +++ b/src/views/competenceCenter/knowledge/index.vue @@ -55,6 +55,12 @@ + + + (); @@ -313,6 +324,12 @@ watchEffect(() => { apiName.value = null; } }); + +const processVisible = ref(false); +const openProcessFun = (row: any) => { + currentRow.value = row; + processVisible.value = true; +};