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/allocation/index.vue | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index c67a64d..8061001 100644
--- a/src/views/business/allocation/index.vue
+++ b/src/views/business/allocation/index.vue
@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -26,6 +26,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="妗堜緥缂栧彿" prop="caseNo">
<el-input
v-model="queryParams.caseNo"
@@ -35,6 +36,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鍒嗛厤鐘舵��" prop="allocationStatus">
<el-select
v-model="queryParams.allocationStatus"
@@ -109,39 +111,23 @@
@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="鎹愮尞鑰呯紪鍙�"
align="center"
prop="donorno"
width="120"
- />
- <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
- <el-table-column
- label="浣忛櫌鍙�"
- align="center"
- prop="inpatientno"
- width="120"
- />
- <el-table-column label="鎬у埆" align="center" prop="sex" width="80">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
- </template>
- </el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="80" />
- <el-table-column
- label="琛�鍨�"
- align="center"
- prop="bloodtype"
- width="80"
/>
<el-table-column
label="璇佷欢鍙风爜"
@@ -150,12 +136,12 @@
width="180"
/>
<el-table-column
- label="鐤剧梾璇婃柇"
+ label="琛�鍨�"
align="center"
- prop="diagnosisname"
- min-width="180"
- show-overflow-tooltip
+ prop="bloodtype"
+ width="80"
/>
+
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
@@ -163,6 +149,35 @@
min-width="150"
show-overflow-tooltip
/>
+ -->
+=======
+ /> -->
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
+ <el-table-column
+ label="浣忛櫌鍙�"
+ align="center"
+ prop="inpatientno"
+ width="120"
+ />
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="80">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_user_sex"
+ :value="scope.row.sex"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="骞撮緞" align="center" prop="age" width="80" />
+ <el-table-column
+ label="鐤剧梾璇婃柇"
+ align="center"
+ prop="diagnosisname"
+ min-width="180"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍒嗛厤鐘舵��"
align="center"
--
Gitblit v1.9.3