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..6fb79cef 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,7 +11,7 @@
-
+
@@ -145,8 +145,14 @@ const getTree = async () => {
dept.children = handleTree(data)
deptTree.value.push(dept)
}
+//接收职工传递的数据
const handleSelectedUser = (newValue: any) => {
console.log('接收对应的数据:', newValue)
formData.value.leaderUserId = newValue.id
}
+//接收车间传递的数据
+const handleSelectedWorkshop = (newValue: any) => {
+ console.log('接收对应的数据:', newValue)
+ formData.value.workshopId = newValue.id
+}
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..7fc4136e 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
@@ -20,6 +20,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,8 +37,9 @@ onMounted(async () => {
}
try {
const data = await WorkshopApi.getWorkshopPage(queryParams)
- console.log(data.list)
workshopList.value = data.list
+ console.log( workshopList.value);
+
// 设置初始值,如果需要的话
remoteMethod('')
} catch (error) {
@@ -57,5 +60,9 @@ const remoteMethod = (query: any) => {
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)
+}