From 9913ac7ff8670ac1a8815968287fca35f2c8adb9 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 13 三月 2025 16:17:28 +0800
Subject: [PATCH] 1
---
src/views/doctor/check/index.vue | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 71cafef..3b999be 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -682,7 +682,6 @@
</el-form-item>
<el-form-item>
-<<<<<<< HEAD
<el-button
type="primary"
icon="el-icon-search"
@@ -699,13 +698,6 @@
height="430px"
@selection-change="handleSelectionChanges"
>
-=======
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">鎼滅储</el-button>
- </el-form-item>
- </el-form>
- <el-table ref="multipleTable" border :data="deptAdviceList" height="430px"
- @selection-change="handleSelectionChanges">
->>>>>>> 2f0aa78 (1)
<el-table-column type="selection" width="40"> </el-table-column>
<el-table-column prop="title" label="鐥呯鍚嶇О" align="center" width="130px"></el-table-column>
<el-table-column prop="advice" label="寤鸿" align="center" :show-overflow-tooltip="true">
--
Gitblit v1.8.0