~yxh/opo-web.git

			@@ -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"

			@@ -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'"

	src/views/business/maintain/index.vue	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/project/donatebaseinfo/index.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史