添加楼层搜索

src/main.ts

@@ -51,7 +51,7 @@ import { Flex } from 'ant-design-vue'
 import 'ant-design-vue/dist/reset.css'
 import fetchPlugin from './config/axios/fetch';
 //版本号
-export const MAIN_VERSION = '4.3.6'
+export const MAIN_VERSION = '4.3.7'
 
 // 创建实例
 const setupAll = async () => {

src/views/elderly/elder/elder-file/index.vue

@@ -13,6 +13,17 @@
       <el-form-item label="长者姓名" prop="elderName">
         <el-input @keyup.enter="handleQuery" v-model="queryParams.elderName" placeholder="请输入长者姓名" class="!w-240px" />
       </el-form-item>
+      <el-form-item label="楼栋">
+        <el-select v-model="queryParams.buildId" placeholder="选择楼栋" style="width: 180px" @change="handleBuildChange">
+          <el-option v-for="(item,index) in buildList" :key="index" :label="item.buildName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="楼层">
+        <el-select  v-model="queryParams.floorId" placeholder="选择楼层" style="width: 180px" >
+          <el-option v-for="(item,index) in floorList" :key="index" :label="item.floorName" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="入住状态" prop="inStatus">
         <el-select v-model="queryParams.inStatus" placeholder="请选择" class="!w-240px">
           <el-option
@@ -144,6 +155,8 @@ import Import from '@/components/ImportFile/index.vue'
 import download from '@/utils/download'
 import {importCard} from '@/utils/outBedCard'
 import {getElderHealthRecordById} from "@/api/elderly/elder/health-record";
+import {getBuildList} from "@/api/system/badManage";
+import {ref} from "vue";
 defineOptions({ name: 'ElderFile' })
 const userStore = useUserStore()
 const message = useMessage()
@@ -156,6 +169,8 @@ const queryParams = reactive({
   order: '',
   pageNo: 1,
   pageSize: 10,
+  buildId: '',
+  floorId: '',
   elderName: undefined,
   inStatus: '1',
   bedId: undefined,
@@ -192,6 +207,8 @@ const handleQuery = async () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  queryParams.buildId = ''
+  queryParams.floorId = ''
   queryFormRef.value.resetFields()
   handleQuery()
 }
@@ -343,8 +360,24 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
+
+const buildList = ref([])
+const floorList = ref([])
+const handleBuildChange = (buildId: any) => {
+  const selectedBuild = buildList.value.find((item: any) => item.id === buildId)
+  if (selectedBuild) {
+    floorList.value = selectedBuild.floorList || []
+
+  }
+}
+
 /** 初始化 **/
-onMounted(() => {
+onMounted(async () => {
   getList()
+  try {
+    buildList.value = await getBuildList({tenantIds: queryParams.tenantIds[0]})
+  } catch (e)
+  {}
+
 })
 </script>

src/views/elderly/elder/outward-registration/index.vue

@@ -18,7 +18,17 @@
           clearable
         />
       </el-form-item>
+      <el-form-item label="楼栋">
+        <el-select v-model="queryParams.buildId" placeholder="选择楼栋" style="width: 180px" @change="handleBuildChange">
+          <el-option v-for="(item,index) in buildList" :key="index" :label="item.buildName" :value="item.id" />
+        </el-select>
+      </el-form-item>
 
+      <el-form-item label="楼层">
+        <el-select  v-model="queryParams.floorId" placeholder="选择楼层" style="width: 180px" >
+          <el-option v-for="(item,index) in floorList" :key="index" :label="item.floorName" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否返院" prop="isUpdated">
         <el-select v-model="queryParams.isUpdated" placeholder="请选择" class="!w-240px" clearable>
           <el-option
@@ -147,6 +157,8 @@ import {
 import { useUserStore } from '@/store/modules/user'
 import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
 import download from "@/utils/download";
+import {getBuildList} from "@/api/system/badManage";
+import {ref} from "vue";
 defineOptions({ name: 'OutwardRegistration' })
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -161,6 +173,8 @@ let queryParams = reactive({
   pageSize: 10,
   elderName: '',
   isUpdated: '',
+  buildId: '',
+  floorId: '',
   queryTime: [],
   tenantIds: userStore.orgTenantId
 })
@@ -199,6 +213,8 @@ const resetQuery = () => {
   queryParams.elderName = ''
   queryParams.queryTime = []
   queryParams.isUpdated = ''
+  queryParams.buildId = ''
+  queryParams.floorId = ''
   queryFormRef.value.resetFields()
   handleQuery()
 }
@@ -257,10 +273,29 @@ const cancelDelete = async (id: number) => {
   } catch {}
 }
 
+
+const buildList = ref([])
+const floorList = ref([])
+const handleBuildChange = (buildId: any) => {
+  const selectedBuild = buildList.value.find((item: any) => item.id === buildId)
+  if (selectedBuild) {
+    floorList.value = selectedBuild.floorList || []
+
+  }
+}
+
+
 /** 初始化 **/
-onMounted(() => {
+onMounted(async () => {
   getList()
   getOutboundRefundConfigListFun()
+
+  try {
+    buildList.value = await getBuildList({tenantIds: queryParams.tenantIds[0]})
+  } catch (e)
+  {}
+
+
 })
 
 // 表头格式