Flow/inspect-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://114.55.171.231:3000/lxd/inspect-front

Browse Source 
# Conflicts:
#	src/views/summary/reprot-print/report-print.vue
This commit is contained in:
lichuanyang 2025-03-14 18:45:18 +08:00
commit ec9c23465e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/Department-entry/Medical-examination-vehicle.vue
View File

@ -89,10 +89,6 @@
<div class="report-content" v-if="selectedPatient"> <div class="report-content" v-if="selectedPatient">
<!-- 基本信息 --> <!-- 基本信息 -->
<div class="basic-info"> <div class="basic-info">
<div class="photo-box">
<img v-if="reportData.headPicUrl" :src="reportData.headPicUrl" alt="头像" class="photo"/>
<div v-else class="no-photo">个人照片</div>
</div>
<div class="info-grid"> <div class="info-grid">
<div class="info-row"> <div class="info-row">
<div class="info-item"> <div class="info-item">
@ -107,7 +103,6 @@
<label>姓名：</label> <label>姓名：</label>
<span>{{ reportData.pname }}</span> <span>{{ reportData.pname }}</span>
</div> </div>
</div> </div>
<div class="info-row"> <div class="info-row">
<div class="info-item"> <div class="info-item">
@ -1060,7 +1055,7 @@ const handleSync = async () => {
return null return null
}), }),
// 一般检查报告请求 // 一般检查报告请求
PatientApi.GetApiYbjcInfo(medicalSn, '15262719621023461x')//测试一般检查 PatientApi.GetApiYbjcInfo(medicalSn, selectedPatient.value?.cardId)//测试一般检查
.catch(error => { .catch(error => {
console.warn('获取一般检查报告失败:', error) console.warn('获取一般检查报告失败:', error)
return null return null
@ -1865,7 +1860,7 @@ border-left-color: #409EFF;
.basic-info { .basic-info {
display: flex; display: flex;
gap: 20px; gap: 20px;
padding: 20px; padding: 10px;
background: #F8F9FA; background: #F8F9FA;
border-radius: 4px; border-radius: 4px;
} }
@ -1979,10 +1974,10 @@ flex: 1;
} }
.result-table { .result-table {
margin: 20px 0; margin: 2px 0;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
border-radius: 4px; border-radius: 4px;
height: 520px; /* 固定高度，与Charge.vue保持一致 */ height: 366px; /* 固定高度，与Charge.vue保持一致 */
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #fff; background: #fff;
@ -2507,6 +2502,7 @@ cursor: not-allowed;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
padding: 3px;
} }
.tabs-container { .tabs-container {

5
src/views/summary/reprot-print/report-print.vue
View File

@ -156,6 +156,11 @@ const handleQuery = () => {
queryParams.pageNo = 1 queryParams.pageNo = 1
getList() getList()
} }
<<<<<<< HEAD
=======
/** 添加/修改操作 */
const formRef = ref()
>>>>>>> bf92e612362b10f9fc040f7c99a393b750708a39
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {