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/business/appear/index.vue | 65 +++---
src/views/business/assess/index.vue | 43 ++--
src/views/business/transfer/index.vue | 42 ++--
src/views/business/allocation/index.vue | 70 ++++--
src/views/project/donatebaseinfo/index.vue | 73 ++++---
src/views/business/ethicalReview/index.vue | 82 ++++---
src/views/business/affirm/index.vue | 62 +++---
src/views/business/decide/index.vue | 26 +-
src/views/business/maintain/index.vue | 110 ++++++++--
9 files changed, 339 insertions(+), 234 deletions(-)
diff --git a/src/views/business/affirm/index.vue b/src/views/business/affirm/index.vue
index 60e980e..a7ede48 100644
--- a/src/views/business/affirm/index.vue
+++ b/src/views/business/affirm/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="100px"
>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="donorName">
+ <el-form-item label="濮撳悕" prop="donorName">
<el-input
v-model="queryParams.donorName"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -17,19 +17,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ尰鐤楁満鏋�" prop="hospitalName">
+ <el-form-item label="涓婃姤鍖婚櫌" prop="hospitalName">
<el-input
v-model="queryParams.hospitalName"
placeholder="璇疯緭鍏ュ尰鐤楁満鏋�"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="涓氬姟浜哄憳" prop="assignee">
- <el-input
- v-model="queryParams.assignee"
- placeholder="璇疯緭鍏ヤ笟鍔′汉鍛�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
@@ -56,6 +47,15 @@
end-placeholder="缁撴潫鏃ユ湡"
value-format="yyyy-MM-dd"
style="width: 240px"
+ />
+ </el-form-item>
+ <el-form-item label="鍗忚皟鍛�" prop="assignee">
+ <el-input
+ v-model="queryParams.assignee"
+ placeholder="璇疯緭鍏ュ崗璋冨憳"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
@@ -112,13 +112,13 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
- label="浣忛櫌鍙�"
+ label="妗堜緥缂栧彿"
align="center"
prop="inpatientno"
width="120"
/>
<el-table-column
- label="娼滃湪鎹愮尞鑰呭鍚�"
+ label="濮撳悕"
align="center"
prop="name"
width="120"
@@ -139,13 +139,6 @@
min-width="180"
show-overflow-tooltip
/>
- <el-table-column
- label="鎵�鍦ㄥ尰鐤楁満鏋�"
- align="center"
- prop="treatmenthospitalname"
- width="150"
- show-overflow-tooltip
- />
<!-- <el-table-column
label="纭鐘舵��"
align="center"
@@ -158,14 +151,6 @@
</el-tag>
</template>
</el-table-column> -->
-
- <el-table-column
- label="瀹跺睘鎰忚"
- align="center"
- prop="relativeRemark"
- width="150"
- show-overflow-tooltip
- />
<el-table-column
label="纭鏃堕棿"
align="center"
@@ -180,11 +165,13 @@
}}</span>
</template>
</el-table-column>
+
<el-table-column
- label="涓氬姟浜哄憳"
+ label="瀹跺睘鎰忚"
align="center"
- prop="responsibleusername"
- width="100"
+ prop="relativeRemark"
+ width="150"
+ show-overflow-tooltip
/>
<el-table-column
label="鍗忚皟鍛�1"
@@ -199,6 +186,19 @@
width="100"
/>
<el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmenthospitalname"
+ width="150"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="涓婃姤浜哄憳"
+ align="center"
+ prop="responsibleusername"
+ width="100"
+ />
+ <el-table-column
label="鎿嶄綔"
align="center"
width="120"
diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index f3e9d22..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,34 +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"
- /> -->
-
- <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
- <el-table-column
- label="浣忛櫌鍙�"
- align="center"
- prop="inpatientno"
- width="120"
+<<<<<<< HEAD
/>
- <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="琛�鍨�"
+ label="鎹愮尞鑰呯紪鍙�"
align="center"
- prop="bloodtype"
- width="80"
+ prop="donorno"
+ width="120"
/>
<el-table-column
label="璇佷欢鍙风爜"
@@ -145,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"
@@ -158,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"
diff --git a/src/views/business/appear/index.vue b/src/views/business/appear/index.vue
index e4a0e19..39581d2 100644
--- a/src/views/business/appear/index.vue
+++ b/src/views/business/appear/index.vue
@@ -8,15 +8,7 @@
:inline="true"
class="demo-form-inline"
>
- <el-form-item label="妗堜緥缂栧彿" prop="caseNo">
- <el-input
- v-model="queryParams.caseNo"
- placeholder="璇疯緭鍏ユ渚嬬紪鍙�"
- clearable
- style="width: 200px"
- />
- </el-form-item>
- <el-form-item label="鎮ｈ�呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
@@ -24,7 +16,15 @@
style="width: 200px"
/>
</el-form-item>
- <el-form-item label="妗堜緥鐘舵��" prop="reportStatus">
+ <el-form-item label="涓婃姤鍖婚櫌" prop="caseNo">
+ <el-input
+ v-model="queryParams.caseNo"
+ placeholder="璇疯緭鍏ヤ笂鎶ユ渚嬬紪鍙�"
+ clearable
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="涓婃姤鐘舵��" prop="reportStatus">
<el-select
v-model="queryParams.reportStatus"
placeholder="璇烽�夋嫨鐘舵��"
@@ -74,21 +74,23 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
+
<el-table-column
- label="妗堜緥缂栧彿"
+ label="缂栧彿"
align="center"
prop="caseNo"
width="150"
fixed
/>
<el-table-column
- label="涓婃姤鏃堕棿"
+ label="濮撳悕"
align="center"
- prop="reporttime"
- width="160"
+ prop="name"
+ width="100"
+ fixed
/>
<el-table-column
- label="鐘舵��"
+ label="涓婃姤鐘舵��"
align="center"
prop="reportStatus"
width="100"
@@ -99,19 +101,13 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="杞繍鐘舵��" align="center" width="100">
+ <el-table-column label="杞繍" align="center" width="100">
<template #default="scope">
<el-tag :type="getTransportStatusTag(scope.row)">
{{ getTransportStatusText(scope.row) }}
</el-tag>
</template>
</el-table-column>
- <el-table-column
- label="鎮ｈ�呭鍚�"
- align="center"
- prop="name"
- width="100"
- />
<el-table-column label="鎬у埆" align="center" prop="sex" width="80">
<template #default="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
@@ -127,13 +123,6 @@
</template>
</el-table-column>
<el-table-column
- label="GCS璇勫垎"
- align="center"
- prop="gcsScore"
- width="80"
- show-overflow-tooltip
- />
- <el-table-column
label="鐤剧梾璇婃柇"
align="center"
prop="diagnosisname"
@@ -141,13 +130,25 @@
show-overflow-tooltip
/>
<el-table-column
- label="娌荤枟鍖婚櫌"
+ label="GCS璇勫垎"
+ align="center"
+ prop="gcsScore"
+ width="80"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="涓婃姤鍖婚櫌"
align="center"
prop="treatmenthospitalname"
width="150"
/>
-
- <el-table-column label="鎿嶄綔" align="center" fixed="right" width="350">
+ <el-table-column
+ label="涓婃姤鏃堕棿"
+ align="center"
+ prop="reporttime"
+ width="160"
+ />
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="300">
<template #default="scope">
<el-button
size="mini"
diff --git a/src/views/business/assess/index.vue b/src/views/business/assess/index.vue
index 90487e2..bbe6a36 100644
--- a/src/views/business/assess/index.vue
+++ b/src/views/business/assess/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="100px"
>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -26,7 +26,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="涓氬姟浜哄憳" prop="coordinatorName">
+ <el-form-item label="鍗忚皟鍛�" prop="coordinatorName">
<el-input
v-model="queryParams.coordinatorName"
placeholder="璇疯緭鍏ヤ笟鍔′汉鍛�"
@@ -35,10 +35,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="璇勪及鐘舵��" prop="assessState">
+ <el-form-item label="璇勪及缁撴灉" prop="assessState">
<el-select
v-model="queryParams.assessState"
- placeholder="璇烽�夋嫨璇勪及鐘舵��"
+ placeholder="璇烽�夋嫨璇勪及缁撴灉"
clearable
style="width: 200px"
>
@@ -48,7 +48,7 @@
<el-option label="宸插叧闂�" value="4" />
</el-select>
</el-form-item>
- <el-form-item label="鐢宠鏃堕棿" prop="applyTimeRange">
+ <el-form-item label="棣栨璇勪及鏃堕棿" prop="applyTimeRange">
<el-date-picker
v-model="queryParams.applyTimeRange"
type="daterange"
@@ -59,7 +59,7 @@
style="width: 240px"
/>
</el-form-item>
- <el-form-item label="璇勪及鏃堕棿" prop="assessTimeRange">
+ <el-form-item label="鏈�鏂拌瘎浼版椂闂�" prop="assessTimeRange">
<el-date-picker
v-model="queryParams.assessTimeRange"
type="daterange"
@@ -130,7 +130,7 @@
width="120"
/>
<el-table-column
- label="鎹愮尞鑰呭鍚�"
+ label="濮撳悕"
align="center"
prop="name"
width="120"
@@ -151,6 +151,7 @@
min-width="180"
show-overflow-tooltip
/>
+ <!--
<el-table-column
label="鎵�鍦ㄥ尰鐤楁満鏋�"
align="center"
@@ -168,6 +169,20 @@
<span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
+ -->
+
+ <el-table-column
+ label="璇勪及鐘舵��"
+ align="center"
+ prop="assessState"
+ width="100"
+ >
+ <template slot-scope="scope">
+ <el-tag :type="statusFilter(scope.row.assessState)">
+ {{ statusTextFilter(scope.row.assessState) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column
label="璇勪及鏃堕棿"
align="center"
@@ -183,19 +198,7 @@
</template>
</el-table-column>
<el-table-column
- label="璇勪及鐘舵��"
- align="center"
- prop="assessState"
- width="100"
- >
- <template slot-scope="scope">
- <el-tag :type="statusFilter(scope.row.assessState)">
- {{ statusTextFilter(scope.row.assessState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- label="涓氬姟浜哄憳"
+ label="鍗忚皟鍛�"
align="center"
prop="coordinatorName"
width="100"
diff --git a/src/views/business/decide/index.vue b/src/views/business/decide/index.vue
index 1430372..8440ea5 100644
--- a/src/views/business/decide/index.vue
+++ b/src/views/business/decide/index.vue
@@ -95,12 +95,22 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <!--
+ <el-table-column
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="120"
/>
+ <el-table-column
+ label="娌荤枟鍖婚櫌"
+ align="center"
+ prop="treatmenthospitalname"
+ width="180"
+ show-overflow-tooltip
+ />
+ -->
+
<el-table-column
label="浣忛櫌鍙�"
align="center"
@@ -108,7 +118,7 @@
width="120"
/>
<el-table-column
- label="鎹愮尞鑰呭鍚�"
+ label="濮撳悕"
align="center"
prop="name"
width="120"
@@ -122,13 +132,7 @@
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="80" />
- <el-table-column
- label="娌荤枟鍖婚櫌"
- align="center"
- prop="treatmenthospitalname"
- width="180"
- show-overflow-tooltip
- />
+
<el-table-column
label="鐤剧梾璇婃柇"
align="center"
@@ -175,7 +179,7 @@
width="120"
/>
<el-table-column
- label="璁板綍鐘舵��"
+ label="鍒ゅ畾鐘舵��"
align="center"
prop="recordstate"
width="100"
@@ -187,7 +191,7 @@
</template>
</el-table-column>
<el-table-column
- label="鍒涘缓鏃堕棿"
+ label="鍒ゅ畾鏃堕棿"
align="center"
prop="createTime"
width="160"
diff --git a/src/views/business/ethicalReview/index.vue b/src/views/business/ethicalReview/index.vue
index bcf7e58..887e77f 100644
--- a/src/views/business/ethicalReview/index.vue
+++ b/src/views/business/ethicalReview/index.vue
@@ -116,6 +116,30 @@
>
<el-table-column type="selection" width="55" align="center" />
<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="caseNo"
@@ -128,27 +152,6 @@
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"
@@ -160,6 +163,22 @@
prop="idcardno"
width="180"
/>
+
+ <el-table-column
+ label="鍖荤枟鏈烘瀯"
+ align="center"
+ prop="treatmenthospitalname"
+ min-width="150"
+ show-overflow-tooltip
+ />
+
+ <el-table-column
+ label="涓撳濮撳悕"
+ align="center"
+ prop="expertName"
+ width="100"
+ />
+ -->
<el-table-column
label="鐤剧梾璇婃柇"
align="center"
@@ -168,14 +187,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="鍖荤枟鏈烘瀯"
- align="center"
- prop="treatmenthospitalname"
- min-width="150"
- show-overflow-tooltip
- />
- <el-table-column
- label="浼︾悊鐘舵��"
+ label="瀹℃煡鐘舵��"
align="center"
prop="status"
width="100"
@@ -188,7 +200,7 @@
</template>
</el-table-column>
<el-table-column
- label="涓撳缁撹"
+ label="瀹℃煡缁撹"
align="center"
prop="expertConclusion"
width="120"
@@ -201,20 +213,14 @@
</template>
</el-table-column>
<el-table-column
- label="涓撳鎰忚"
+ label="瀹℃煡鎰忚"
align="center"
prop="expertOpinion"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
- label="涓撳濮撳悕"
- align="center"
- prop="expertName"
- width="100"
- />
- <el-table-column
- label="缁撹鏃堕棿"
+ label="瀹℃煡鏃堕棿"
align="center"
prop="expertTime"
width="160"
diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index 61124e9..a88934a 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="100px"
>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -17,25 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ尰鐤楁満鏋�" prop="treatmenthospitalname">
- <el-input
- v-model="queryParams.treatmenthospitalname"
- placeholder="璇疯緭鍏ュ尰鐤楁満鏋�"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍗忚皟鍛�" prop="coordinatorName">
- <el-input
- v-model="queryParams.coordinatorName"
- placeholder="璇疯緭鍏ュ崗璋冨憳濮撳悕"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎮ｈ�呯姸鎬�" prop="recordstate">
+ <el-form-item label="妗堜緥杩涘害" prop="recordstate">
<el-select
v-model="queryParams.recordstate"
placeholder="璇烽�夋嫨璁板綍鐘舵��"
@@ -49,10 +31,10 @@
<el-option label="鏈畬鎴愭崘鐚�" value="5" />
</el-select>
</el-form-item>
- <el-form-item label="骞撮緞鑼冨洿" prop="ageRange">
+ <el-form-item label="骞撮緞" prop="ageRange">
<el-input
v-model="queryParams.startAge"
- placeholder="鏈�灏忓勾榫�"
+ placeholder="0"
clearable
style="width: 95px"
@keyup.enter.native="handleQuery"
@@ -60,13 +42,13 @@
<span style="margin: 0 5px">-</span>
<el-input
v-model="queryParams.endAge"
- placeholder="鏈�澶у勾榫�"
+ placeholder="70"
clearable
style="width: 95px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="妗ｆ褰曞叆鏃堕棿" prop="recordTimeRange">
+ <el-form-item label="鍏ラ櫌鏃堕棿" prop="recordTimeRange">
<el-date-picker
v-model="queryParams.recordTimeRange"
type="daterange"
@@ -75,6 +57,16 @@
end-placeholder="缁撴潫鏃ユ湡"
value-format="yyyy-MM-dd"
style="width: 240px"
+ />
+ </el-form-item>
+
+ <el-form-item label="鍗忚皟鍛�" prop="coordinatorName">
+ <el-input
+ v-model="queryParams.coordinatorName"
+ placeholder="璇疯緭鍏ュ崗璋冨憳濮撳悕"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
@@ -113,20 +105,38 @@
@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"
prop="inpatientno"
width="120"
/>
<el-table-column
- label="娼滃湪鎹愮尞鑰呭鍚�"
+ label="濮撳悕"
align="center"
prop="name"
width="120"
@@ -159,6 +169,9 @@
min-width="180"
show-overflow-tooltip
/>
+<<<<<<< HEAD
+
+=======
<el-table-column
label="棣栬瘖鍖荤枟鏈烘瀯"
align="center"
@@ -185,13 +198,28 @@
prop="coordinatorName"
width="100"
/>
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<!-- <el-table-column
label="缁存姢椤圭洰"
align="center"
prop="itemName"
width="120"
show-overflow-tooltip
- /> -->
+ /> -->
+ <el-table-column
+ label="棣栨缁存姢鏃堕棿"
+ align="center"
+ prop="updateTime"
+ width="140"
+ >
+ <template slot-scope="scope">
+ <span>{{
+ scope.row.updateTime
+ ? parseTime(scope.row.updateTime)
+ : "-"
+ }}</span>
+ </template>
+ </el-table-column>
<el-table-column
label="鏈�鏂扮淮鎶ゆ椂闂�"
align="center"
@@ -211,6 +239,36 @@
align="center"
prop="updateBy"
width="120"
+ /><el-table-column
+ label="鍏ラ櫌鏃堕棿"
+ align="center"
+ prop="treatmenthospitalname"
+ width="150"
+ show-overflow-tooltip
+ /><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"
/>
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/business/transfer/index.vue b/src/views/business/transfer/index.vue
index 3e7c2f1..fa88fe4 100644
--- a/src/views/business/transfer/index.vue
+++ b/src/views/business/transfer/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="80px"
>
- <el-form-item label="妗堜緥缂栧彿" prop="caseNo">
+ <el-form-item label="涓婃姤鍖婚櫌" prop="caseNo">
<el-input
v-model="queryParams.caseNo"
placeholder="璇疯緭鍏ユ渚嬬紪鍙�"
@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呭鍚�" prop="patName">
+ <el-form-item label="濮撳悕" prop="patName">
<el-input
v-model="queryParams.patName"
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
@@ -41,7 +41,7 @@
<el-option label="鏆傚瓨" :value="5" />
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="杞繍鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -150,23 +150,11 @@
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
<el-table-column
- label="妗堜緥缂栧彿"
+ label="缂栧彿"
align="center"
prop="caseNo"
width="140"
/>
- <el-table-column
- label="杞繍鐘舵��"
- align="center"
- prop="transitStatus"
- width="100"
- >
- <template slot-scope="scope">
- <el-tag :type="getStatusTagType(scope.row.transitStatus)">
- {{ getStatusText(scope.row.transitStatus) }}
- </el-tag>
- </template>
- </el-table-column>
<el-table-column label="鎮ｈ�呬俊鎭�" align="center" width="260">
<template slot-scope="scope">
<div class="donor-info">
@@ -189,11 +177,17 @@
show-overflow-tooltip
/>
<el-table-column
- label="娌荤枟鍖婚櫌"
+ label="杞繍鐘舵��"
align="center"
- prop="treatmentHospitalName"
- width="150"
- />
+ prop="transitStatus"
+ width="100"
+ >
+ <template slot-scope="scope">
+ <el-tag :type="getStatusTagType(scope.row.transitStatus)">
+ {{ getStatusText(scope.row.transitStatus) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column
label="璁″垝杞繍鏃堕棿"
align="center"
@@ -201,13 +195,19 @@
width="160"
/>
<el-table-column
- label="璐熻矗鍗忚皟鍛�"
+ label="鍗忚皟鍛�"
align="center"
prop="contactPerson"
width="100"
/>
<el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmentHospitalName"
+ width="150"
+ />
+ <el-table-column
label="鍒涘缓鏃堕棿"
align="center"
prop="createTime"
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 7e54f17..61efd61 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -10,7 +10,7 @@
>
<el-row :gutter="8">
<el-col :span="5">
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ鍚�"
@@ -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'"
@@ -30,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="9">
- <el-form-item label="涓婃姤鏃堕棿">
+ <el-form-item label="鎶ュ憡鏃堕棿">
<el-date-picker
style="width: 100%"
v-model="selecttime"
@@ -89,6 +93,7 @@
border
:default-sort="{ prop: 'donatetime', order: 'descending' }"
>
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
<el-table-column
label="妗堜緥鏃堕棿"
align="center"
@@ -100,12 +105,40 @@
</template>
</el-table-column>
<el-table-column
+ label="鎹愮尞杩涘害"
+ align="center"
+ prop="workflow"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <div v-if="!scope.row.terminationCase">
+ <dict-tag
+ :options="dict.type.sys_donornode"
+ :value="scope.row.workflow"
+ />
+ </div>
+ <div v-else><el-button type="danger" plain>浠诲姟缁堟</el-button></div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎹愮尞绫诲埆"
+ align="center"
+ prop="donationcategory"
+ width="150"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_DonationCategory"
+ :value="scope.row.donationcategory"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="200"
/>
- <el-table-column label="鎹愮尞鑰呭鍚�" align="center" prop="name" width="100" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
<dict-tag
@@ -129,12 +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
@@ -144,40 +181,16 @@
</template>
</el-table-column>
<el-table-column
- label="鎹愮尞绫诲埆"
+ label="鎶ュ憡鍖婚櫌"
align="center"
- prop="donationcategory"
- width="150"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationCategory"
- :value="scope.row.donationcategory"
- />
- </template>
- </el-table-column>
+ prop="treatmenthospitalname"
+ />
<el-table-column
label="鎶ュ憡浜�"
align="center"
prop="reportername"
width="100"
/>
- <el-table-column
- label="鎹愮尞杩涘害"
- align="center"
- prop="workflow"
- width="120"
- >
- <template slot-scope="scope">
- <div v-if="!scope.row.terminationCase">
- <dict-tag
- :options="dict.type.sys_donornode"
- :value="scope.row.workflow"
- />
- </div>
- <div v-else><el-button type="danger" plain>浠诲姟缁堟</el-button></div>
- </template>
- </el-table-column>
<el-table-column
label="鎿嶄綔"
width="190"
--
Gitblit v1.9.3