Merge remote-tracking branch 'origin/develop' into develop

openhis-ui-vue3/src/views/appoinmentmanage/clinicRoom/index.vue

@@ -44,11 +44,17 @@
       class="clinic-room-table"
     >
       <el-table-column prop="id" label="ID" width="180" align="center" />
+      <el-table-column label="卫生机构" width="200" align="center" show-overflow-tooltip>
+  <template #default="scope">
+    <!-- 用==忽略类型匹配，string的"3"和number的3就能匹配上 -->
+    {{ tenantOptions.find(item => item.id == scope.row.orgName)?.tenantName || '未知机构' }}
+  </template>
+</el-table-column>
       <el-table-column prop="roomName" label="诊室名称" width="160" align="center" show-overflow-tooltip />
       <el-table-column prop="department" label="科室名称" width="160" align="center" show-overflow-tooltip />
       <el-table-column prop="building" label="诊室楼号" width="120" align="center" show-overflow-tooltip />
-      <el-table-column prop="floor" label="楼层" width="90" align="center" />
+      <el-table-column prop="floor" label="诊室楼层" width="90" align="center" />
-      <el-table-column prop="roomNo" label="房间号" width="120" align="center" />
+      <el-table-column prop="roomNo" label="诊室房间号" width="120" align="center" />
       <el-table-column prop="isDisabled" label="停用" width="90" align="center">
         <template #default="scope">
           <el-tag :type="scope.row.isDisabled ? 'danger' : 'success'">
@@ -64,6 +70,11 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="操作人" width="120" align="center" show-overflow-tooltip>
+  <template #default="scope">
+    {{ scope.row.updateBy || scope.row.createBy || '系统默认' }}
+  </template>
+</el-table-column>
       <el-table-column label="操作" width="250" align="center" fixed="right">
         <template #default="scope">
           <el-button
@@ -233,8 +244,8 @@ const total = ref(0)
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  roomName: null,
+  roomName: '',
-  orgName: null
+  orgName: ''
 })
 // 科室选项
 const departmentOptions = ref([])
@@ -256,7 +267,7 @@ const form = reactive({
   isDisabled: false,
   remarks: '',
   void: false,
-  orgName: null
+  orgName: ''
 })
 // 表单验证规则
 const rules = {
@@ -506,7 +517,7 @@ function resetForm() {
   form.isDisabled = false
   form.remarks = ''
   form.void = false
-  form.orgName = null
+  form.orgName = ''
   proxy.resetForm('formRef')
 }