From 7c39a19b0dc0788e9fa821778f5c18907ffdcb46 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Fri, 19 Jan 2024 12:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=20=E4=BC=A0=E9=80=92=20?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/heli/hlvuestyle/classesSelect.vue | 17 +++++++++++++---- .../src/views/heli/hlvuestyle/indexFrom.vue | 11 ++++++++--- .../src/views/heli/hlvuestyle/userSelect.vue | 2 +- .../views/heli/hlvuestyle/workshopSelect.vue | 18 ++++++++++++------ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue index 3d8bf91f..d2a96f21 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue @@ -15,7 +15,7 @@ @@ -25,6 +25,9 @@ import { ref, onMounted, toRefs } from 'vue' import * as ClassesApi from '@/api/heli/classes' const valueName: any = ref() //选中的值 +const valueNameObject: any = ref() //选中的值 +const emit = defineEmits(['update:newValue']) + const classesList = ref([]) // 用户列表 const classesSelectList = ref([]) const Loading = ref(false) @@ -40,7 +43,6 @@ onMounted(async () => { } try { const data = await ClassesApi.getClassesPage(queryParams) - console.log(data.list) classesList.value = data.list // 设置初始值，如果需要的话 remoteMethod('') @@ -54,12 +56,19 @@ const remoteMethod = (query: any) => { Loading.value = true setTimeout(() => { Loading.value = false - classesSelectList.value = classesList.value - .filter((item) => item.name.toLowerCase().includes(query.toLowerCase())) + classesSelectList.value = classesList.value.filter((item) => + item.code.toLowerCase().includes(query.toLowerCase()) || + item.name.toLowerCase().includes(query.toLowerCase()) + ) .slice(0, 10) //只显示前10个 }, 200) } else { classesSelectList.value = classesList.value.slice(0, 10) } } +const onSelectChange = (newValue: any) => { + valueNameObject.value = classesList.value.find(classes => classes.id === newValue); // 更新选中的完整用户对象 + emit('update:newValue', valueNameObject.value) +} + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue index 6fb79cef..b3b84da1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue @@ -14,7 +14,7 @@ - + @@ -147,12 +147,17 @@ const getTree = async () => { } //接收职工传递的数据 const handleSelectedUser = (newValue: any) => { - console.log('接收对应的数据:', newValue) + console.log('接收职工对应的数据:', newValue) formData.value.leaderUserId = newValue.id } //接收车间传递的数据 const handleSelectedWorkshop = (newValue: any) => { - console.log('接收对应的数据:', newValue) + console.log('接收车间对应的数据:', newValue) formData.value.workshopId = newValue.id } +//接收班组传递的数据 +const handleSelectedClasses = (newValue: any) => { + console.log('接收班组对应的数据:', newValue) + formData.value.classesId = newValue.id +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue index b2ba6bd8..83b0dd0d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue @@ -49,7 +49,7 @@ onMounted(async () => { const userParams = { pageNo: 1, pageSize: 10, - status: '0' // 根据实际情况调整参数 + status: undefined, // 根据实际情况调整参数 } try { const data = await UserApi.getUserPage(userParams) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/workshopSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/workshopSelect.vue index 7fc4136e..4ae38618 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/workshopSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/workshopSelect.vue @@ -12,7 +12,12 @@ :loading="Loading" @change="onSelectChange" > - + @@ -38,8 +43,6 @@ onMounted(async () => { try { const data = await WorkshopApi.getWorkshopPage(queryParams) workshopList.value = data.list - console.log( workshopList.value); - // 设置初始值，如果需要的话 remoteMethod('') } catch (error) { @@ -53,7 +56,11 @@ const remoteMethod = (query: any) => { setTimeout(() => { Loading.value = false workshopSelectList.value = workshopList.value - .filter((item) => item.name.toLowerCase().includes(query.toLowerCase())) + .filter( + (item) => + item.code.toLowerCase().includes(query.toLowerCase()) || + item.name.toLowerCase().includes(query.toLowerCase()) + ) .slice(0, 10) //只显示前10个 }, 200) } else { @@ -61,8 +68,7 @@ const remoteMethod = (query: any) => { } } const onSelectChange = (newValue: any) => { - valueNameObject.value = workshopList.value.find(workshop => workshop.id === newValue); // 更新选中的完整用户对象 + valueNameObject.value = workshopList.value.find((workshop) => workshop.id === newValue) // 更新选中的完整用户对象 emit('update:newValue', valueNameObject.value) } -