diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts index b328d7b..8f63da3 100644 --- a/src/components/Form/src/componentMap.ts +++ b/src/components/Form/src/componentMap.ts @@ -83,6 +83,7 @@ import {DatePickerInFilter, CascaderPcaInFilter} from "@/components/InFilter"; import SzSelectUser from '@/components/semri/userComponent/SzUserSelect.vue'; import SzSelectUserByDept from '@/components/semri/userComponent/SzSelectUserByDept.vue'; import SzDeptUserSelect from '@/components/semri/deptUserComponent/SzDeptUserModal.vue'; +import SzSingleDeptUserSelect from '@/components/semri/deptUserComponent/SzSingleDeptUserModal.vue'; const componentMap = new Map(); @@ -184,6 +185,7 @@ componentMap.set('JInputSelect', JInputSelect); componentMap.set('SzSelectUser', SzSelectUser); componentMap.set('SzSelectUserByDept',SzSelectUserByDept) componentMap.set('SzDeptUserSelect', SzDeptUserSelect) +componentMap.set('SzSingleDeptUserSelect', SzSingleDeptUserSelect) export function add(compName: ComponentType, component: Component) { componentMap.set(compName, component); diff --git a/src/components/semri/deptUserComponent/SzSingleDeptUserModal.vue b/src/components/semri/deptUserComponent/SzSingleDeptUserModal.vue new file mode 100644 index 0000000..6d55321 --- /dev/null +++ b/src/components/semri/deptUserComponent/SzSingleDeptUserModal.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/components/semri/singleDeptUserComponent/SingleDeptUserModal.vue b/src/components/semri/singleDeptUserComponent/SingleDeptUserModal.vue index d7ac49f..3349886 100644 --- a/src/components/semri/singleDeptUserComponent/SingleDeptUserModal.vue +++ b/src/components/semri/singleDeptUserComponent/SingleDeptUserModal.vue @@ -32,7 +32,7 @@ :okButtonProps="{ disabled: !tempSelectedUser }" @ok="onSelectConfirm" > - + diff --git a/src/components/semri/singleDeptUserComponent/SzSingleDeptUserSelect.vue b/src/components/semri/singleDeptUserComponent/SzSingleDeptUserSelect.vue index 1c14f0d..36a1bc0 100644 --- a/src/components/semri/singleDeptUserComponent/SzSingleDeptUserSelect.vue +++ b/src/components/semri/singleDeptUserComponent/SzSingleDeptUserSelect.vue @@ -59,12 +59,14 @@ const props = withDefaults( departId?: string; role?: string | number; isSpecial?: number; + checkedUser?: UserItem | null; }>(), { secLevel: 0, departId: '', role: 1, isSpecial: 0, + checkedUser: undefined, } ); @@ -145,6 +147,14 @@ watch( } ); +watch( + () => props.checkedUser, + (user) => { + selectedUser.value = user || null; + }, + { immediate: true } +); + function initData() { const depId = props.departId; if (depId) { diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/TaskRunningList.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/TaskRunningList.vue index 695fcee..a55a1c3 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/TaskRunningList.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/TaskRunningList.vue @@ -18,10 +18,10 @@ - + - +