diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index 304e3bc..8b6924e 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -20,7 +20,7 @@ export interface UserQuery extends PageQuery { status?: string; deptId?: string | number; roleId?: string | number; - userIds?: string; + userIds?: string | number | (string | number)[] | undefined; } /** diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts index f331975..e3c9abf 100644 --- a/src/api/workflow/task/types.ts +++ b/src/api/workflow/task/types.ts @@ -30,18 +30,20 @@ export interface FlowTaskVO { nodeRatio: string | number; version?: string; applyNode?: boolean; - buttonList?: buttonList[]; + buttonList?: ButtonList[]; + copyList?: FlowCopyVo[]; + varList?: Map; businessCode: string; businessTitle: string; } -export interface buttonList { +export interface ButtonList { code: string; show: boolean; } -export interface VariableVo { - key: string; - value: string; +export interface FlowCopyVo { + userId: string | number; + userName: string; } export interface TaskOperationBo { diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index 2bc8bbb..33f0b60 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -14,7 +14,7 @@ - {{ user.nickName }} + {{ user.userName }} @@ -149,8 +149,7 @@ import { import UserSelect from '@/components/UserSelect'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -import { UserVO } from '@/api/system/user/types'; -import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types'; +import { FlowCopyVo, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types'; const userSelectCopyRef = ref>(); const transferTaskRef = ref>(); @@ -171,9 +170,11 @@ const buttonDisabled = ref(true); //任务id const taskId = ref(''); //抄送人 -const selectCopyUserList = ref([]); +const selectCopyUserList = ref([]); //抄送人id const selectCopyUserIds = ref(undefined); +//自定义节点变量 +const varNodeList = ref>(undefined); //可减签的人员 const deleteUserList = ref([]); //弹窗可选择的人员id @@ -218,6 +219,8 @@ const task = ref({ nodeRatio: undefined, applyNode: false, buttonList: [], + copyList: [], + varList: undefined, businessCode: undefined, businessTitle: undefined }); @@ -259,6 +262,10 @@ const openDialog = async (id?: string) => { task.value.buttonList.forEach((e) => { buttonObj.value[e.code] = e.show; }); + selectCopyUserList.value = task.value.copyList; + selectCopyUserIds.value = task.value.copyList.map((e) => e.userId).join(','); + varNodeList.value = task.value.varList; + console.log('varNodeList', varNodeList.value) buttonDisabled.value = false; try { const data = { @@ -303,7 +310,7 @@ const handleCompleteTask = async () => { selectCopyUserList.value.forEach((e) => { const copyUser = { userId: e.userId, - userName: e.nickName + userName: e.userName }; flowCopyList.push(copyUser); }); @@ -366,14 +373,14 @@ const openUserSelectCopy = () => { userSelectCopyRef.value.open(); }; //确认抄送人员 -const userSelectCopyCallBack = (data: UserVO[]) => { +const userSelectCopyCallBack = (data: FlowCopyVo[]) => { if (data && data.length > 0) { selectCopyUserList.value = data; selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(','); } }; //删除抄送人员 -const handleCopyCloseTag = (user: UserVO) => { +const handleCopyCloseTag = (user: FlowCopyVo) => { const userId = user.userId; // 使用split删除用户 const index = selectCopyUserList.value.findIndex((item) => item.userId === userId); diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue index dec1f96..a78a10a 100644 --- a/src/components/UserSelect/index.vue +++ b/src/components/UserSelect/index.vue @@ -173,7 +173,7 @@ const computedIds = (data) => { } else if (typeof data === 'string') { return data.split(','); } else if (typeof data === 'number') { - return [data]; + return [String(data)]; } else { console.warn(' The data type of data should be array or string or number, but I received other'); return [];