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

This commit is contained in:
闫晓茹 2024-06-17 11:40:56 +08:00
commit fb5565e193
2 changed files with 5 additions and 7 deletions

View File

@ -70,7 +70,7 @@
</div>
<div ref="table">
<el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column label="患者姓名" align="center" prop="patientName" />
<el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
<el-table-column label="性别" align="center" prop="sex">
@ -81,10 +81,10 @@
</el-table-column>
<el-table-column label="年龄" align="center" prop="age" />
<el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
<el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
<el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
<el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
<el-table-column label="病区名称" align="center" prop="wardName" width='130' />
<el-table-column label="医院" align="center" prop="hospitalAgencyName" />
<el-table-column label="院区" align="center" prop="campusAgencyName" />
<el-table-column label="科室名称" align="center" prop="departmentName" />
<el-table-column label="病区名称" align="center" prop="wardName" />
<el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width='130' />
<el-table-column label="患者来源" align="center" prop="patientSource">
<template slot-scope="scope">

View File

@ -337,8 +337,6 @@ export default {
},
watch: {
name(val) {
console.log(val.length, '00')
this.querydepartmen.departmentName = val
this.Departmentlist();
},