From 9e77a7cdc098c429ac935852fe0d97d641d4da62 Mon Sep 17 00:00:00 2001 From: Codex Date: Tue, 13 Oct 2026 09:53:40 +0800 Subject: [PATCH] fix: unblock packaging orders and polish sku details --- static/js/app.js | 115 +++++++++--------- tests/test_packaging_loading_and_sku_modal.py | 37 ++++++ 2 files changed, 94 insertions(+), 58 deletions(-) create mode 100644 tests/test_packaging_loading_and_sku_modal.py diff --git a/static/js/app.js b/static/js/app.js index 534e41f..43171b7 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -19749,6 +19749,10 @@ function loadOrderFollowers() { _orderFollowersPromise = fetch('/api/users/followers').then(function(r){return r.json()}).then(function(res){ if (res.code === 0) domesticFollowers = res.data || []; return domesticFollowers; + }).catch(function() { + // 人员接口异常不能阻塞订单列表；下单人下拉框随后使用空列表降级展示。 + domesticFollowers = []; + return domesticFollowers; }); return _orderFollowersPromise; } @@ -19799,6 +19803,7 @@ window.showSkuInfoModal = function(el, title) { if (d.min_order_qty) fields.push(['最低起订量', d.min_order_qty]); if (d.created_at) fields.push(['创建时间', d.created_at]); var bomCount = (res.data.bom_materials || []).length; + var transitOrders = res.data.orders_in_transit || []; if (bomCount > 0) fields.push(['关联包材', bomCount + ' 种']); // 调试：记录API返回 @@ -19807,51 +19812,51 @@ window.showSkuInfoModal = function(el, title) { console.log('[SKU] ' + code + ' 在途订单: ' + _debugTransit.length + ' 条'); } - // 构建弹窗HTML - var html = '
'; - html += '
'; - html += '

📋 ' + escHtml(code) + '

'; - html += '×'; - html += '
'; - html += ''; - fields.forEach(function(f, idx) { - var k = f[0], v = f[1] !== undefined && f[1] !== null ? String(f[1]) : '-'; - if (idx % 2 === 0) html += ''; - html += ''; - html += ''; - if (idx % 2 === 1) html += ''; + // 构建订单 SKU 信息弹窗：标题、摘要卡片、字段卡片和在途表格分层展示。 + var html = '
'; + html += '
'; + html += '
' + escHtml(title || '订单 SKU 详情') + '

' + escHtml(code) + '

'; + html += '● 商品信息'; + html += ''; + html += '
'; + html += '
'; + html += '
关联包材
' + bomCount + ' 种
'; + html += '
订单在途
' + transitOrders.length + ' 笔
'; + html += '
产品类型
' + escHtml(d.product_type || '-') + '
'; + html += '
'; + html += '
📋 基础信息
'; + fields.forEach(function(f) { + var k = f[0], v = f[1] !== undefined && f[1] !== null && f[1] !== '' ? String(f[1]) : '-'; + html += '
' + escHtml(k) + '' + escHtml(v) + '
'; }); - if (fields.length % 2 === 1) html += '
'; - html += '
' + escHtml(k) + '' + escHtml(v) + '
'; + html += '
'; // 订单在途列表 - var transitOrders = res.data.orders_in_transit || []; - html += '
'; - html += '
📦 订单在途 (' + transitOrders.length + ')
'; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; + html += '
📦 订单在途
共 ' + transitOrders.length + ' 笔
'; + html += '
下单时间编号名称下单数量采购跟单采购计划
'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; html += ''; if (transitOrders.length > 0) { transitOrders.forEach(function(o) { - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; html += ''; }); } else { - html += ''; + html += ''; } - html += '
下单时间编号名称下单数量采购跟单采购计划
' + escHtml(o['下单时间'] || '-') + '' + escHtml(o['编码'] || '') + '' + escHtml(o['名称'] || '-') + '' + (parseInt(o['下单数量']) || 0).toLocaleString() + '' + escHtml(o['采购跟单'] || '-') + '' + escHtml(o['采购计划'] || '-') + '
' + escHtml(o['下单时间'] || '-') + '' + escHtml(o['编码'] || '') + '' + escHtml(o['名称'] || '-') + '' + (parseInt(o['下单数量']) || 0).toLocaleString() + '' + escHtml(o['采购跟单'] || '-') + '' + escHtml(o['采购计划'] || '-') + '
---0--
暂无在途订单
'; + html += '
'; html += ''; html += '
'; @@ -22956,27 +22961,13 @@ function loadPackagingOrdersPage(container) { renderOrderColCheckboxes('packaging'); } - packagingLoadFilters().then(function() { - loadDefaultOrderScheme('packaging'); - // 恢复上次的筛选状态（切页/刷新后保留搜索、筛选、表头筛选、页码） - var restoredPage = 1; - if (_restorePackagingFilterState()) { - restoredPage = packagingOrderPage || 1; - var _si = document.getElementById('packagingSearchInput'); - if (_si) _si.value = packagingSearch; - var _sf = document.getElementById('packagingSupplierFilter'); - if (_sf) _sf.value = packagingFilterSupplier; - var _ss = document.getElementById('packagingStatusFilter'); - if (_ss) _ss.value = packagingFilterStatus; - var _so = document.getElementById('packagingOrdererFilter'); - if (_so) _so.value = packagingFilterOrderer; - _syncOrderFilterIcons('packaging'); - } - // Load members and personnel groups before rendering the list. - Promise.all([loadOrderFollowers(), loadPersonnelGroupsForLinkedPages()]).then(function() { - packagingLoadOrders(restoredPage); - }); - }); + // 列表是页面核心内容，必须立即加载，不能被筛选项、人员或分组接口阻塞。 + // 辅助接口失败时仅降级对应下拉/标签，不再让表格永远停留在“加载中”。 + packagingLoadOrders(1); + packagingLoadFilters(); + loadOrderFollowers(); + loadPersonnelGroupsForLinkedPages(); + loadDefaultOrderScheme('packaging'); // 后台预拉取所有列的筛选值 prefetchOrderColumnValues('packaging'); } @@ -22992,7 +22983,7 @@ function packagingLoadFilters() { opt.value = s; opt.textContent = s; so.appendChild(opt); }); - }); + }).catch(function() { return null; }); } function packagingDoSearch() { @@ -23045,9 +23036,10 @@ function packagingLoadOrders(page) { packagingOrderPage = page; }) .then(function(r){return r.json()}) .then(function(res){ - if (res.code !== 0) return; + if (res.code !== 0) throw new Error(res.msg || '包材订单加载失败'); var data = res.data; var tbody = document.getElementById('packagingOrdersTbody'); + if (!tbody) return; if (document.getElementById('packagingTotalInfo')) document.getElementById('packagingTotalInfo').textContent = '共 ' + data.total + ' 条'; @@ -23153,6 +23145,13 @@ function packagingLoadOrders(page) { packagingOrderPage = page; renderPaginationWithSize(pel, page, data.total || 0, PACKAGING_PAGE_SIZE, 'packagingLoadOrders', 'PACKAGING_PAGE_SIZE'); } } + }).catch(function(error) { + var tbody = document.getElementById('packagingOrdersTbody'); + if (tbody) { + tbody.innerHTML = '' + + '
加载失败：' + escHtml(error.message || '网络异常') + '
' + + ''; + } }); } diff --git a/tests/test_packaging_loading_and_sku_modal.py b/tests/test_packaging_loading_and_sku_modal.py new file mode 100644 index 0000000..8f7f5d6 --- /dev/null +++ b/tests/test_packaging_loading_and_sku_modal.py @@ -0,0 +1,37 @@ +"""包材订单首屏加载与订单 SKU 弹窗布局回归测试。""" + +import unittest +from pathlib import Path + + +APP_JS = (Path(__file__).resolve().parents[1] / 'static/js/app.js').read_text(encoding='utf-8') + + +class PackagingLoadingAndSkuModalTest(unittest.TestCase): + def test_packaging_list_does_not_wait_for_auxiliary_requests(self): + start = APP_JS.index('function loadPackagingOrdersPage(container)') + end = APP_JS.index('function packagingLoadFilters()', start) + page_loader = APP_JS[start:end] + + list_call = page_loader.rindex('packagingLoadOrders(1);') + filter_call = page_loader.rindex('packagingLoadFilters();') + follower_call = page_loader.rindex('loadOrderFollowers();') + self.assertLess(list_call, filter_call) + self.assertLess(list_call, follower_call) + self.assertNotIn("packagingLoadFilters().then(function()", page_loader) + + def test_packaging_errors_replace_permanent_loading_state(self): + self.assertIn("throw new Error(res.msg || '包材订单加载失败')", APP_JS) + self.assertIn('加载失败：', APP_JS) + self.assertIn('重新加载', APP_JS) + + def test_domestic_and_overseas_sku_modal_use_card_layout(self): + self.assertIn('class="modal sku-info-modal"', APP_JS) + self.assertIn('📋 基础信息', APP_JS) + self.assertIn('关联包材', APP_JS) + self.assertIn('订单在途', APP_JS) + self.assertIn('grid-template-columns:repeat(2,minmax(0,1fr))', APP_JS) + + +if __name__ == '__main__': + unittest.main()