abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复一些问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-12-16 18:07:49 +08:00
parent aa1bceeafb
commit 85e5d7aec6
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/system/dept/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request'; import request from '@/utils/request';
import { AxiosPromise } from 'axios'; import { AxiosPromise } from 'axios';
import { DeptForm, DeptQuery, DeptVO } from './types'; import {DeptForm, DeptQuery, DeptTreeVO, DeptVO} from './types';
// 查询部门列表 // 查询部门列表
export const listDept = (query?: DeptQuery) => { export const listDept = (query?: DeptQuery) => {
@ -39,7 +39,7 @@ export const getDept = (deptId: string | number): AxiosPromise<DeptVO> => {
}; };
// 查询部门下拉树结构 // 查询部门下拉树结构
export const treeselect = (): AxiosPromise<DeptVO[]> => { export const treeselect = (): AxiosPromise<DeptTreeVO[]> => {
return request({ return request({
url: '/system/dept/treeselect', url: '/system/dept/treeselect',
method: 'get' method: 'get'

4
src/views/system/user/index.vue
View File

@ -583,8 +583,8 @@ function submitFileForm() {
const initTreeData = async () => { const initTreeData = async () => {
// 判断部门的数据是否存在，存在不获取，不存在则获取 // 判断部门的数据是否存在，存在不获取，不存在则获取
if (deptOptions.value === undefined) { if (deptOptions.value === undefined) {
const { data } = await treeselect(); const row = await treeselect();
deptOptions.value = data; deptOptions.value = row.data;
} }
}; };

3
src/views/workflow/processDefinition/index.vue
View File

@ -267,6 +267,7 @@ import { listDefinition, deleteDefinition, active, importDef,
import { CategoryTreeVO } from '@/api/workflow/category/types'; import { CategoryTreeVO } from '@/api/workflow/category/types';
import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types'; import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types';
import { UploadRequestOptions } from 'element-plus'; import { UploadRequestOptions } from 'element-plus';
import {TreeOptionProps} from "element-plus/es/components/tree/src/tree.type";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -535,7 +536,7 @@ const handleSubmit = async () => {
}; };
//复制 //复制
const handleCopyDef = async (row: FlowDefinitionVo) => { const handleCopyDef = async (row: FlowDefinitionVo) => {
ElMessageBox.confirm(`是否确认复制【${row.flowCode}】版本为${row.version}】的流程定义！`, '提示', { ElMessageBox.confirm(`是否确认复制【${row.flowCode}】版本为【${row.version}】的流程定义！`, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'