From 3eceda186bc2fe136d1402926552eb85a3335b07 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 09:46:54 +0800
Subject: [PATCH] 维护
---
src/views/project/donatebaseinfo/index.vue | 4 ----
src/views/business/maintain/index.vue | 16 +++-------------
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index a88934a..6c4f9e4 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -105,30 +105,20 @@
@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="inpatientno"
width="120"
- />
+ />
<el-table-column
label="浣忛櫌鍙�"
align="center"
@@ -170,7 +160,7 @@
show-overflow-tooltip
/>
<<<<<<< HEAD
-
+
=======
<el-table-column
label="棣栬瘖鍖荤枟鏈烘瀯"
@@ -205,7 +195,7 @@
prop="itemName"
width="120"
show-overflow-tooltip
- /> -->
+ /> -->
<el-table-column
label="棣栨缁存姢鏃堕棿"
align="center"
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 61efd61..6442bd2 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -21,11 +21,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
-<<<<<<< HEAD
<el-form-item label="鎶ュ憡鍖婚櫌" prop="treatmenthospitalname">
-=======
- <el-form-item label="涓婃姤鍖婚櫌" prop="treatmenthospitalname">
->>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<org-selecter
ref="orgSelecter"
:org-type="'3'"
--
Gitblit v1.9.3