fujunling
2023-06-16 7d2abb005f5dde19542a2d21c142680098236901
解决冲突
已修改1个文件
4 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Crud/Crud.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -36,11 +36,7 @@
                                :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>