From 149d11d312213b215a5d134fa8eaf809d6e85179 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 27 May 2024 16:44:58 +0800 Subject: [PATCH] feat: update bug --- src/pages/mes/workScheduling/callMaterial.vue | 2 +- .../mes/workScheduling/workScheduling.vue | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/pages/mes/workScheduling/callMaterial.vue b/src/pages/mes/workScheduling/callMaterial.vue index aed1668..5eccce3 100644 --- a/src/pages/mes/workScheduling/callMaterial.vue +++ b/src/pages/mes/workScheduling/callMaterial.vue @@ -59,7 +59,7 @@ const status = ref('loadmore') //是否显示没有更多了 const workingNodeStr = ref('') const planMasterCodeStr = ref('') const schedulingCodeStr = ref('') -const planCountStr = ref() +const planCountStr = ref(1) const workroomCodeStr = ref('') const list = ref([]) diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue index dd49b39..6f6bb20 100644 --- a/src/pages/mes/workScheduling/workScheduling.vue +++ b/src/pages/mes/workScheduling/workScheduling.vue @@ -209,25 +209,6 @@ status: '', flag: null }) - - async function getViewList() { - if (status.value == 'nomore') return - status.value = 'loading' - proxy.$modal.loading('加载中') - await workSchedulingListApi.getWorkSchedulingPDAPage(params.value).then((res) => { - proxy.$modal.closeLoading() - if (res.data.list.length > 0) { - list.value = list.value.concat(res.data.list) - params.value.pageNo++ - status.value = 'loadmore' - } else { - status.value = 'nomore' - } - }).catch(() => { - proxy.$modal.closeLoading() - }) - falg.value = 'view' - } function getFormattedDate(date) { @@ -253,6 +234,25 @@ }) + + async function getViewList() { + if (status.value == 'nomore') return + status.value = 'loading' + proxy.$modal.loading('加载中') + await workSchedulingListApi.getWorkSchedulingPDAPage(params.value).then((res) => { + proxy.$modal.closeLoading() + if (res.data.list.length > 0) { + list.value = list.value.concat(res.data.list) + params.value.pageNo++ + status.value = 'loadmore' + } else { + status.value = 'nomore' + } + }).catch(() => { + proxy.$modal.closeLoading() + }) + falg.value = 'view' + } function getTabsList() { console.log(tabParams.value) @@ -329,7 +329,7 @@ getViewList() } - if (falg.value == 'call') { + if (falg.value == 'request') { status.value = 'loading' getRequestList() } @@ -411,7 +411,7 @@ tabParams.value.status = '1'; break; case 4: - falg.value == 'call' + falg.value == 'request' list.value = []; status.value = 'loading'; tabParams.value.status = '0';