diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue index aa5209d..4996bda 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue @@ -92,7 +92,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value) + window.sessionStorage.setItem('reportOnCredentialsApproval', currentTab.value) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue index aa5209d..4996bda 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue @@ -92,7 +92,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value) + window.sessionStorage.setItem('reportOnCredentialsApproval', currentTab.value) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 4a358d6..d20740f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -94,6 +94,9 @@ // 是否显示当前页,否则跳转第一页 listQuery.value.offset = 1 } + if (listQuery.value.approvalStatus === '') { + listQuery.value.approvalStatus = '0' + } getReportList(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue index aa5209d..4996bda 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue @@ -92,7 +92,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value) + window.sessionStorage.setItem('reportOnCredentialsApproval', currentTab.value) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 4a358d6..d20740f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -94,6 +94,9 @@ // 是否显示当前页,否则跳转第一页 listQuery.value.offset = 1 } + if (listQuery.value.approvalStatus === '') { + listQuery.value.approvalStatus = '0' + } getReportList(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue index 68de93c..5a76153 100644 --- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue +++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue @@ -105,7 +105,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value) + window.sessionStorage.setItem('maintenceCheckListMenu', newValue) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue index aa5209d..4996bda 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue @@ -92,7 +92,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value) + window.sessionStorage.setItem('reportOnCredentialsApproval', currentTab.value) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 4a358d6..d20740f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -94,6 +94,9 @@ // 是否显示当前页,否则跳转第一页 listQuery.value.offset = 1 } + if (listQuery.value.approvalStatus === '') { + listQuery.value.approvalStatus = '0' + } getReportList(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue index 68de93c..5a76153 100644 --- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue +++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue @@ -105,7 +105,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value) + window.sessionStorage.setItem('maintenceCheckListMenu', newValue) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue index 2897c5c..a7b8437 100644 --- a/src/views/device/deviceMaintenance/maintenanceList.vue +++ b/src/views/device/deviceMaintenance/maintenanceList.vue @@ -98,7 +98,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value) + window.sessionStorage.setItem('maintenceListMenu', newValue) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue index aa5209d..4996bda 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue @@ -92,7 +92,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value) + window.sessionStorage.setItem('reportOnCredentialsApproval', currentTab.value) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 4a358d6..d20740f 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -94,6 +94,9 @@ // 是否显示当前页,否则跳转第一页 listQuery.value.offset = 1 } + if (listQuery.value.approvalStatus === '') { + listQuery.value.approvalStatus = '0' + } getReportList(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue index 68de93c..5a76153 100644 --- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue +++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue @@ -105,7 +105,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value) + window.sessionStorage.setItem('maintenceCheckListMenu', newValue) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue index 2897c5c..a7b8437 100644 --- a/src/views/device/deviceMaintenance/maintenanceList.vue +++ b/src/views/device/deviceMaintenance/maintenanceList.vue @@ -98,7 +98,7 @@ watch(currentTab, (newValue) => { currentApprovalStatus.value = approvalStatusReserveMap.value[newValue] - window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value) + window.sessionStorage.setItem('maintenceListMenu', newValue) currentButtons.value = buttonsSet[newValue] }, { deep: true }) diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue index 2bbe185..f1ed8f2 100644 --- a/src/views/device/standingBook/fixedAssets.vue +++ b/src/views/device/standingBook/fixedAssets.vue @@ -279,8 +279,8 @@