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/clientSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
index 8248a4a2..15ddd2ce 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
@@ -12,7 +12,12 @@
:loading="Loading"
@change="onSelectChange"
>
-
+
@@ -21,6 +26,9 @@ import { ref, onMounted, toRefs } from 'vue'
import * as CustomerApi from '@/api/heli/customer'
const valueName: any = ref() //选中的值
+const valueNameObject: any = ref() //选中的值
+const emit = defineEmits(['update:newValue'])
+
const clientList = ref([]) //列表
const clientSelectList = ref([])
const Loading = ref(false)
@@ -51,7 +59,11 @@ const remoteMethod = (query: any) => {
setTimeout(() => {
Loading.value = false
clientSelectList.value = clientList.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 {
@@ -59,4 +71,8 @@ const remoteMethod = (query: any) => {
}
}
+const onSelectChange = (newValue: any) => {
+ valueNameObject.value = clientList.value.find(client => client.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 f577965c..87281963 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
@@ -11,16 +11,16 @@
-
+
-
+
-
+
@@ -145,8 +145,25 @@ const getTree = async () => {
dept.children = handleTree(data)
deptTree.value.push(dept)
}
+//接收职工传递的数据
const handleSelectedUser = (newValue: any) => {
- console.log('接收对应的数据:', newValue)
+ console.log('接收职工对应的数据:', newValue)
formData.value.leaderUserId = newValue.id
}
+//接收车间传递的数据
+const handleSelectedWorkshop = (newValue: any) => {
+ console.log('接收车间对应的数据:', newValue)
+ formData.value.workshopId = newValue.id
+}
+//接收班组传递的数据
+const handleSelectedClasses = (newValue: any) => {
+ console.log('接收班组对应的数据:', newValue)
+ formData.value.classesId = newValue.id
+}
+
+//接收客户传递的数据
+const handleSelectedClient = (newValue: any) => {
+ console.log('接收客户对应的数据:', newValue)
+ formData.value.clientId = 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 6c23e13f..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"
>
-
+
@@ -20,6 +25,8 @@
import { ref, onMounted, toRefs } from 'vue'
import * as WorkshopApi from '@/api/heli/workshop'
const valueName: any = ref() //选中的值
+const valueNameObject: any = ref() //选中的值
+const emit = defineEmits(['update:newValue'])
const workshopList = ref([]) // 用户列表
const workshopSelectList = ref([])
const Loading = ref(false)
@@ -35,7 +42,6 @@ onMounted(async () => {
}
try {
const data = await WorkshopApi.getWorkshopPage(queryParams)
- console.log(data.list)
workshopList.value = data.list
// 设置初始值,如果需要的话
remoteMethod('')
@@ -50,12 +56,19 @@ 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 {
workshopSelectList.value = workshopList.value.slice(0, 10)
}
}
-
+const onSelectChange = (newValue: any) => {
+ valueNameObject.value = workshopList.value.find((workshop) => workshop.id === newValue) // 更新选中的完整用户对象
+ emit('update:newValue', valueNameObject.value)
+}