From fc0c6e262229072268112578702c3f1e41da71a9 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 19 Jan 2024 11:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=20=E4=BC=A0=E9=80=92=E9=80=89=E4=B8=AD=E7=9A=84json?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/hlvuestyle/indexFrom.vue              | 8 +++++++-
 .../src/views/heli/hlvuestyle/workshopSelect.vue         | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

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 @@
         <BranchSelect v-model="formData.parentId" />
       </el-form-item>
       <el-form-item label="车间" prop="workshopId">
-        <WorkshopSelect v-model="formData.workshopId" />
+        <WorkshopSelect v-model="formData.workshopId" @update:newValue="handleSelectedWorkshop" />
       </el-form-item>
       <el-form-item label="班组" prop="classesId">
         <ClassesSelect v-model="formData.classesId" />
@@ -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
+}
 </script>
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<WorkshopApi.WorkshopVO[]>([]) // 用户列表
 const workshopSelectList = ref<WorkshopApi.WorkshopVO[]>([])
 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)
+}
 
 </script>