diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts index db4e425..f16cb2c 100644 --- a/src/api/system/dept/index.ts +++ b/src/api/system/dept/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { DeptForm, DeptQuery, DeptVO } from './types'; +import {DeptForm, DeptQuery, DeptTreeVO, DeptVO} from './types'; // 查询部门列表 export const listDept = (query?: DeptQuery) => { @@ -39,7 +39,7 @@ export const getDept = (deptId: string | number): AxiosPromise => { }; // 查询部门下拉树结构 -export const treeselect = (): AxiosPromise => { +export const treeselect = (): AxiosPromise => { return request({ url: '/system/dept/treeselect', method: 'get' diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d52af78..72b1655 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -583,8 +583,8 @@ function submitFileForm() { const initTreeData = async () => { // 判断部门的数据是否存在,存在不获取,不存在则获取 if (deptOptions.value === undefined) { - const { data } = await treeselect(); - deptOptions.value = data; + const row = await treeselect(); + deptOptions.value = row.data; } }; diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index e565a21..d3f84d8 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -267,6 +267,7 @@ import { listDefinition, deleteDefinition, active, importDef, import { CategoryTreeVO } from '@/api/workflow/category/types'; import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types'; import { UploadRequestOptions } from 'element-plus'; +import {TreeOptionProps} from "element-plus/es/components/tree/src/tree.type"; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -535,7 +536,7 @@ const handleSubmit = async () => { }; //复制 const handleCopyDef = async (row: FlowDefinitionVo) => { - ElMessageBox.confirm(`是否确认复制【${row.flowCode}】版本为${row.version}】的流程定义!`, '提示', { + ElMessageBox.confirm(`是否确认复制【${row.flowCode}】版本为【${row.version}】的流程定义!`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'