From b745457acd3bb8f40c145df34dce5729463377ab Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 09 五月 2026 18:22:37 +0800
Subject: [PATCH] Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
---
src/views/business/maintain/index.vue | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index 9021261..a88934a 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -105,18 +105,28 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
+<<<<<<< HEAD
<!--
<el-table-column
+=======
+ <!-- <el-table-column
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="120"
+<<<<<<< HEAD
/>
-->
<el-table-column
label="鎹愮尞缂栧彿"
+=======
+ /> -->
+ <el-table-column
+ label="浣忛櫌鍙�"
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
align="center"
- prop="donorno"
+ prop="inpatientno"
width="120"
/>
<el-table-column
@@ -159,7 +169,36 @@
min-width="180"
show-overflow-tooltip
/>
+<<<<<<< HEAD
+=======
+ <el-table-column
+ label="棣栬瘖鍖荤枟鏈烘瀯"
+ align="center"
+ prop="treatmenthospitalname"
+ width="150"
+ show-overflow-tooltip
+ />
+
+ <!-- <el-table-column
+ label="璁板綍鐘舵��"
+ align="center"
+ prop="recordstate"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <el-tag :type="statusFilter(scope.row.recordstate)">
+ {{ statusTextFilter(scope.row.recordstate) }}
+ </el-tag>
+ </template>
+ </el-table-column> -->
+ <el-table-column
+ label="鍗忚皟鍛�"
+ align="center"
+ prop="coordinatorName"
+ width="100"
+ />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<!-- <el-table-column
label="缁存姢椤圭洰"
align="center"
--
Gitblit v1.9.3