From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/Crud/Crud.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index 2f90814..b9cf277 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -36,7 +36,11 @@
:props="transferProps" @save="handelTransferSave"></integration-transfer>
</el-button>
<el-button size="small" type="primary" plain @click="findvisible=true">鏌ヨ
+<<<<<<< HEAD
+ <advanced-query :visible.sync="findvisible" :options="options"></advanced-query>
+=======
<advanced-query :visible.sync="findvisible" :options="this.options"></advanced-query>
+>>>>>>> 859a64b36d107b147f44eccd0c0a76471c5e49ea
</el-button>
<el-button size="small" type="primary" plain>鐩镐技椤规煡璇�</el-button>
<el-button size="small" type="primary" plain style="margin-left: 1px;margin-top:10px">鍒锋柊</el-button>
@@ -147,7 +151,7 @@
editShow: "",
editAttr:"",
data: [],
- options:{},
+ options:[],
option: {
column: []
},
--
Gitblit v1.9.3