9cd393c3b2
fix: 合同附件上传后列表不刷新、消息不显示的bug
...
- 上传后: old_params=null 破环再 render({}) 强制刷新列表
- 上传/删除后: 解析 JSON 响应并用 bricks.widgetBuild() 显示消息
- 删除后同样破环强制刷新
- URL 参数用 encodeURIComponent 防特殊字符问题
- 下载增加无路径时的兜底提示
2026-07-14 12:54:49 +08:00
e7a4535423
fix: add_sub_distributor_admin - 用orgtypeid+name查role, 补parentid+org_type
2026-07-13 11:14:02 +08:00
9afb3c279b
fix: save dspys return Message widget for visual feedback
...
script actiontype forbidden in bricks; use Message widget instead.
Status column reflects saved state on page load/reload.
2026-07-12 23:25:22 +08:00
e2811156b0
fix: add id to status widgets + return item_id from save dspys
2026-07-12 23:23:34 +08:00
5a00a42f05
fix: check product_org_auth exists before insert in save_agreement_discount
2026-07-12 23:19:42 +08:00
0107eebdcb
feat: discount setting UI for agreement/contract items (like discount module pattern)
...
- agreement_discount_setting.ui: product list with UiFloat discount inputs
- contract_discount_setting.ui: same for supply contracts
- get_agreement_discount_items.dspy + Python function
- get_contract_discount_items.dspy + Python function
- save_agreement_discount.dspy: create/update/delete items on discount change
- save_contract_discount.dspy: same for supply contracts
- Updated distribution_agreements_list and supply_contracts_list subtables
2026-07-12 10:51:18 +08:00
1e7f713725
fix: use HTML meta refresh redirect instead of DataViewer or 302
...
PopupWindow renders dspy response directly. DataViewer doesn't
work inside popup context. HTML meta refresh redirects to CRUD page.
2026-07-12 10:28:24 +08:00
a930847317
fix: ensure dspy returns 302 redirect instead of DataViewer widget
...
PopupWindow can't render DataViewer returned from dspy.
Now dspy creates contract/agreement if needed, then 302→CRUD page.
2026-07-12 10:27:27 +08:00
3159afbede
fix: get_search_prodtypeid/productid query correct DB (sage) and tables
...
- prodtypeid: product_types→product_category, supplychain→sage
- productid: products→product, supplychain→sage
2026-07-12 09:37:38 +08:00
0049db58e5
fix: move product_org_auth sync to distribution_agreement_items (not supply_contract_items)
...
- supply_contract_items: revert — products already belong to reseller's own org
- distribution_agreement_items: create → insert product_org_auth for sub_reseller
- distribution_agreement_items: delete → remove product_org_auth
- org_id in product_org_auth = sub_reseller_id (二级分销商)
2026-07-10 15:48:27 +08:00
3c98e8a991
feat: sync product_org_auth on supply_contract_items create/delete
2026-07-10 15:38:28 +08:00
fac526637b
fix: add id to userrole insert + remove manual created_at (DB has defaults)
2026-07-10 14:01:05 +08:00
fb579cbd2f
fix: use sor.R for role lookup + proper datetime format
...
- Changed raw SQL role query to sor.R('role', {'role': name})
- Fixed timestampstr() → datetime format to avoid data truncation
- Added logined + reseller.operator roles alongside admin
2026-07-10 13:52:14 +08:00
ed4898bf90
fix: use absolute /supplychain/ paths in ensure dspy DataViewer URLs
...
Relative ../ paths inside PopupWindow DataViewer resolve without
module prefix. Use absolute /supplychain/ paths instead.
2026-07-10 13:51:06 +08:00
916b501c67
feat: add admin + reset admin password toolbar for sub_distributors
...
- api/add_sub_distributor_admin.dspy: create org+user+reseller.admin role, show password
- api/reset_sub_distributor_admin_pwd.dspy: reset admin password, show new password
- sub_distributors_list: add toolbar buttons with popup binds
2026-07-10 12:15:31 +08:00
749047814f
fix: use DataViewer instead of UrlWidget (UrlWidget ignores w/h; DataViewer works)
2026-07-10 11:30:05 +08:00
e0dc9963b7
feat: sub_distributors_create now creates organization + supply relation
2026-07-10 11:16:30 +08:00
0c718cf461
fix: fix column name + ensure dspy now returns CRUD page after create
...
- sub_resellers column is sub_reseller_name (not sub_dist_name)
- After ensure, return UrlWidget loading CRUD list filtered by id
- Popup size increased for CRUD page viewing
2026-07-10 11:11:21 +08:00
3a36dc2400
feat: one-click ensure contract/agreement from supplier/distributor list
...
- api/ensure_distribution_agreement.dspy: check/create distribution_agreement for sub_reseller
- api/ensure_supply_contract.dspy: check/create supply_contract for supplier
- sub_distributors_list: toolbar '分销协议' now calls ensure endpoint (was PopupWindow)
- suppliers_list: add toolbar '供销协议' calling ensure endpoint
2026-07-10 10:37:17 +08:00
da5fd85984
fix: add_sub_distributors calls create_sub_reseller for org+account creation
2026-07-09 16:29:11 +08:00
7c0acb5245
fix: UiFile-based upload with drag-drop support, download/delete toolbar
2026-07-03 17:57:48 +08:00
07d5173d75
feat: add download and delete actions to contract attachment list
2026-07-03 17:45:57 +08:00
3017ac295b
fix: bricks.app.getWidgetById → bricks.getWidgetById (app is not the root for widget lookup)
2026-07-03 17:42:03 +08:00
b375ba5155
chore: remove vim swap file
2026-07-03 17:05:35 +08:00
a914380a9b
feat: ContractAttachMgr — supplychain 自有附件管理器
...
ContractAttachMgr 继承 FileMgr, fiid 从 params_kw 透传
contract_upload.dspy: 自有上传端点
contract_attach.ui: 改用 supplychain 自己的上传 dspy
2026-07-03 17:05:24 +08:00
64e240872f
fix: show_error → console.error (bricks 无此方法)
2026-07-03 16:54:26 +08:00
b4d66933a6
fix: get_files() -> this.value (UiFile 正确取值方式)
2026-07-03 16:51:51 +08:00
3497d946ce
fix: Jinja2 转义 — upload_url 用 {% set %} 预计算
...
entire_url("/filemgr/...") 中的 " 导致 Jinja2 解析报错
改用 {% set upload_url = entire_url('/filemgr/upload_file.dspy') %}
2026-07-03 16:48:24 +08:00
a63b6ce427
fix: 附件上传改用 UiFile changed + fetch FormData
...
UiFile changed 事件 → script fetch POST multipart → 成功后 render Tabular
无需点击上传按钮,选择文件即自动上传
2026-07-03 16:46:14 +08:00
1f06a23fa3
fix: 附件上传改用 Form submit_url (multipart) + UiFile multiple
...
Form submit_url 直接POST到 filemgr, 支持multipart文件上传
UiFile multiple: true 浏览器原生支持拖拽
去掉无用的按钮+toolbar
2026-07-03 16:37:26 +08:00
3df4e237fc
feat: 合同附件支持拖拽上传
...
drop_zone: 虚线边框拖放区域, 点击选择文件
Form: 隐藏字段 folderid+fiid + file input
Script: dragover/drop 事件处理, 拖入文件自动上传
2026-07-03 16:23:21 +08:00
e44c84d14c
fix: created_by should be user_id not userorgid
2026-07-03 16:10:02 +08:00
724a912bc9
fix: remove duplicate supplier_id in new_data_url; JSON config is the correct fix, not dspy workaround
2026-07-03 16:09:30 +08:00
698f0f6e29
fix: unwrap list values from bricks code lookups (supplier_id was ['x','x']) before sor.C
2026-07-03 16:00:39 +08:00
fa81da2bbf
fix: return plain dict (ahserver handles serialization), match CRUD pattern exactly
2026-07-03 15:54:19 +08:00
4a0b9db82a
fix: follow CRUD add_llm pattern exactly — ns.copy(), sor.C, no param cleaning
2026-07-03 15:41:58 +08:00
6b6489af02
fix: back to sor.C with simple param cleaning
2026-07-03 15:40:11 +08:00
37c39a053f
fix: sor.I takes 1 arg (data), not 2
2026-07-03 15:33:42 +08:00
fa5a1a3a8e
feat: 供应合同和分销协议支持附件上传下载
...
contract_attach.ui: 附件管理页面(Tabular文件列表 + 上传按钮)
contract_attach_list.dspy: 查询合同附件列表
init.py: ensure_contract_folder() 自动创建附件目录
supply_contracts_list + distribution_agreements_list: 新增'合同附件'toolbar
实现: filemgr folder(contract_id=id, fiid=type)自动管理
2026-07-03 15:32:41 +08:00
1d99375578
fix: use whitelist approach - only pass known table columns to sor.I
2026-07-03 15:29:08 +08:00
959d021537
fix: clean _text suffix fields, use sor.I instead of sor.C, json.dumps return
2026-07-03 15:11:26 +08:00
da64e09090
fix: supply_contracts_create remove json.dumps
2026-07-03 15:10:01 +08:00
32070a53b1
fix: supplychain_accounting update/delete return widgettype format
2026-07-03 15:08:21 +08:00
63a1bedeba
fix: clean non-table params before sor.C; return json.dumps instead of dict
2026-07-03 15:04:34 +08:00
f325ad0c93
fix: CRUD endpoint return format - remove json.dumps
2026-07-03 15:01:08 +08:00
813882ff71
fix: supply_contracts_create generates contract_code automatically
2026-07-03 14:30:35 +08:00
e766111aa1
fix: batch fix dspy violations — remove imports/print/ServerEnv, use return json.dumps, proper widgettype format
2026-07-03 13:57:26 +08:00
e79627c55f
fix: sor.U()参数错误 - id放data字典内而非单独传第3参数
2026-07-02 18:53:04 +08:00
0bdb019e29
fix: 供应商创建同步org+开账,去json.dumps
2026-07-01 16:01:24 +08:00
c4039d2b30
fix: 修复供应链模块全部CRUD配置问题
...
- suppliers_list: 添加orgid的code配置(dataurl+valueField/textField),加入editexclouded
- supplier_resource_price_list: 修正data_filter格式(fields→AND),补充alters全部code字段
- product_supplier_mapping_list: 添加editexclouded,补充product_id的code配置
- platform_supply_products_list: 添加editexclouded,补充relation_id/source_product_id的code配置
- platform_supply_relations_list: 添加editexclouded,补充supplier_org_id/buyer_org_id的code配置
- sales_ledger_list: 添加editexclouded,补充6个FK字段的code配置
- sub_resellers_list: 添加editexclouded
- supplychain_accounting_list: 添加data_filter+filter_labels,补充7个code字段的alters配置
- 新增get_search_sub_distributor_id.dspy和get_search_supply_relation_id.dspy
- load_path.py注册新路径
2026-06-25 16:07:23 +08:00