~yxh/opo-web.git

			@@ -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"
			@@ -44,7 +46,7 @@
			>
			<el-option label="全部" value="" />
			<el-option
			v-for="dict in dict.type.allocation_Status"
			v-for="dict in dict.type.organ_allocation_status"
			:key="dict.value"
			:label="dict.label"
			:value="dict.value"
			@@ -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,17 +136,46 @@
			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"
			prop="treatmenthospitalname"
			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
			@@ -171,7 +186,7 @@
			>
			<template slot-scope="scope">
			<dict-tag
			:options="dict.type.allocation_Status"
			:options="dict.type.organ_allocation_status"
			:value="scope.row.allocationStatus"
			/>
			</template>
			@@ -182,13 +197,6 @@
			prop="allocationTime"
			width="160"
			>
			<template slot-scope="scope">
			<span>{{
			scope.row.allocationTime
			? parseTime(scope.row.allocationTime, "{y}-{m}-{d} {h}:{i}")
			: "-"
			}}</span>
			</template>
			</el-table-column>
			<el-table-column
			label="登记人"