Commit 31cb1e39 by crushh

Merge branch 'feature/九月迭代' into dev

parents af20edf6 28883051
......@@ -79,7 +79,7 @@
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
</div>
</div>
<multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog" :showTip="true"> </multiple-del>
<multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog" :showTip="true" :showDeleteAll="true"> </multiple-del>
</div>
</template>
<script>
......
......@@ -84,7 +84,7 @@
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
</div>
</div>
<multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog" :showTip="true" :showDeleteAll="true"> </multiple-del>
<multiple-del :showDialog="showDialog" :detailFlag="false" @hideDialog="hideDialog" :showTip="true"> </multiple-del>
</div>
</template>
<script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment