From ba4eee2e5ced6aef3e85a7c7b8317817b7ad3cae Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 14 八月 2025 10:05:53 +0800
Subject: [PATCH] Merge branch 'lishui-Smartor' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
src/views/patient/medtechnician/Compositeeditdetails.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/patient/medtechnician/Compositeeditdetails.vue b/src/views/patient/medtechnician/Compositeeditdetails.vue
index 4d55836..0b1e6d5 100644
--- a/src/views/patient/medtechnician/Compositeeditdetails.vue
+++ b/src/views/patient/medtechnician/Compositeeditdetails.vue
@@ -359,15 +359,20 @@
prop="templatename"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
- align="center"
- key="nickName"
- prop="nickName"
- >
- <template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
- </template>
- </el-table-column>
+ label="鎬讳换鍔�/宸查殢璁�"
+ align="center"
+ key="nickName"
+ width="120"
+ prop="nickName"
+ >
+ <template slot-scope="scope">
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column
label="鍒涘缓浜�"
align="center"
@@ -811,7 +816,7 @@
.headline {
font-size: 24px;
height: 40px;
- border-left: 5px solid #5788fe;
+ border-left: 5px solid #5788FE;
padding-left: 5px;
margin-bottom: 10px;
display: flex;
--
Gitblit v1.9.3