@@ -495,6 +506,7 @@
+
diff --git a/frontend/js/components/dashboard.js b/frontend/js/components/dashboard.js
index 81102ad..a79b24a 100755
--- a/frontend/js/components/dashboard.js
+++ b/frontend/js/components/dashboard.js
@@ -470,23 +470,57 @@ const Dashboard = (() => {
});
async function render() {
- const [dRes,pRes,yRes,tRes,mRes] = await Promise.allSettled([
- API.dashboard(),
- API.auditPddQuiet(),
- API.auditYtQuiet(),
- API.auditTxQuiet(),
- API.auditMtQuiet()
- ]);
- const data = dRes.status==='fulfilled' ? dRes.value : { goodRate: '—', shipments: '—', defects: '—', badCount: '—' };
- const pdd = pRes.status==='fulfilled' ? pRes.value : { list: [] };
- const yt = yRes.status==='fulfilled' ? yRes.value : { list: [] };
- const tx = tRes.status==='fulfilled' ? tRes.value : { list: [] };
- const mt = mRes.status==='fulfilled' ? mRes.value : { list: [] };
+ // 先返回全屏loading遮罩层，阻止点击菜单栏
+ const loadingHtml = `
+
+
+ `;
+
+ // 异步加载数据并渲染
+ const loadData = async () => {
+ const [dRes,pRes,yRes,tRes,mRes] = await Promise.allSettled([
+ API.dashboard(),
+ API.auditPddQuiet(),
+ API.auditYtQuiet(),
+ API.auditTxQuiet(),
+ API.auditMtQuiet()
+ ]);
+ const data = dRes.status==='fulfilled' ? dRes.value : { goodRate: '—', shipments: '—', defects: '—', badCount: '—' };
+ const pdd = pRes.status==='fulfilled' ? pRes.value : { list: [] };
+ const yt = yRes.status==='fulfilled' ? yRes.value : { list: [] };
+ const tx = tRes.status==='fulfilled' ? tRes.value : { list: [] };
+ const mt = mRes.status==='fulfilled' ? mRes.value : { list: [] };
+
+ renderDashboardContent(data, pdd, yt, tx, mt);
+ };
+
+ // 启动数据加载
+ setTimeout(loadData, 0);
+
+ return loadingHtml;
+ }
+
+ // 实际的仪表盘内容渲染函数
+ function renderDashboardContent(data, pdd, yt, tx, mt) {
+ const view = document.getElementById('view');
+ if(!view) return;
+
+ // 先移除loading遮罩层
+ const loadingEl = document.getElementById('dashboard-loading');
+ if(loadingEl) loadingEl.remove();
// 优化：默认只显示少量数据，完整数据在点击模态框时加载
const pddList = (pdd.list||[]).slice(0, 10).map(r=>`
${r.ts_cn||'—'}${r.batch||''}${r.mac||''}${r.note||''}`).join('')||'暂无数据';
const ytList = (yt.list||[]).slice(0, 10).map(r=>`
${r.ts_cn||'—'}${r.batch||''}${r.mac||''}${r.note||''}`).join('')||'暂无数据';
- setTimeout(()=>{
+
+ // 构建HTML内容
+ let html = '';
+
+ // 清理旧的定时器和事件
+ window.__dashboardInit = () => {
// 清理旧的定时器和事件
if(window.__auditTimer){
clearInterval(window.__auditTimer);
@@ -1225,7 +1259,7 @@ const Dashboard = (() => {
};
};
- const drawShipmentDonutChart = (stats) => {
+ const drawShipmentDonutChart = async (stats) => {
const canvas = document.getElementById('shipment-donut-chart');
if(!canvas) return;
const ctx = canvas.getContext('2d');
@@ -1243,6 +1277,20 @@ const Dashboard = (() => {
const items = Object.entries(byPlatform).filter(([, v]) => (v || 0) > 0);
items.sort((a, b) => (b[1] || 0) - (a[1] || 0));
+ // 获取机种列表以映射自定义机种名称
+ let platformList = [];
+ try {
+ const platformRes = await fetch('/api/shipments/platforms', {
+ headers: { 'Content-Type': 'application/json' },
+ credentials: 'include'
+ }).then(r => r.ok ? r.json() : null);
+ if(platformRes && platformRes.list) {
+ platformList = platformRes.list;
+ }
+ } catch(e) {
+ // 忽略错误，使用默认映射
+ }
+
const platformName = (k) => {
const map = {
pdd: '拼多多',
@@ -1253,7 +1301,13 @@ const Dashboard = (() => {
std: '标准版',
unknown: '未知'
};
- return map[k] || k;
+ // 先从固定映射查找
+ if(map[k]) return map[k];
+ // 再从机种列表查找自定义机种名称
+ const customPlatform = platformList.find(p => p.value === k);
+ if(customPlatform) return customPlatform.label;
+ // 最后返回原始值
+ return k;
};
const platformColor = (k, fallbackIndex) => {
@@ -1358,7 +1412,7 @@ const Dashboard = (() => {
window.__shipmentStatsTs = window.__shipmentStatsTs || 0;
const now = Date.now();
if(!force && (now - window.__shipmentStatsTs) < 60000 && window.__shipmentStatsCache) {
- drawShipmentDonutChart(window.__shipmentStatsCache);
+ await drawShipmentDonutChart(window.__shipmentStatsCache);
return;
}
try {
@@ -1369,7 +1423,7 @@ const Dashboard = (() => {
if(res && res.ok) {
window.__shipmentStatsCache = res;
window.__shipmentStatsTs = now;
- drawShipmentDonutChart(res);
+ await drawShipmentDonutChart(res);
}
} catch(e) {
}
@@ -2087,8 +2141,10 @@ const Dashboard = (() => {
// 刷新间隔10秒
window.__auditTimer=setInterval(refreshAll, 10000);
- },0);
- return `
+ };
+
+ // 构建HTML内容
+ html = `
@@ -2371,6 +2427,16 @@ const Dashboard = (() => {
`;
+
+ // 更新DOM内容，替换loading动画
+ if(view) {
+ view.innerHTML = html;
+ }
+
+ // 触发setTimeout中的初始化逻辑（确保DOM已更新）
+ setTimeout(() => {
+ if(window.__dashboardInit) window.__dashboardInit();
+ }, 0);
}
// 跳转到良不良统计页面
diff --git a/frontend/js/components/finance.js b/frontend/js/components/finance.js
new file mode 100644
index 0000000..fc84a93
--- /dev/null
+++ b/frontend/js/components/finance.js
@@ -0,0 +1,1284 @@
+/**
+ * 财务管理模块组件
+ * 包含：收支管理、客户对账、发票管理、供应商对账
+ */
+window.Finance = (() => {
+
+ // 当前子模块
+ let currentSubModule = 'income-expense';
+
+ // 渲染主框架
+ const render = () => {
+ return `
+
+
+
+
+
+
+ ${renderSubModule(currentSubModule)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
显示全部历史数据
+
+
+
+
+ | 客户 / 合同号 |
+ 订单数 |
+ 物料明细 |
+ 累计应收 |
+ 累计已收 |
+ 未收余额 |
+ 回款率 |
+ 最后交易 |
+
+
+
+ | 暂无数据 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| 暂无数据 |
';
+ } else {
+ tbody.innerHTML = res.data.map(row => `
+
+ | ${row.date} |
+ ${row.type === 'income' ? '收入' : '支出'} |
+ ${row.category || '-'} |
+ ¥${(row.amount || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ${row.related_party || '-'} |
+ ${row.order_no || '-'} |
+ ${row.payment_method || '-'} |
+ ${row.status === 'confirmed' ? '已确认' : '待确认'} |
+ ${row.description || '-'} |
+
+ `).join('');
+ }
+ }
+ } catch(e) {
+ console.error('加载流水失败:', e);
+ }
+ };
+
+ // 整合显示状态
+ let isMergeMode = false;
+
+ // 切换整合/分开显示
+ const toggleMerge = () => {
+ isMergeMode = !isMergeMode;
+ const btn = document.getElementById('merge-btn');
+ const th = document.getElementById('rec-th-customer');
+ if(btn) {
+ if(isMergeMode) {
+ btn.textContent = '分开显示';
+ btn.style.background = '#6B7280';
+ if(th) th.textContent = '客户名称';
+ } else {
+ btn.textContent = '整合显示';
+ btn.style.background = '#3B82F6';
+ if(th) th.textContent = '客户 / 合同号';
+ }
+ }
+ loadCustomerRec();
+ };
+
+ // 加载客户对账
+ const loadCustomerRec = async () => {
+ try {
+ const params = new URLSearchParams();
+ const customer = document.getElementById('customer-name')?.value;
+ const period = document.getElementById('rec-period')?.value;
+
+ console.log('DEBUG: period value =', period);
+
+ if(customer) params.append('customer', customer);
+ if(period) {
+ params.append('period', period);
+ console.log('DEBUG: adding period param =', period);
+ }
+ if(isMergeMode) params.append('merge', 'true');
+
+ console.log('DEBUG: final URL =', '/api/finance/customer-reconciliation?' + params.toString());
+
+ const res = await fetch('/api/finance/customer-reconciliation?' + params, {
+ credentials: 'include'
+ }).then(r => r.json());
+
+ console.log('DEBUG: response period_label =', res.period_label);
+
+ if(res.ok) {
+ // 更新周期标签
+ const periodLabel = document.getElementById('rec-period-label');
+ if(periodLabel && res.period_label) {
+ const modeText = isMergeMode ? '（整合显示）' : '（分开显示）';
+ periodLabel.textContent = (period ? `数据周期：${res.period_label}` : '显示全部历史数据') + modeText;
+ }
+
+ // 更新统计卡片
+ const totalReceivable = res.data.reduce((sum, r) => sum + (r.total_income || 0), 0);
+ const totalPaid = res.data.reduce((sum, r) => sum + (r.total_paid || 0), 0);
+ const totalBalance = res.data.reduce((sum, r) => sum + (r.closing_balance || 0), 0);
+
+ // 本期客户数：按客户名称去重统计（同一客户多个合同号只算1个）
+ const uniqueCustomers = new Set(res.data.map(r => r.customer_name)).size;
+
+ document.getElementById('rec-customer-count').textContent = uniqueCustomers;
+ document.getElementById('rec-total-receivable').textContent =
+ '¥' + totalReceivable.toLocaleString('zh-CN', {minimumFractionDigits: 2});
+ document.getElementById('rec-total-paid').textContent =
+ '¥' + totalPaid.toLocaleString('zh-CN', {minimumFractionDigits: 2});
+ document.getElementById('rec-total-balance').textContent =
+ '¥' + totalBalance.toLocaleString('zh-CN', {minimumFractionDigits: 2});
+
+ const tbody = document.getElementById('customer-rec-tbody');
+ if(res.data.length === 0) {
+ tbody.innerHTML = '| 暂无数据 |
';
+ } else {
+ tbody.innerHTML = res.data.map(row => {
+ // 计算回款率
+ const payRate = row.total_income > 0
+ ? ((row.total_paid / row.total_income) * 100).toFixed(1) + '%'
+ : '0%';
+
+ // 物料明细截断显示
+ const materials = row.materials
+ ? (row.materials.length > 30 ? row.materials.substring(0, 30) + '...' : row.materials)
+ : '-';
+
+ // 最后交易日期
+ const lastDate = row.last_order_date || '-';
+
+ // 显示名称：整合模式只显示客户名，分开模式显示客户名+合同号+编辑图标
+ let displayName;
+ const editIcon = ``;
+ if(isMergeMode) {
+ displayName = `${row.customer_name}${editIcon}`;
+ } else {
+ // 分开显示模式：同时显示客户名称和合同号，可点击编辑
+ if(row.customer_name && row.customer_name !== row.contract_no) {
+ displayName = `${row.customer_name}${editIcon}
${row.contract_no}`;
+ } else {
+ displayName = `${row.contract_no}${editIcon}`;
+ }
+ }
+
+ return `
+
+ | ${displayName} |
+ ${row.order_count || 0} 单 |
+ ${materials} |
+ ¥${(row.total_income || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.total_paid || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.closing_balance || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ${payRate} |
+ ${lastDate} |
+
+ `}).join('');
+ }
+ }
+ } catch(e) {
+ console.error('加载客户对账失败:', e);
+ }
+ };
+
+ // 加载供应商对账
+ const loadSupplierRec = async () => {
+ try {
+ const params = new URLSearchParams();
+ const supplier = document.getElementById('supplier-name')?.value;
+ const period = document.getElementById('supplier-period')?.value;
+
+ if(supplier) params.append('supplier', supplier);
+ if(period) params.append('period', period);
+
+ const res = await fetch('/api/finance/supplier-reconciliation?' + params, {
+ credentials: 'include'
+ }).then(r => r.json());
+
+ if(res.ok) {
+ const tbody = document.getElementById('supplier-rec-tbody');
+ if(res.data.length === 0) {
+ tbody.innerHTML = '| 暂无数据 |
';
+ } else {
+ tbody.innerHTML = res.data.map(row => `
+
+ | ${row.supplier_name} |
+ ${row.period_start} ~ ${row.period_end} |
+ ¥${(row.opening_balance || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.total_expense || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.total_paid || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.closing_balance || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ${row.statement_status === 'confirmed' ? '已确认' : '待确认'} |
+ |
+
+ `).join('');
+ }
+ }
+ } catch(e) {
+ console.error('加载供应商对账失败:', e);
+ }
+ };
+
+ // 加载发票统计
+ const loadInvoiceStats = async () => {
+ try {
+ const res = await fetch('/api/finance/invoices/stats', {
+ credentials: 'include'
+ }).then(r => r.json());
+
+ if(res.ok) {
+ document.getElementById('input-invoice-count').textContent =
+ (res.stats.input.count || 0) + ' 张';
+ document.getElementById('input-invoice-amount').textContent =
+ '¥' + (res.stats.input.total || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2});
+ document.getElementById('output-invoice-count').textContent =
+ (res.stats.output.count || 0) + ' 张';
+ document.getElementById('output-invoice-amount').textContent =
+ '¥' + (res.stats.output.total || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2});
+ }
+ } catch(e) {
+ console.error('加载发票统计失败:', e);
+ }
+ };
+
+ // 加载发票列表
+ const loadInvoices = async () => {
+ try {
+ const params = new URLSearchParams();
+ const type = document.getElementById('invoice-type')?.value;
+ const status = document.getElementById('invoice-status')?.value;
+ const start = document.getElementById('invoice-start')?.value;
+ const end = document.getElementById('invoice-end')?.value;
+
+ if(type) params.append('type', type);
+ if(status) params.append('status', status);
+ if(start) params.append('start_date', start);
+ if(end) params.append('end_date', end);
+
+ const res = await fetch('/api/finance/invoices?' + params, {
+ credentials: 'include'
+ }).then(r => r.json());
+
+ if(res.ok) {
+ const tbody = document.getElementById('invoices-tbody');
+ if(res.data.length === 0) {
+ tbody.innerHTML = '| 暂无数据 |
';
+ } else {
+ tbody.innerHTML = res.data.map(row => `
+
+ | ${row.invoice_type === 'input' ? '进项' : '销项'} |
+ ${row.invoice_no} |
+ ${row.issue_date} |
+ ¥${(row.amount || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.tax_amount || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ¥${(row.total_amount || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ ${row.related_party || '-'} |
+ ${row.order_no || '-'} |
+ ${row.status === 'normal' ? '正常' : '作废'} |
+
+ `).join('');
+ }
+ }
+ } catch(e) {
+ console.error('加载发票失败:', e);
+ }
+ };
+
+ // 加载统计报表
+ const loadStats = async () => {
+ try {
+ const days = document.getElementById('stats-range')?.value || 30;
+
+ const res = await fetch('/api/finance/business-stats?days=' + days, {
+ credentials: 'include'
+ }).then(r => r.json());
+
+ if(res.ok) {
+ document.getElementById('total-income').textContent =
+ '¥' + (res.stats.summary.total_income || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2});
+ document.getElementById('total-expense').textContent =
+ '¥' + (res.stats.summary.total_expense || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2});
+
+ const net = (res.stats.summary.total_income || 0) - (res.stats.summary.total_expense || 0);
+ document.getElementById('net-profit').textContent =
+ '¥' + net.toLocaleString('zh-CN', {minimumFractionDigits: 2});
+
+ const margin = res.stats.summary.total_income > 0
+ ? (net / res.stats.summary.total_income * 100).toFixed(1)
+ : 0;
+ document.getElementById('profit-margin').textContent = margin + '%';
+
+ // 客户应收
+ const recTbody = document.getElementById('receivables-tbody');
+ if(res.stats.customer_receivables?.length > 0) {
+ recTbody.innerHTML = res.stats.customer_receivables.map(r => `
+ | ${r.related_party} | ¥${(r.balance || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ `).join('');
+ } else {
+ recTbody.innerHTML = '| 暂无数据 |
';
+ }
+
+ // 供应商应付
+ const payTbody = document.getElementById('payables-tbody');
+ if(res.stats.supplier_payables?.length > 0) {
+ payTbody.innerHTML = res.stats.supplier_payables.map(r => `
+ | ${r.related_party} | ¥${(r.balance || 0).toLocaleString('zh-CN', {minimumFractionDigits: 2})} |
+ `).join('');
+ } else {
+ payTbody.innerHTML = '| 暂无数据 |
';
+ }
+ }
+ } catch(e) {
+ console.error('加载统计失败:', e);
+ }
+ };
+
+ // ========== 模态框函数 ==========
+
+ const showAddTransactionModal = () => {
+ const modal = document.createElement('div');
+ modal.className = 'modal-overlay';
+ modal.id = 'transaction-modal';
+ modal.innerHTML = `
+
+
新增收支记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新增发票
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
编辑客户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 