冲突合并
This commit is contained in:
commit
1c5dd1f5a2
|
|
@ -116,7 +116,8 @@
|
|||
</el-col>
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
@queryTable="handleQuery"
|
||||
v-if="leaseType == 0"
|
||||
></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
|
|
@ -135,7 +136,8 @@
|
|||
</el-col>
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
@queryTable="handleQuery"
|
||||
v-if="leaseType == 1"
|
||||
></right-toolbar>
|
||||
</el-row>
|
||||
<el-table
|
||||
|
|
|
|||
Loading…
Reference in New Issue