Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue

@@ -24,9 +24,7 @@
         />
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-        <UserSelect
+       <UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" />
-          v-model="formData.leaderUserId"
-        />
       </el-form-item>
       <!--      <el-form-item label="联系电话" prop="phone">
         <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
@@ -196,9 +194,8 @@ const resetForm = () => {
 //   deptTree.value.push(dept)
 // }
 
-// const onValueNameChange = (newValue: number | null) => {
+const handleSelectedUser = (newValue: any) => {
-//   formData.value.leaderUserId = newValue
+  console.log('接收对应的数据:', newValue)
-//   console.log(formData.value.leaderUserId)
+  formData.value.leaderUserId = newValue.id
-// }
+}
-
 </script>

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue

@@ -13,11 +13,11 @@
       <el-form-item label="车间" prop="workshopId">
         <WorkshopSelect v-model="formData.workshopId" />
       </el-form-item>
-       <el-form-item label="班组" prop="classesId">
+      <el-form-item label="班组" prop="classesId">
         <ClassesSelect v-model="formData.classesId" />
       </el-form-item>
       <el-form-item label="职工" prop="leaderUserId">
-        <UserSelect v-model="formData.leaderUserId" />
+        <UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" />
       </el-form-item>
       <el-form-item label="客户" prop="clientId">
         <ClientSelect v-model="formData.clientId" />
@@ -28,7 +28,7 @@
       <el-form-item label="材质" prop="compositionId">
         <CompositionSelect v-model="formData.compositionId" />
       </el-form-item>
-       <el-form-item label="物料" prop="materialId">
+      <el-form-item label="物料" prop="materialId">
         <MaterialSelect v-model="formData.materialId" />
       </el-form-item>
     </el-form>
@@ -53,7 +53,7 @@ import CompositionSelect from '../hlvuestyle/compositionSelect.vue'
 import WorkshopSelect from '../hlvuestyle/workshopSelect.vue'
 import MaterialSelect from '../hlvuestyle/materialSelect.vue'
 import ClassesSelect from '../hlvuestyle/classesSelect.vue'
-
+import { defineComponent } from 'vue'
 defineOptions({ name: 'SystemDeptForm' })
 
 const { t } = useI18n() // 国际化
@@ -72,7 +72,7 @@ const formData: any = ref({
   compositionId: undefined,
   workshopId: undefined,
   materialId: undefined,
-  classesId:undefined,
+  classesId: undefined,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive<FormRules>({
@@ -124,15 +124,15 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-  parentId: undefined,
+    parentId: undefined,
-  leaderUserId: undefined,
+    leaderUserId: undefined,
-  clientId: undefined,
+    clientId: undefined,
-  supplierId: undefined,
+    supplierId: undefined,
-  compositionId: undefined,
+    compositionId: undefined,
-  workshopId: undefined,
+    workshopId: undefined,
-  materialId: undefined,
+    materialId: undefined,
-  classesId:undefined,
+    classesId: undefined,
-  status: CommonStatusEnum.ENABLE
+    status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
 }
@@ -145,4 +145,8 @@ const getTree = async () => {
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }
+const handleSelectedUser = (newValue: any) => {
+  console.log('接收对应的数据:', newValue)
+  formData.value.leaderUserId = newValue.id
+}
 </script>

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, toRefs } from 'vue'
+import { ref, onMounted, toRefs,computed } from 'vue'
 import * as UserApi from '@/api/system/user'
 
 interface UserVO {
@@ -37,7 +37,9 @@ const props = defineProps({
   }
 })
 const valueName: any = ref() //选中的值
-// const emit = defineEmits(['update:valueName'])
+const valueNameObject:any = ref(); // 存储选中的完整用户对象
+
+const emit = defineEmits(['update:newValue'])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const userSelectList = ref<UserApi.UserVO[]>([])
 const userSelectLoading = ref(false)
@@ -64,21 +66,23 @@ const remoteMethod = (query: any) => {
     userSelectLoading.value = true
     setTimeout(() => {
       userSelectLoading.value = false
-      userSelectList.value = userList.value.filter(
+      userSelectList.value = userList.value
+        .filter(
           (item) =>
             item.nickname.toLowerCase().includes(query.toLowerCase()) ||
             item.username.toLowerCase().includes(query.toLowerCase())
-        ).slice(0, 10)//只显示前10个
+        )
-        
+        .slice(0, 10) //只显示前10个
     }, 200)
   } else {
-    userSelectList.value = userList.value.slice(0, 10)//只显示前10个
+    userSelectList.value = userList.value.slice(0, 10) //只显示前10个
   }
 }
 
-// const onSelectChange = (newValue: number | null) => {
+const onSelectChange = (newValue: any) => {
-//   // console.log(newValue)
+  valueNameObject.value = userList.value.find(user => user.id === newValue); // 更新选中的完整用户对象
-//   emit('update:valueName', newValue)
+  emit('update:newValue', valueNameObject.value)
-//   valueName.value = newValue
+}
-// }
+
+
 </script>