From cee55d0a591bce833108574bed3f0085371f5912 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Thu, 18 Jun 2026 13:33:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E8=B4=A6=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=8F=9C=E5=8D=95=E4=B8=BA=E5=9B=9B=E7=BA=A7?= =?UTF-8?q?=E5=B1=82=E6=AC=A1=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 菜单结构: - 账务配置: 科目设置/账务设置/会计分录配置 - 财务处理: 客户信用额度/代客充值/错帐处理 - 分销商结算: 分销商对账/明细对账/分销商结算 - 供应商财务: 供应商充值/供应商对账/供应商明细对账/供应商结算 同时修正CRUD JSON output_dir指向accounting模块 --- json/accounting_config.json | 2 +- json/subject.json | 2 +- wwwroot/global_menu.ui | 116 +++++++++++++++++++++++++++++------- 3 files changed, 96 insertions(+), 24 deletions(-) diff --git a/json/accounting_config.json b/json/accounting_config.json index 72d168f..654379d 100644 --- a/json/accounting_config.json +++ b/json/accounting_config.json @@ -1,6 +1,6 @@ { "models_dir": "${HOME}$/py/accounting/models", - "output_dir": "${HOME}$/py/sage/wwwroot/_a/accounting_config", + "output_dir": "${HOME}$/py/accounting/wwwroot/accounting_config", "dbname": "sage", "tblname": "accounting_config", "params": { diff --git a/json/subject.json b/json/subject.json index 40b5982..1b5044d 100644 --- a/json/subject.json +++ b/json/subject.json @@ -1,6 +1,6 @@ { "models_dir": "${HOME}$/py/accounting/models", - "output_dir": "${HOME}$/py/sage/wwwroot/_a/subject", + "output_dir": "${HOME}$/py/accounting/wwwroot/subject", "dbname": "sage", "tblname": "subject", "params": { diff --git a/wwwroot/global_menu.ui b/wwwroot/global_menu.ui index acd0fd9..1a65c6c 100644 --- a/wwwroot/global_menu.ui +++ b/wwwroot/global_menu.ui @@ -143,34 +143,106 @@ "icon": "{{entire_url('/imgs/coins.svg')}}", "items": [ { - "name": "billing_query", - "label": "账单查询", - "url": "{{entire_url('/accounting/billing.ui')}}", - "target": "app.sage_main_content" + "name": "acc_config", + "label": "账务配置", + "items": [ + { + "name": "subject_manage", + "label": "科目设置", + "url": "{{entire_url('/accounting/subject/index.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "account_config", + "label": "账务设置", + "url": "{{entire_url('/accounting/account_config/index.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "accounting_config", + "label": "会计分录配置", + "url": "{{entire_url('/accounting/accounting_config/index.ui')}}", + "target": "app.sage_main_content" + } + ] }, { - "name": "acc_balance", - "label": "账户余额", - "url": "{{entire_url('/accounting/acc_balance')}}", - "target": "app.sage_main_content" + "name": "acc_process", + "label": "财务处理", + "items": [ + { + "name": "credit_limit_manage", + "label": "客户信用额度", + "url": "{{entire_url('/accounting/credit_limit/credit_manage.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "proxy_recharge", + "label": "代客充值", + "url": "{{entire_url('/accounting/proxy_recharge.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "error_accounting", + "label": "错帐处理", + "url": "{{entire_url('/accounting/error_accounting.ui')}}", + "target": "app.sage_main_content" + } + ] }, { - "name": "acc_detail", - "label": "账务明细", - "url": "{{entire_url('/accounting/acc_detail')}}", - "target": "app.sage_main_content" + "name": "reseller_settle", + "label": "分销商结算", + "items": [ + { + "name": "reseller_reconcile", + "label": "分销商对账", + "url": "{{entire_url('/supplychain/reseller_reconcile.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "reseller_detail_reconcile", + "label": "明细对账", + "url": "{{entire_url('/supplychain/reseller_detail_reconcile.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "reseller_settlement", + "label": "分销商结算", + "url": "{{entire_url('/supplychain/reseller_settlement.ui')}}", + "target": "app.sage_main_content" + } + ] }, { - "name": "account_manage", - "label": "账户管理", - "url": "{{entire_url('/accounting/account')}}", - "target": "app.sage_main_content" - }, - { - "name": "subject_manage", - "label": "科目管理", - "url": "{{entire_url('/accounting/subject')}}", - "target": "app.sage_main_content" + "name": "provider_finance", + "label": "供应商财务", + "items": [ + { + "name": "provider_recharge", + "label": "供应商充值", + "url": "{{entire_url('/supplychain/provider_recharge.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "provider_reconcile", + "label": "供应商对账", + "url": "{{entire_url('/supplychain/provider_reconcile.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "provider_detail_reconcile", + "label": "供应商明细对账", + "url": "{{entire_url('/supplychain/provider_detail_reconcile.ui')}}", + "target": "app.sage_main_content" + }, + { + "name": "provider_settlement", + "label": "供应商结算", + "url": "{{entire_url('/supplychain/provider_settlement.ui')}}", + "target": "app.sage_main_content" + } + ] } ] }