前端最新版本同步

openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue

@@ -7,9 +7,9 @@
             <el-select v-model="queryParams.wardId" @change="changeWardLocationId">
               <el-option
                 v-for="item in initInfoOptions.wardListOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -180,7 +180,7 @@
 <script setup lang="ts">
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, computed } from 'vue'
 import { TransferInDialog, SignEntryDialog } from './index'
-import { getPendingInfo, getBedInfo, getInit, childLocationList } from './api'
+import { getPendingInfo, getBedInfo, getInit, childLocationList, getPractitionerWard } from './api'
 import { formatDate } from '@/utils/index';
 import { init } from '../../../basicmanage/consumablesBinding/components/api';
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -242,10 +242,13 @@ onMounted(() => {
   getInit().then(res => {
     initInfoOptions.value = res.data
     priorityOptions.value = res.data.priorityOptions || []
-    queryParams.value.wardId = res.data.wardListOptions[0].value
-    changeWardLocationId(res.data.wardListOptions[0].value)
     getList()
   })
+  getPractitionerWard().then(res => {
+    queryParams.value.wardId = res[0].id
+    initInfoOptions.value.wardListOptions = res
+    changeWardLocationId(res[0].id)
+  })
 })
 defineExpose({ state })