修改用户管理 医生 / 科室 取值

src/components/UserPreview.vue

@@ -21,10 +21,7 @@ const { data, loading } = useRequest(
       <a-descriptions-item label="系统账号">{{ data.userId }}</a-descriptions-item>
       <a-descriptions-item label="角色" :span="2">{{ data.roles?.map(t => t.roleName)?.join(', ') }}
       </a-descriptions-item>
-      <a-descriptions-item label="医院 / 科室" :span="2">
-        <span class="separate" v-if="data.dept?.ancestors">{{ data.dept?.ancestors }}</span>
-        <span class="separate" v-if="data.dept?.deptName && data.dept?.deptName !== data.dept?.ancestors">{{ data.dept?.deptName }}</span>
-      </a-descriptions-item>
+      <a-descriptions-item label="医院 / 科室" :span="2">{{ data.dept?.deptFullPathName }}</a-descriptions-item>
       <a-descriptions-item label="工号">{{ data.jobnumber }}</a-descriptions-item>
       <a-descriptions-item label="姓名">{{ data.nickName }}</a-descriptions-item>
       <a-descriptions-item label="手机号码">{{ data.phonenumber }}</a-descriptions-item>

src/pages/index/patient/room@default.vue

@@ -257,7 +257,7 @@ const { height } = useElementSize(patientCardRef);
             健康档案
           </a-button>
         </div>
-        <div class="flex-auto overflow-scroll" style="background-color: #f1f1f1;">
+        <div class="flex-auto overflow-auto" style="background-color: #f1f1f1;">
           <a-empty v-if="!reportsLoading && !reports.length" />
           <RecycleScroller v-else ref="scroller" class="record-scroller" key-field="id"
                            :items="reports" :item-size="40"

src/pages/index/system/user.vue

@@ -84,13 +84,7 @@ const gridOptions = reactive<VxeGridProps<UserModel>>({
     { type: 'seq', width: 70, fixed: 'left' },
     { field: 'userName', title: '系统账号' },
     { field: 'nickName', title: '姓名' },
-    {
-      field: 'dept', title: '医院 / 科室',
-      formatter: ({ cellValue, row }) => [
-        row.dept?.ancestors,
-        row.dept?.deptName !== row.dept?.ancestors ? row.dept?.deptName : '',
-      ].filter(Boolean).join(' / '),
-    },
+    { field: 'dept.deptFullPathName', title: '医院 / 科室' },
     { field: 'jobnumber', title: '工号' },
     { field: 'phonenumber', title: '手机号码' },
     {

src/themes/index.scss

@@ -14,3 +14,6 @@
 }
 
 @import url("./fix.scss");
+#app {
+  overflow: hidden;
+}