merge

src/views/competenceCenter/condition/components/taskPool.vue

@@ -381,10 +381,13 @@ const openAddApproveUserFun = () => {
     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) {

src/views/competenceCenter/knowledge/index.vue

@@ -55,6 +55,12 @@
             <template #fileSize="{ row }">
               {{ formatFileSize(row.fileSize) }}
             </template>
+            <template #approvalStatus="{ row,column }">
+              <el-button type="primary" link @click="openProcessFun(row)"> {{ KNOWLEDGE_APPROVE_STATUS.O[row[column.field]] }}</el-button>
+            </template>
+            <template #approveType="{ row,column }">
+              <el-button type="primary" link @click="openProcessFun(row)"> {{ KNOWLEDGE_APPROVE_TYPE.O[row[column.field]] }}</el-button>
+            </template>
             <template #tableActions="{ row }">
               <div class="gl-table-actions" v-if="row.dataType ===2" >
                 <el-link type="primary" @click="previewFileFun(row)">{{ $t('知识库.预览') }}</el-link>
@@ -67,6 +73,7 @@
         </template>
       </FileTree>
     </div>
+    <ApprovalProcess v-model="processVisible" :flowId="currentRow?.cidFlowId"/>
     <knowledgeDetailModal v-model="visible" :detail="currentRow" :folder="currentFolder" tableName="SIMULATION_KNOWLEDGE" @ok="onOkFun" />
     <folderModal
       v-model="folderModalVisible"
@@ -93,6 +100,10 @@ import TableSearch from '@/components/common/table/tableSearch.vue';
 import { cloneDeep } from 'lodash-es';
 import { DIR_TYPE } from '@/utils/enum/data.ts';
 import ApproveList from '@/components/common/approveList/index.vue';
+import { useDict } from '@/utils/useDict';
+import ApprovalProcess from '@/components/common/approvalProcess/index.vue';
+
+const { KNOWLEDGE_APPROVE_STATUS, KNOWLEDGE_APPROVE_TYPE } = useDict('KNOWLEDGE_APPROVE_STATUS', 'KNOWLEDGE_APPROVE_TYPE' );
 
 type Data = RenderContentContext['data']
 const fileTreeRef = ref<any>();
@@ -313,6 +324,12 @@ watchEffect(() => {
     apiName.value = null;
   }
 });
+
+const processVisible = ref(false);
+const openProcessFun = (row: any) => {
+  currentRow.value = row;
+  processVisible.value = true;
+};
 </script>
 
 <style lang="scss" scoped>