Commit 301c1db6 authored by liuzhaoh's avatar liuzhaoh

处理闭环模块

parent 115d798e
......@@ -63,6 +63,7 @@
</el-form>
<div class="table-box">
<common-table
ref="pageRef"
:data="tableData"
:columns="tableColumns"
:default-page-size="20"
......@@ -923,11 +924,12 @@ const warnValueFilter = computed(() => {
}
};
});
const pageRef = ref(null);
const onSearch = () => {
currentPage.value = 1;
pageRef.value.setCurrentPage(currentPage.value);
searchData();
};
const onReset = () => {
currentPage.value = 1;
pageSize.value = 20;
......@@ -936,6 +938,7 @@ const onReset = () => {
formInline.value.productionLineId = "";
formInline.value.deviceType = "";
formInline.value.createTime = ["", ""];
pageRef.value.setCurrentPage(currentPage.value);
searchData();
};
......@@ -1287,6 +1290,7 @@ const pageSize = ref(20);
const handlePaginationChange = (pagination) => {
currentPage.value = pagination.currentPage;
pageSize.value = pagination.pageSize;
getTableData()
};
</script>
......
......@@ -63,6 +63,7 @@
</el-form>
<div class="table-box">
<common-table
ref="pageRef"
:data="tableData"
:columns="tableColumns"
:default-page-size="20"
......@@ -961,6 +962,8 @@ const getColor = computed(() => {
});
const onSearch = () => {
currentPage.value = 1;
pageRef.value.setCurrentPage(currentPage.value);
searchData();
};
......@@ -977,6 +980,7 @@ const onReset = () => {
),
moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
];
pageRef.value.setCurrentPage(currentPage.value);
searchData();
};
const personTag = ref([]);
......@@ -1257,10 +1261,9 @@ onMounted(() => {
getDeviceType();
searchData();
});
const pageRef = ref(null);
const currentPage = ref(1);
const pageSize = ref(20);
const handlePaginationChange = (pagination) => {
currentPage.value = pagination.currentPage;
pageSize.value = pagination.pageSize;
......
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