bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-10-18 13:29:30 +08:00
parent cf8af1097b da11299618
commit 1c5dd1f5a2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -116,7 +116,8 @@
</el-col> </el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="handleQuery"
v-if="leaseType == 0"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
@ -135,7 +136,8 @@
</el-col> </el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="handleQuery"
v-if="leaseType == 1"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table <el-table