Commit 301c1db6 authored by liuzhaoh's avatar liuzhaoh

处理闭环模块

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