Compare commits

..

No commits in common. 'fea69da8eda61eea43aad147441f04424ac9e689' and '125f6f28ad72e070f8c04227b71a8d6bca4500f9' have entirely different histories.

  1. 5
      src/api/system/user/index.ts
  2. 1
      src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue
  3. 3
      src/views/Clue/Pool/Comp/DialogClue.vue
  4. 14
      src/views/Clue/Pool/index.vue

@ -79,8 +79,3 @@ export const getSimpleUserList = (): Promise<UserVO[]> => {
export const getAllUserList = (): Promise<UserVO[]> => { export const getAllUserList = (): Promise<UserVO[]> => {
return request.get({ url: '/admin-api/system/user/no/permission/list-all-simple' }) 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' })
}

@ -37,7 +37,6 @@
<script setup name="DialogBatchChangeFollow"> <script setup name="DialogBatchChangeFollow">
import { batchUpdateFollowUser } from '@/api/clue' import { batchUpdateFollowUser } from '@/api/clue'
const message = useMessage() //
const props = defineProps({ const props = defineProps({
userOptions: { userOptions: {
type: Array type: Array

@ -169,8 +169,7 @@ const formSchema = computed(() => {
newSchema.forEach((it) => { newSchema.forEach((it) => {
if (it.field == 'consultTime') { if (it.field == 'consultTime') {
it.componentProps['disabled-date'] = dateAfterToday 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') { if (it.field == 'convertPeople') {
it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname })) it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))

@ -188,7 +188,7 @@
<DialogFollow ref="followRef" @success="getTableList" /> <DialogFollow ref="followRef" @success="getTableList" />
<DialogBatchChangeFollow <DialogBatchChangeFollow
ref="batchChangeFollowDialog" ref="batchChangeFollowDialog"
:userOptions="allStatusUserOptions" :userOptions="userOptions"
@success="getTableList" @success="getTableList"
/> />
</div> </div>
@ -203,11 +203,7 @@ import DialogSuccess from './Comp/DialogSuccess.vue'
import DialogFollow from './Comp/DialogFollow.vue' import DialogFollow from './Comp/DialogFollow.vue'
import ClueMap from './Comp/ClueMap.vue' import ClueMap from './Comp/ClueMap.vue'
import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue' import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue'
import { import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
getSimpleUserList as getUserOption,
getAllUserList,
getAllUserListWithHire
} from '@/api/system/user'
import { removeNullField } from '@/utils' import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
@ -234,10 +230,8 @@ async function getCurdSchemas() {
try { try {
const data = await getSimpleFieldList() const data = await getSimpleFieldList()
data.forEach((elem) => { data.forEach((elem) => {
if (['followUser', 'convertPeople'].includes(elem.field)) { if (['followUser', 'convertPeople', 'firstFollowUser'].includes(elem.field)) {
elem.search.options = userOptions.value elem.search.options = userOptions.value
} else if (['firstFollowUser'].includes(elem.field)) {
elem.search.options = allStatusUserOptions.value
} }
}) })
allSchemas.value = useCrudSchemas(data).allSchemas allSchemas.value = useCrudSchemas(data).allSchemas
@ -393,12 +387,10 @@ function handleGain(id) {
const userOptions = ref([]) const userOptions = ref([])
const allUserOptions = ref([]) const allUserOptions = ref([])
const allStatusUserOptions = ref([])
onMounted(async () => { onMounted(async () => {
userOptions.value = await getUserOption() userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserList() allUserOptions.value = await getAllUserList()
allStatusUserOptions.value = await getAllUserListWithHire()
getCurdSchemas() getCurdSchemas()
}) })
</script> </script>

Loading…
Cancel
Save