From f3c1de043cfad9b7d1b97bb99bf731bb5295689a Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Wed, 17 Jan 2024 10:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=20=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

仓库联系人 联系电话 搜索联动
---
 .../src/views/heli/warehouse/WarehouseForm.vue   | 16 +++++++++++++++-
 .../src/views/heli/warehouse/index.vue           | 11 ++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index 8d9a07ab..fabfb8eb 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -10,7 +10,7 @@
       <el-form-item label="联系人" prop="contact">
         <!-- <el-input v-model="formData.contact" placeholder="请输入联系人" class="!w-500px" /> -->
         <el-select v-model="formData.contact" placeholder="请输入联系人" :remote-method="remoteUserSearch" remote-show-suffix
-          remote clearable reserve-keyword filterable :loading="userSelectLoading" class="!w-500px">
+          remote clearable reserve-keyword filterable :loading="userSelectLoading" class="!w-500px" @change="handleContact">
           <el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname"
             :value="item.id" />
         </el-select>
@@ -36,6 +36,7 @@
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as WarehouseApi from '@/api/heli/warehouse'
 import * as UserApi from "@/api/system/user";
+import { fromPairs } from 'lodash-es';
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -69,11 +70,22 @@ const remoteUserSearch = (query: string) => {
       userSelectList.value = userList.value.filter((item) => {
         return item.nickname.toLowerCase().includes(query.toLowerCase()) || item.username.toLowerCase().includes(query.toLowerCase())
       })
+     
     }, 200)
   } else {
     userSelectList.value = userList.value
   }
 }
+/** 搜索按钮操作 */
+const handleContact = (uid) => {
+  
+  var mobileUser = userList.value.find((item) => {
+        return item.id === uid
+      })
+
+  formData.value.telephone = mobileUser?.mobile
+
+}
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -86,6 +98,8 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await WarehouseApi.getWarehouse(id)
+
+      formData.value.contact = Number(formData.value.contact)
     } finally {
       formLoading.value = false
     }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue
index 5c91296c..36c8becf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue
@@ -42,7 +42,11 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <el-table-column label="仓库编号" align="center" prop="whNo" />
       <el-table-column label="仓库名称" align="center" prop="whName" />
-      <el-table-column label="负责人" align="center" prop="contact" />
+      <el-table-column label="负责人" align="center" prop="contact" >
+        <template #default="scope">
+          {{ userList.find((user) => user.id == scope.row.contact)?.nickname }}
+        </template>
+      </el-table-column>
       <el-table-column label="负责人电话" align="center" prop="telephone" />
       <el-table-column label="状态" align="center" prop="whStatus">
         <template #default="scope">
@@ -77,6 +81,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as WarehouseApi from '@/api/heli/warehouse'
 import WarehouseForm from './WarehouseForm.vue'
+import * as UserApi from "@/api/system/user";
 
 defineOptions({ name: 'Warehouse' })
 
@@ -95,6 +100,7 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 查询列表 */
 const getList = async () => {
@@ -156,6 +162,9 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
+
+  userList.value = await UserApi.getSimpleUserList()
+
   await getList()
 })
 </script>