diff --git a/screen-vue/src/views/screen/Erp/components/ChartV10.vue b/screen-vue/src/views/screen/Erp/components/ChartV10.vue index f0fbf98..3c4ffa0 100644 --- a/screen-vue/src/views/screen/Erp/components/ChartV10.vue +++ b/screen-vue/src/views/screen/Erp/components/ChartV10.vue @@ -1,80 +1,53 @@ \ No newline at end of file diff --git a/screen-vue/src/views/screen/Erp/components/ChartV11.vue b/screen-vue/src/views/screen/Erp/components/ChartV11.vue index f0fbf98..0b784c8 100644 --- a/screen-vue/src/views/screen/Erp/components/ChartV11.vue +++ b/screen-vue/src/views/screen/Erp/components/ChartV11.vue @@ -1,80 +1,53 @@ \ No newline at end of file diff --git a/screen-vue/src/views/screen/Erp/components/detail/indexV01.vue b/screen-vue/src/views/screen/Erp/components/detail/indexV01.vue index da9d091..9867abc 100644 --- a/screen-vue/src/views/screen/Erp/components/detail/indexV01.vue +++ b/screen-vue/src/views/screen/Erp/components/detail/indexV01.vue @@ -54,43 +54,47 @@ 重置 - - - - - - - - - - - - - +
+
+ + 加载中... +
+ + + + + + + + + + + +
{ async function getTranTypes(){ try { - const params = { - categoryType: searchForm.transactionType, - } - const res = await getErpCategoryList(params); - tranTypes.value = res || []; + const params = { + categoryType: searchForm.transactionType, + } + const res = await getErpCategoryList(params); + tranTypes.value = res || []; } catch (error) { console.error('获取数据失败:', error); tranTypes.value = []; @@ -176,11 +180,12 @@ async function getTranTypes(){ } async function getList() { + loading.value = true; try { const reqParmas = { ... searchForm, - pageNum: currentPage.value, // 当前页 - pageSize: pageSize.value, // 每页条数 + pageNum: currentPage.value, + pageSize: pageSize.value, accountId: props.accountData.rawData?.accountId || '', } const res = await getErpTransactionFlowList(reqParmas); @@ -189,6 +194,8 @@ async function getList() { } catch (error) { console.error('获取数据失败:', error); tableData.value = []; + } finally { + loading.value = false; } } @@ -299,13 +306,56 @@ onMounted(async () => { gap: 10px; } -.data-table { +.table-container { flex: 1; + width: 100%; overflow: auto; position: relative; z-index: 10001; } +.custom-loading { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.1) !important; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + z-index: 999; +} + +.loading-icon { + font-size: 24px; + color: #409EFF; + animation: loading-rotate 2s linear infinite; + margin-bottom: 8px; +} + +.loading-text { + font-size: 14px; + color: #b4c7e7; +} + +@keyframes loading-rotate { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +.data-table { + width: 100%; + height: 100%; + position: relative; + z-index: 1; +} + .pagination-wrapper { display: flex; justify-content: flex-end; @@ -378,7 +428,7 @@ onMounted(async () => { :deep(.el-table th) { border: none !important; border-bottom: 1px solid rgba(64, 158, 255, 0.3) !important; - background-color: rgba(10, 30, 60, 0.8) !important; + background-color: transparent !important; color: #a0cfff !important; } :deep(.el-table td) { @@ -430,36 +480,28 @@ onMounted(async () => { } :deep(.el-loading-mask) { - background-color: rgba(10, 30, 60, 0.8) !important; - z-index: 10002; -} -:deep(.el-table__loading-wrapper) { - background-color: transparent !important; -} -:deep(.el-loading-spinner .path) { - stroke: #409EFF !important; -} -:deep(.el-loading-text) { - color: #a0cfff !important; + display: none !important; } .detail-body::-webkit-scrollbar, -:deep(.el-table__body-wrapper)::-webkit-scrollbar { +:deep(.el-table__body-wrapper)::-webkit-scrollbar, +.table-container::-webkit-scrollbar { width: 6px; height: 6px; } -.detail-body::-webkit-scrollbar-track { +.detail-body::-webkit-scrollbar-track, +.table-container::-webkit-scrollbar-track { background: rgba(10, 30, 60, 0.1); border-radius: 3px; } -.detail-body::-webkit-scrollbar-thumb { +.detail-body::-webkit-scrollbar-thumb, +.table-container::-webkit-scrollbar-thumb { background: rgba(64, 158, 255, 0.5); border-radius: 3px; }