@@ -21,7 +21,7 @@
</el-collapse>
<Empty v-if="materialsData.length < 1" />
</el-scrollbar>
- <Pagination position="right" :page="page" :limit="limit" :total="total" @pagination="materialChange" />
+ <Pagination position="right" v-model:page="page" v-model:limit="limit" v-model:total="total" @pagination="materialChange" />
</div>
</template>
@@ -16,13 +16,7 @@
</el-table>
- <Pagination
- :limit="limit"
- :page="page"
- :total="total"
- position="right"
- @pagination="getPagination"
- />
+ <Pagination position="right" v-model:page="page" v-model:limit="limit" v-model:total="total" @pagination="getPagination" />
<script lang="ts" setup>
@@ -121,7 +121,7 @@
<template #label>
<el-badge
:type="activeName == 'f2' ? 'warning' : 'primary'"
- :value="tabCountData.materials"
+ :value="tabCountData.materials + tabCountData.accessoryMaterials"
>已采物料
</el-badge>