diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index a7b75ba..71f69f4 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -79,3 +79,8 @@ export const getSimpleUserList = (): Promise<UserVO[]> => { export const getAllUserList = (): Promise<UserVO[]> => { return request.get({ url: '/admin-api/system/user/no/permission/list-all-simple' }) } + +// 获取所有包括离职的用户 +export const getAllUserListWithHire = (): Promise<UserVO[]> => { + return request.get({ url: '/admin-api/system/user/no/permission/list-all' }) +} diff --git a/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue b/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue index 0a92812..3363a31 100644 --- a/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue +++ b/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue @@ -37,6 +37,7 @@ <script setup name="DialogBatchChangeFollow"> import { batchUpdateFollowUser } from '@/api/clue' +const message = useMessage() // 消息弹窗 const props = defineProps({ userOptions: { type: Array diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue index 95e2f81..92d8cd2 100644 --- a/src/views/Clue/Pool/Comp/DialogClue.vue +++ b/src/views/Clue/Pool/Comp/DialogClue.vue @@ -169,7 +169,8 @@ const formSchema = computed(() => { newSchema.forEach((it) => { if (it.field == 'consultTime') { it.componentProps['disabled-date'] = dateAfterToday - it.componentProps['disabled'] = formType.value != 'create' + // it.componentProps['disabled'] = formType.value != 'create' + it.componentProps['disabled'] = true } if (it.field == 'convertPeople') { it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname })) diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue index c15172c..fa4289c 100644 --- a/src/views/Clue/Pool/index.vue +++ b/src/views/Clue/Pool/index.vue @@ -188,7 +188,7 @@ <DialogFollow ref="followRef" @success="getTableList" /> <DialogBatchChangeFollow ref="batchChangeFollowDialog" - :userOptions="userOptions" + :userOptions="allStatusUserOptions" @success="getTableList" /> </div> @@ -203,7 +203,11 @@ import DialogSuccess from './Comp/DialogSuccess.vue' import DialogFollow from './Comp/DialogFollow.vue' import ClueMap from './Comp/ClueMap.vue' import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue' -import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user' +import { + getSimpleUserList as getUserOption, + getAllUserList, + getAllUserListWithHire +} from '@/api/system/user' import { removeNullField } from '@/utils' import { formatDate } from '@/utils/formatTime' @@ -230,8 +234,10 @@ async function getCurdSchemas() { try { const data = await getSimpleFieldList() data.forEach((elem) => { - if (['followUser', 'convertPeople', 'firstFollowUser'].includes(elem.field)) { + if (['followUser', 'convertPeople'].includes(elem.field)) { elem.search.options = userOptions.value + } else if (['firstFollowUser'].includes(elem.field)) { + elem.search.options = allStatusUserOptions.value } }) allSchemas.value = useCrudSchemas(data).allSchemas @@ -387,10 +393,12 @@ function handleGain(id) { const userOptions = ref([]) const allUserOptions = ref([]) +const allStatusUserOptions = ref([]) onMounted(async () => { userOptions.value = await getUserOption() allUserOptions.value = await getAllUserList() + allStatusUserOptions.value = await getAllUserListWithHire() getCurdSchemas() }) </script>