From e5af0daca71f21317b061f174869e6ded2829071 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 09:46:03 +0800
Subject: [PATCH] Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
---
src/views/project/donatebaseinfo/index.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 273d268..61efd61 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -21,7 +21,11 @@
</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'"
@@ -158,7 +162,16 @@
}}
</template>
</el-table-column>
+<<<<<<< HEAD
<el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" width="100"/>
+=======
+ <el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmenthospitalname"
+ />
+ <el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100">
<template slot-scope="scope">
<dict-tag
@@ -345,7 +358,7 @@
{ required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" }
],
treatmenthospitalno: [
- { required: true, message: "璇烽�夋嫨棣栬瘖鍖婚櫌", trigger: "blur" }
+ { required: true, message: "璇烽�夋嫨涓婃姤鍖婚櫌", trigger: "blur" }
],
bloodtype: [
{ required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
--
Gitblit v1.9.3