From 27fb1711094f8eee3fea27ec6cc2313ad5a0885a Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Mon, 13 Apr 2026 22:58:36 +0800
Subject: [PATCH] feat(erp): WtAccount 与收款账户展示，多模块表单/收银与后端联动

---
 Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtAccount.js                                               |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/utils/wtComboSkzhDisplay.js                                           |    2 +-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue                                         |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue                                                |   57 +++++++++++++++++++++++++++++++++++----------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue                                         |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/Form.vue                                                 |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/index.vue                                                |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/Form.vue                                          |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/index.vue                                         |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/Form.vue                                          |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/index.vue                                         |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue                                             |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue                                      |    3 ++-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue                                            |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/Form.vue                                             |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/index.vue                                            |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/Form.vue                                          |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/index.vue                                         |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/Form.vue                                          |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/index.vue                                         |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/Form.vue                                          |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/index.vue                                         |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue                                             |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/detail-view.vue                                      |    3 ++-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue                                            |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtMrsz/index.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtPurchaseSummary/index.vue                                     |  793 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/Form.vue                                                  |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/index.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/account-form.vue                                        |  134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/index.vue                                               |  608 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/Form.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/index.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/index.vue                                                 |   92 +++++++++++++++++---------------------------------------------------------------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/serial-trace-dialog.vue                                   |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/Form.vue                                                 |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/index.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue                                                |  146 +++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue                                         |   34 +++++++++++++++-------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue                                               |   16 ++--------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue                                         |   19 +++++++++++++++----
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/Form.vue                                            |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/detail-view.vue                                     |   34 +++++++++++++++-------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/index.vue                                           |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/Form.vue                                            |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/detail-view.vue                                     |   19 +++++++++++++++----
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/index.vue                                           |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/Form.vue                                            |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/detail-view.vue                                     |   19 +++++++++++++++----
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/index.vue                                           |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/Form.vue                                              |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/index.vue                                             |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/Form.vue                                           |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/index.vue                                          |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/detail-view.vue                                         |   34 +++++++++++++++-------------------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/index.vue                                               |   12 ++----------
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/Form.vue                                              |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/index.vue                                             |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/Form.vue                                           |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/detail-view.vue                                    |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/index.vue                                          |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/Form.vue                                           |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/index.vue                                          |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_qt/Form.vue                                           |    5 +++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue                                           |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/detail-view.vue                                    |    3 ++-
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/index.vue                                          |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/Form.vue                                           |    7 ++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/detail-view.vue                                    |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/index.vue                                          |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/Form.vue                                           |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/index.vue                                          |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/Form.vue                                                |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/detail-view.vue                                         |   19 +++++++++++++++----
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/index.vue                                               |    4 ++--
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/Form.vue                                                  |    6 +++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/index.vue                                                 |    6 +++---
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountCrInput.cs        |   33 +++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountInfoOutput.cs     |   45 +++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListOutput.cs     |   38 ++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListQueryInput.cs |   30 ++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountUpInput.cs        |   18 ++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPurchaseSummaryQueryInput.cs       |   15 +++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtAccountEntity.cs                |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtAccountService.cs                  |    9 +++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtAccountService.cs                              |  404 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs                                  |    2 +-
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtMdService.cs                                   |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkfkChannelStatService.cs                      |    8 ++++----
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkzhbService.cs                                |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs                                   |  220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXlhService.cs                                  |   43 +++++++++++++++++++++++++++++++++++++++++--
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs                                | 1164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 Antis.Erp.Plat/sy/home.html                                                                              |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Antis.Erp.Plat/sy/login.html                                                                             |   23 +++++++++++++++++++----
 Antis.Erp.Plat/sy/orders.html                                                                            |   34 +++++++++++++++++++++++++++++++---
 Antis.Erp.Plat/sy/settlement.html                                                                        |   86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 118 files changed, 3859 insertions(+), 1255 deletions(-)
 create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtAccount.js
 create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/account-form.vue
 create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/serial-trace-dialog.vue
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountCrInput.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountInfoOutput.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListOutput.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListQueryInput.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountUpInput.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtAccountEntity.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtAccountService.cs
 create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtAccountService.cs

diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtAccount.js b/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtAccount.js
new file mode 100644
index 0000000..1041b01
--- /dev/null
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtAccount.js
@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+
+export function getAccountSelector(storeId) {
+  const data = {}
+  if (storeId) data.storeId = storeId
+  return request({
+    url: '/api/Extend/WtAccount/Selector',
+    method: 'GET',
+    data
+  })
+}
+
+export function getAccountList(params) {
+  return request({
+    url: '/api/Extend/WtAccount',
+    method: 'GET',
+    data: params
+  })
+}
+
+export function getAccountInfo(id) {
+  return request({
+    url: '/api/Extend/WtAccount/' + id,
+    method: 'GET'
+  })
+}
+
+export function createAccount(data) {
+  return request({
+    url: '/api/Extend/WtAccount',
+    method: 'POST',
+    data
+  })
+}
+
+export function updateAccount(id, data) {
+  return request({
+    url: '/api/Extend/WtAccount/' + id,
+    method: 'PUT',
+    data
+  })
+}
+
+export function deleteAccount(id) {
+  return request({
+    url: '/api/Extend/WtAccount/' + id,
+    method: 'DELETE'
+  })
+}
+
+export function batchRemoveAccount(ids) {
+  return request({
+    url: '/api/Extend/WtAccount/batchRemove',
+    method: 'POST',
+    data: ids
+  })
+}
+
+export function getAccountCategories() {
+  return request({
+    url: '/api/Extend/WtAccount/Categories',
+    method: 'GET'
+  })
+}
+
+export function exportAccount(params) {
+  return request({
+    url: '/api/Extend/WtAccount/Actions/Export',
+    method: 'GET',
+    data: params
+  })
+}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtComboSkzhDisplay.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtComboSkzhDisplay.js
index 8713a1c..16efef2 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtComboSkzhDisplay.js
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtComboSkzhDisplay.js
@@ -15,7 +15,7 @@ export function resolveSkzhDictionaryLabel(id, options) {
     return oid === sid || ofid === sid
   })
   if (!row) return ''
-  const name = (row.fullName || row.F_FullName || row.F_mdmc || '').trim()
+  const name = (row.fullName || row.accountName || row.F_FullName || row.F_mdmc || '').trim()
   return name || ''
 }
 
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
index 0f3cc95..10d7c49 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/Form.vue
@@ -290,10 +290,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -657,7 +657,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
index 4de0022..c18efdd 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
@@ -217,10 +217,10 @@
 </template>
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import NCCForm from './Form'
 import ExportBox from './ExportBox'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	components: { NCCForm, ExportBox },
@@ -321,7 +321,7 @@ export default {
 			})
 		},
 		getskzhOptions() {
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list
 			})
 		},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/Form.vue
index 71352b5..00ee6f7 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/Form.vue
@@ -267,10 +267,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -583,7 +583,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/index.vue
index 2683c70..1a6161e 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBsd/index.vue
@@ -144,10 +144,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -218,7 +218,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/Form.vue
index dd6e696..c2b899e 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/Form.vue
@@ -267,10 +267,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -583,7 +583,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/index.vue
index bcccdca..41226b2 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtByd/index.vue
@@ -144,10 +144,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -218,7 +218,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue
index e22cd2d..08772e3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue
@@ -206,9 +206,9 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelectWithScan from './BarcodeSelectWithScan.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect: BarcodeSelectWithScan },
 		props: [],
@@ -352,7 +352,7 @@ setFullName(item,row){
 				this.productQuery = val;
 				},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue
index 149a4e1..7a23486 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue
@@ -173,9 +173,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtCgrkdDetailView',
@@ -295,7 +295,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.rkckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 			request({
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue
index 821933d..a9f7abf 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue
@@ -139,12 +139,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApprovePurchaseInbound, postRejectGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -221,7 +221,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
index c8e38fa..7332edf 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="isNew ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="80%">
+	<el-dialog :title="isNew ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="80%" append-to-body>
 		<el-row :gutter="15" class="" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
 				<el-col :span="12">
@@ -187,8 +187,20 @@
 					</el-col> -->
 					<el-col :span="8">
 						<el-form-item label="退款账户" prop="skzh">
-							<el-select v-model="dataForm.skzh" placeholder="请选择" clearable :style='{"width":"100%"}' filterable >
-								<el-option v-for="(item, index) in skzhOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							<el-select
+								v-model="dataForm.skzh"
+								placeholder="请选择"
+								clearable
+								:style='{"width":"100%"}'
+								filterable
+								popper-append-to-body
+							>
+								<el-option
+									v-for="(item, index) in skzhOptions"
+									:key="item.id != null ? String(item.id) : index"
+									:label="item.fullName || item.accountName || item.accountCode || '账户'"
+									:value="item.id"
+								/>
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -242,10 +254,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import SerialNumberSelect from '../wtXsckd/SerialNumberSelect.vue'
 	import PurchaseInboundOrderSelect from './PurchaseInboundOrderSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { SerialNumberSelect, PurchaseInboundOrderSelect },
 		props: [],
@@ -256,8 +268,7 @@
 				isDetail: false,
 				isNew: false,
 				dataForm: {
-					id:'',
-					id:undefined,
+					id: undefined,
 					djrq:undefined,
 					cjck:undefined,
 					jsr:undefined,
@@ -278,7 +289,6 @@
 				gysOptions: [],
 				cjckOptions : [],
 				rkckOptions : [],
-				rkckOptions : [],
 				ckckOptions : [],
 				spbhOptions : [],
 				skzhOptions : [],
@@ -300,7 +310,6 @@
 			console.log('created钩子执行，准备加载商品下拉');
 			this.getcjckOptions();
 			this.getrkckOptions();
-			this.getrkckOptions();
 			this.getckckOptions();
 			this.getspbhOptions();
 			this.getskzhOptions();
@@ -326,11 +335,6 @@
 					this.rkckOptions = res.data
 				});
 			},
-			getrkckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
-					this.rkckOptions = res.data
-				});
-			},
 			getckckOptions(){
 				previewDataInterface('681758216954053893').then(res => {
 					this.ckckOptions = res.data
@@ -343,9 +347,16 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
-					this.skzhOptions = res.data.list
-				});
+				return getAccountSelector()
+					.then(res => {
+						const raw = res && res.data
+						let list = raw && raw.list != null ? raw.list : null
+						if (list == null && Array.isArray(raw)) list = raw
+						this.skzhOptions = Array.isArray(list) ? list : []
+					})
+					.catch(() => {
+						this.skzhOptions = []
+					})
 			},
 			getgysOptions() {
 				return request({
@@ -419,10 +430,12 @@
                 this.visible = true;
                 this.isDetail = isDetail || false;
 				this.currentSerialRowIndex = -1;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-			if (this.dataForm.id) {
-					request({
+				this.$nextTick(async () => {
+					if (this.$refs['elForm']) this.$refs['elForm'].resetFields();
+					// 弹窗打开后再拉一次账户，避免 v-if 首屏竞态导致 skzhOptions 为空或 undefined
+					await this.getskzhOptions();
+					if (this.dataForm.id) {
+						request({
 						url: '/api/Extend/WtXsckd/' + this.dataForm.id,
 						method: 'get'
 					}).then(res =>{
@@ -462,7 +475,7 @@
 						this.updateTotalAmount();
 						this.reloadInboundOrdersForExistingRows();
 					})
-				} else {
+					} else {
 					this.dataForm.wtXsckdMxList = [];
 					// 预生成单据编号
 					request({
@@ -474,7 +487,7 @@
 							this.dataForm.id = res.data.billNo;
 						}
 					}).catch(() => {});
-				}
+					}
 				})
 			},
 			dataFormSubmit() {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue
index 4dbb6e4..cedc4e0 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue
@@ -184,9 +184,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtCgthdDetailView',
@@ -291,7 +291,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.ckckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 		}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue
index 2484251..312b035 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue
@@ -146,11 +146,11 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -225,7 +225,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/Form.vue
index 203c7ca..47e4c52 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/Form.vue
@@ -121,6 +121,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -181,17 +182,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/index.vue
index 24315bd..a35060c 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj/index.vue
@@ -85,10 +85,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -138,12 +138,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/Form.vue
index d438418..508661d 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/Form.vue
@@ -127,6 +127,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -193,17 +194,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/index.vue
index 0320c40..bf5b9b8 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfyfs/index.vue
@@ -90,10 +90,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -145,12 +145,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/Form.vue
index 65507e4..f9c751f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/Form.vue
@@ -121,6 +121,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -182,17 +183,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/index.vue
index 88eb6fe..7593f27 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_dtfytx/index.vue
@@ -89,10 +89,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -142,12 +142,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
index 3319300..552e914 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/Form.vue
@@ -128,6 +128,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -190,17 +191,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
index 873684b..49b2716 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/detail-view.vue
@@ -124,6 +124,7 @@ import request from '@/utils/request'
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
   name: 'WtCwdjFkdDetailView',
@@ -216,7 +217,7 @@ export default {
       previewDataInterface('716168694526379269').then(res => {
         this.wldwOptions = res.data || []
       })
-      getDictionaryDataSelector('681761709836207365').then(res => {
+      getAccountSelector().then(res => {
         this.zhbhOptions = res.data.list || []
       })
       getDictionaryDataSelector('715562947862070533').then(res => {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
index cb8e4d5..cf8863d 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fkd/index.vue
@@ -91,11 +91,11 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -146,12 +146,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/Form.vue
index d4c9b2e..53a9079 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/Form.vue
@@ -134,6 +134,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -195,17 +196,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/index.vue
index ec427f5..6228ed6 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_fyd/index.vue
@@ -107,10 +107,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -162,12 +162,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/Form.vue
index aa09c7e..bcbb150 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/Form.vue
@@ -121,6 +121,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -182,17 +183,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/index.vue
index cc0ab23..b063649 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcbm/index.vue
@@ -89,10 +89,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -142,12 +142,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/Form.vue
index a92aa41..c81a4da 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/Form.vue
@@ -127,6 +127,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -193,17 +194,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/index.vue
index 35f0865..6bbaab3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzcgm/index.vue
@@ -90,10 +90,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -145,12 +145,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/Form.vue
index 2978ba4..8e34a37 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/Form.vue
@@ -121,6 +121,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -182,17 +183,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/index.vue
index 8dfe0ef..c4fa902 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_gdzczj/index.vue
@@ -89,10 +89,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -142,12 +142,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
index 65e5ab9..8bf01be 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/Form.vue
@@ -128,6 +128,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -190,17 +191,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/detail-view.vue
index f7860b8..6fdaa93 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/detail-view.vue
@@ -124,6 +124,7 @@ import request from '@/utils/request'
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
   name: 'WtCwdjSkdDetailView',
@@ -216,7 +217,7 @@ export default {
       previewDataInterface('716168694526379269').then(res => {
         this.wldwOptions = res.data || []
       })
-      getDictionaryDataSelector('681761709836207365').then(res => {
+      getAccountSelector().then(res => {
         this.zhbhOptions = res.data.list || []
       })
       getDictionaryDataSelector('715562947862070533').then(res => {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
index a3cab58..85fd71b 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCwdj_skd/index.vue
@@ -91,11 +91,11 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -146,12 +146,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/Form.vue
index e86dfbc..3db5b26 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/Form.vue
@@ -86,8 +86,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -132,7 +132,7 @@
 				});
 			},
 			getjszhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.jszhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/index.vue
index 3142424..16d95b5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtFkd/index.vue
@@ -121,10 +121,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -184,7 +184,7 @@
 				});
 			},
 			getjszhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.jszhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
index fffc923..2db33d3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/Form.vue
@@ -287,10 +287,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -607,7 +607,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
index 23c3d77..cac5043 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHzd/index.vue
@@ -144,10 +144,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -218,7 +218,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtMrsz/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtMrsz/index.vue
index a864328..f37371f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtMrsz/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtMrsz/index.vue
@@ -32,8 +32,8 @@
 
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 
 	export default {
 		name: 'wtMrsz',
@@ -72,7 +72,7 @@
 				}).catch(() => {})
 
 				// 收款账户（字典数据，与销售出库单一致）
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data && res.data.list ? res.data.list : []
 				}).catch(() => {})
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/Form.vue
index 43f332b..a7766cc 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/Form.vue
@@ -282,10 +282,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -606,7 +606,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/index.vue
index 25d69ea..1ef0d16 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPdd/index.vue
@@ -144,10 +144,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -218,7 +218,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPurchaseSummary/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPurchaseSummary/index.vue
index 23f0c0a..b9b315c 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPurchaseSummary/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtPurchaseSummary/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="purchase-summary-page">
-    <div class="form-section">
-      <el-form :inline="false" :model="filters" label-width="90px" size="small">
-        <el-row :gutter="10">
-          <el-col :span="12">
+  <div class="NCC-common-layout">
+    <div class="NCC-common-layout-center">
+      <el-row class="NCC-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
             <el-form-item label="查询日期">
               <el-date-picker
                 v-model="filters.dateRange"
@@ -13,10 +13,11 @@
                 end-placeholder="结束日期"
                 style="width: 100%"
                 value-format="yyyy-MM-dd"
+                clearable
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="往来单位">
               <el-select
                 v-model="filters.contactUnit"
@@ -36,8 +37,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="经 手 人">
+          <el-col :span="6">
+            <el-form-item label="经手人">
               <el-select
                 v-model="filters.agent"
                 multiple
@@ -49,36 +50,43 @@
               >
                 <el-option
                   v-for="item in agentOptions"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="商品">
               <el-select
-                v-model="filters.productName"
+                v-model="filters.productSpId"
                 filterable
                 remote
                 clearable
                 reserve-keyword
+                popper-class="wt-purchase-sum-product-dropdown"
                 :remote-method="handleProductSearch"
                 :loading="productLoading"
-                placeholder="请输入商品编号或名称搜索"
+                placeholder="输入商品编码或名称搜索"
                 style="width: 100%"
               >
                 <el-option
                   v-for="item in productOptions"
-                  :key="item.F_Id || item.id || item.spbm || item.productCode"
+                  :key="item.F_Id || item.id"
                   :label="formatProductLabel(item)"
-                  :value="formatProductLabel(item)"
-                />
+                  :value="item.F_Id || item.id"
+                >
+                  <div class="product-opt-row cell-nowrap" :title="formatProductLabel(item)">
+                    <span v-if="productCodeRaw(item)" class="product-opt-code">{{ productCodeRaw(item) }}</span>
+                    <span v-if="productCodeRaw(item) && productNameRaw(item)" class="product-opt-sep">|</span>
+                    <span class="product-opt-name">{{ productNameRaw(item) || '无' }}</span>
+                  </div>
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="入库仓库">
               <el-select
                 v-model="filters.warehouse"
@@ -98,7 +106,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="单据类型">
               <el-select
                 v-model="filters.billType"
@@ -106,7 +114,7 @@
                 collapse-tags
                 clearable
                 style="width: 100%"
-                placeholder="全部单据"
+                placeholder="全部相关单据"
               >
                 <el-option
                   v-for="item in billTypeOptions"
@@ -117,65 +125,220 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <div class="action-row">
-              <el-button type="primary" size="mini" @click="handleSearch">搜索</el-button>
-              <el-button size="mini" @click="handleReset">重置</el-button>
-            </div>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="handleReset">重置</el-button>
+            </el-form-item>
           </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="table-section">
-      <div class="table-title-bar">
-        <i class="el-icon-document" style="font-size: 20px; margin-right: 6px; color: #409eff" />
-        <span>商品采购汇总表 · 过往采购记录</span>
-      </div>
-      <div class="table-scroll">
+        </el-form>
+      </el-row>
+
+      <div class="NCC-common-layout-main NCC-flex-main">
+        <div class="NCC-common-head purchase-sum-head">
+          <div>
+            <span class="purchase-sum-head__title">
+              <i class="el-icon-s-data purchase-sum-head__icon" aria-hidden="true" />
+              商品采购汇总（分类 → 品牌 → 商品明细分类 → 采购明细）
+            </span>
+          </div>
+          <div class="NCC-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link
+                icon="icon-ym icon-ym-Refresh NCC-common-head-icon"
+                :underline="false"
+                @click="handleSearch"
+              />
+            </el-tooltip>
+            <screenfull isContainer />
+          </div>
+        </div>
+
         <el-table
-          :data="list"
+          v-loading="categoryLoading"
+          :data="categoryList"
           border
-          style="width: 100%"
-          :header-cell-style="{ background: '#f5f7fa' }"
-          class="purchase-record-table"
+          class="purchase-tree-table"
+          :row-key="r => String(r['分类Id'])"
+          @expand-change="onCategoryExpand"
         >
-          <el-table-column type="index" label="行号" width="56" :index="indexMethod" fixed />
-          <el-table-column prop="单据日期" label="单据日期" width="110" show-overflow-tooltip />
-          <el-table-column prop="单据编号" label="单据编号" min-width="160" show-overflow-tooltip />
-          <el-table-column prop="单据类型" label="单据类型" width="120" show-overflow-tooltip />
-          <el-table-column prop="往来单位" label="往来单位" min-width="140" show-overflow-tooltip />
-          <el-table-column prop="经手人" label="经手人" width="100" show-overflow-tooltip />
-          <el-table-column prop="仓库名称" label="仓库名称" min-width="120" show-overflow-tooltip />
-          <el-table-column prop="商品名称" label="商品名称" min-width="160" show-overflow-tooltip />
-          <el-table-column prop="数量" label="数量" width="90" align="right">
-            <template slot-scope="scope">
-              {{ formatQty(scope.row['数量']) }}
+          <el-table-column type="expand" width="48">
+            <template slot-scope="catScope">
+              <div v-loading="brandLoading[categoryRowKey(catScope.row)]" class="nested-wrap">
+                <el-table
+                  :data="brandMap[categoryRowKey(catScope.row)] || []"
+                  border
+                  size="small"
+                  class="nested-table"
+                  :row-key="r => brandRowKey(catScope.row, r)"
+                  @expand-change="(r, er) => onBrandExpand(catScope.row, r, er)"
+                >
+                  <el-table-column type="expand" width="44">
+                    <template slot-scope="brandScope">
+                      <div v-loading="productLoading[brandRowKey(catScope.row, brandScope.row)]" class="nested-wrap">
+                        <el-table
+                          :data="productMap[brandRowKey(catScope.row, brandScope.row)] || []"
+                          border
+                          size="small"
+                          class="nested-table nested-table--deep"
+                          :row-key="r => productRowKey(catScope.row, brandScope.row, r)"
+                          @expand-change="(r, er) => onProductExpand(catScope.row, brandScope.row, r, er)"
+                        >
+                          <el-table-column type="expand" width="42">
+                            <template slot-scope="prodScope">
+                              <div v-loading="lineLoading[lineKey(catScope.row, brandScope.row, prodScope.row)]" class="nested-wrap detail-wrap">
+                                <el-table
+                                  :data="(lineMap[lineKey(catScope.row, brandScope.row, prodScope.row)] || {}).list || []"
+                                  border
+                                  size="mini"
+                                  class="nested-table"
+                                >
+                                  <el-table-column type="index" label="行号" width="52" align="center" />
+                                  <el-table-column prop="单据日期" label="单据日期" width="108" show-overflow-tooltip sortable :sort-method="sortTextCol('单据日期')" />
+                                  <el-table-column prop="单据编号" label="单据编号" min-width="140" show-overflow-tooltip sortable :sort-method="sortTextCol('单据编号')" />
+                                  <el-table-column prop="单据类型" label="单据类型" width="108" show-overflow-tooltip sortable :sort-method="sortTextCol('单据类型')" />
+                                  <el-table-column prop="往来单位" label="往来单位" min-width="120" show-overflow-tooltip sortable :sort-method="sortTextCol('往来单位')" />
+                                  <el-table-column prop="经手人" label="经手人" width="88" show-overflow-tooltip sortable :sort-method="sortTextCol('经手人')" />
+                                  <el-table-column prop="仓库名称" label="仓库名称" min-width="100" show-overflow-tooltip sortable :sort-method="sortTextCol('仓库名称')" />
+                                  <el-table-column prop="商品名称" label="商品名称" min-width="140" show-overflow-tooltip sortable :sort-method="sortTextCol('商品名称')" />
+                                  <el-table-column prop="数量" label="数量" width="88" align="right" sortable :sort-method="sortNumCol('数量')">
+                                    <template slot-scope="s">{{ formatQty(s.row['数量']) }}</template>
+                                  </el-table-column>
+                                  <el-table-column prop="入库单价" label="入库单价" width="100" align="right" sortable :sort-method="sortNumCol('入库单价')">
+                                    <template slot-scope="s">{{ formatMoney(s.row['入库单价']) }}</template>
+                                  </el-table-column>
+                                  <el-table-column prop="采购金额" label="采购金额" width="108" align="right" sortable :sort-method="sortNumCol('采购金额')">
+                                    <template slot-scope="s">{{ formatMoney(s.row['采购金额']) }}</template>
+                                  </el-table-column>
+                                </el-table>
+                                <div v-if="linePager[lineKey(catScope.row, brandScope.row, prodScope.row)]" class="mini-pager">
+                                  <el-pagination
+                                    small
+                                    layout="prev, pager, next, total"
+                                    :total="linePager[lineKey(catScope.row, brandScope.row, prodScope.row)].total"
+                                    :page-size="linePager[lineKey(catScope.row, brandScope.row, prodScope.row)].pageSize"
+                                    :current-page="linePager[lineKey(catScope.row, brandScope.row, prodScope.row)].currentPage"
+                                    @current-change="p => fetchLines(catScope.row, brandScope.row, prodScope.row, p)"
+                                  />
+                                </div>
+                              </div>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="商品编号" min-width="100" show-overflow-tooltip sortable :sort-method="sortTextCol('商品编号')">
+                            <template slot-scope="s">
+                              <i class="el-icon-postcard row-ico row-ico--primary" />
+                              {{ cellText(s.row['商品编号']) }}
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="明细分类" min-width="120" show-overflow-tooltip sortable :sort-method="sortTextCol('明细分类')">
+                            <template slot-scope="s">
+                              <i class="el-icon-collection-tag row-ico row-ico--info" />
+                              {{ cellText(s.row['明细分类']) }}
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="商品名称" min-width="140" show-overflow-tooltip sortable :sort-method="sortTextCol('商品名称')">
+                            <template slot-scope="s">
+                              <i class="el-icon-goods row-ico row-ico--muted" />
+                              {{ cellText(s.row['商品名称']) }}
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="数量" width="88" align="right" sortable :sort-method="sortNumCol('数量')">
+                            <template slot-scope="s">{{ formatQty(s.row['数量']) }}</template>
+                          </el-table-column>
+                          <el-table-column label="入库单价" width="100" align="right" sortable :sort-method="sortNumCol('入库单价')">
+                            <template slot-scope="s">{{ formatMoney(s.row['入库单价']) }}</template>
+                          </el-table-column>
+                          <el-table-column label="采购金额" width="108" align="right" sortable :sort-method="sortNumCol('采购金额')">
+                            <template slot-scope="s">{{ formatMoney(s.row['采购金额']) }}</template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="品牌" min-width="140" show-overflow-tooltip sortable :sort-method="sortTextCol('品牌名称')">
+                    <template slot-scope="s">
+                      <i class="el-icon-medal row-ico row-ico--primary" />
+                      {{ cellText(s.row['品牌名称'] || s.row['商品名称']) }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="数量" width="88" align="right" sortable :sort-method="sortNumCol('数量')">
+                    <template slot-scope="s">{{ formatQty(s.row['数量']) }}</template>
+                  </el-table-column>
+                  <el-table-column label="入库单价" width="100" align="right" sortable :sort-method="sortNumCol('入库单价')">
+                    <template slot-scope="s">{{ formatMoney(s.row['入库单价']) }}</template>
+                  </el-table-column>
+                  <el-table-column label="采购金额" width="108" align="right" sortable :sort-method="sortNumCol('采购金额')">
+                    <template slot-scope="s">{{ formatMoney(s.row['采购金额']) }}</template>
+                  </el-table-column>
+                </el-table>
+                <div v-if="!(brandMap[categoryRowKey(catScope.row)] || []).length && !brandLoading[categoryRowKey(catScope.row)]" class="nested-empty">暂无品牌数据</div>
+              </div>
             </template>
           </el-table-column>
-          <el-table-column prop="入库单价" label="入库单价" width="110" align="right">
+          <el-table-column type="index" label="行号" width="56" align="center" />
+          <el-table-column label="分类名称" min-width="160" show-overflow-tooltip sortable :sort-method="sortTextCol('分类名称')">
             <template slot-scope="scope">
-              {{ formatMoney(scope.row['入库单价']) }}
+              <i class="el-icon-folder-opened row-ico row-ico--primary" />
+              {{ cellText(scope.row['分类名称']) }}
             </template>
           </el-table-column>
-          <el-table-column prop="采购金额" label="采购金额" width="120" align="right">
+          <el-table-column label="数量" width="96" align="right" sortable :sort-method="sortNumCol('数量')">
+            <template slot-scope="scope">{{ formatQty(scope.row['数量']) }}</template>
+          </el-table-column>
+          <el-table-column label="入库单价" width="104" align="right" sortable :sort-method="sortNumCol('入库单价')">
+            <template slot-scope="scope">{{ formatMoney(scope.row['入库单价']) }}</template>
+          </el-table-column>
+          <el-table-column label="采购金额" width="112" align="right" sortable :sort-method="sortNumCol('采购金额')">
+            <template slot-scope="scope">{{ formatMoney(scope.row['采购金额']) }}</template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" align="left" fixed="right">
             <template slot-scope="scope">
-              {{ formatMoney(scope.row['采购金额']) }}
+              <el-button type="text" size="mini" icon="el-icon-tickets" @click.stop="openLinearDialog(scope.row)">线性列表</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <div class="pager-wrap">
-          <el-pagination
-            :current-page="pagination.currentPage"
-            :page-sizes="[50, 100, 200, 500]"
-            :page-size="pagination.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="pagination.total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+
+        <div v-if="categoryList.length" class="purchase-sum-footer">
+          <i class="el-icon-s-data row-ico--primary" />
+          <span>合计（当前分类列表）</span>
+          <span class="sum-item">数量：{{ formatQty(sumCategoryQty) }}</span>
+          <span class="sum-item">采购金额：{{ formatMoney(sumCategoryAmt) }}</span>
         </div>
       </div>
     </div>
+
+    <el-dialog
+      title="线性列表 — 分类下全部采购明细"
+      :visible.sync="linearVisible"
+      width="1180px"
+      top="5vh"
+      append-to-body
+      class="NCC-dialog NCC-dialog_center"
+      @close="linearRows = []"
+    >
+      <div v-loading="linearLoading" class="linear-dialog-body">
+        <p class="linear-hint">{{ linearHint }}</p>
+        <el-table :data="linearRows" border size="small" max-height="520" class="linear-table">
+          <el-table-column type="index" label="行号" width="52" />
+          <el-table-column prop="单据日期" label="单据日期" width="100" show-overflow-tooltip sortable :sort-method="sortTextCol('单据日期')" />
+          <el-table-column prop="单据编号" label="单据编号" min-width="130" show-overflow-tooltip sortable :sort-method="sortTextCol('单据编号')" />
+          <el-table-column prop="单据类型" label="单据类型" width="100" show-overflow-tooltip />
+          <el-table-column prop="往来单位" label="往来单位" min-width="110" show-overflow-tooltip />
+          <el-table-column prop="经手人" label="经手人" width="80" show-overflow-tooltip />
+          <el-table-column prop="仓库名称" label="仓库名称" min-width="96" show-overflow-tooltip />
+          <el-table-column prop="商品名称" label="商品名称" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="数量" label="数量" width="80" align="right" sortable :sort-method="sortNumCol('数量')">
+            <template slot-scope="s">{{ formatQty(s.row['数量']) }}</template>
+          </el-table-column>
+          <el-table-column prop="入库单价" label="入库单价" width="92" align="right">
+            <template slot-scope="s">{{ formatMoney(s.row['入库单价']) }}</template>
+          </el-table-column>
+          <el-table-column prop="采购金额" label="采购金额" width="100" align="right" sortable :sort-method="sortNumCol('采购金额')">
+            <template slot-scope="s">{{ formatMoney(s.row['采购金额']) }}</template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -183,37 +346,84 @@
 import request from '@/utils/request'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 
+const DEFAULT_BILL_TYPES = ['采购入库单', '采购退货单']
+
 export default {
   name: 'PurchaseSummary',
-
   data() {
     return {
-      list: [],
-      billTypeOptions: ['采购入库单', '采购退货单'],
+      categoryList: [],
+      categoryLoading: false,
+      brandMap: {},
+      brandLoading: {},
+      productMap: {},
+      productLoading: {},
+      lineMap: {},
+      linePager: {},
+      lineLoading: {},
+      billTypeOptions: [...DEFAULT_BILL_TYPES],
       filters: {
         dateRange: [],
         contactUnit: [],
         agent: [],
-        productName: '',
+        productSpId: '',
         warehouse: [],
-        billType: ['采购入库单', '采购退货单']
+        billType: [...DEFAULT_BILL_TYPES]
       },
       contactUnitOptions: [],
       agentOptions: [],
       warehouseOptions: [],
       productOptions: [],
       productLoading: false,
-      pagination: {
-        currentPage: 1,
-        pageSize: 100,
-        total: 0
-      }
+      linearVisible: false,
+      linearLoading: false,
+      linearRows: [],
+      linearHint: ''
     }
   },
-
+  computed: {
+    sumCategoryQty() {
+      return this.categoryList.reduce((s, r) => s + this.parseNum(r['数量']), 0)
+    },
+    sumCategoryAmt() {
+      return this.categoryList.reduce((s, r) => s + this.parseNum(r['采购金额']), 0)
+    }
+  },
+  created() {
+    this.loadFilterOptions()
+    this.fetchCategories()
+  },
   methods: {
-    indexMethod(index) {
-      return (this.pagination.currentPage - 1) * this.pagination.pageSize + index + 1
+    categoryRowKey(row) {
+      return String(row['分类Id'] != null ? row['分类Id'] : '')
+    },
+    brandRowKey(catRow, brandRow) {
+      return `${this.categoryRowKey(catRow)}|${String(brandRow['品牌Id'] != null ? brandRow['品牌Id'] : '')}`
+    },
+    productRowKey(catRow, brandRow, prodRow) {
+      return `${this.brandRowKey(catRow, brandRow)}|${String(prodRow['商品Id'] != null ? prodRow['商品Id'] : '')}`
+    },
+    lineKey(catRow, brandRow, prodRow) {
+      return this.productRowKey(catRow, brandRow, prodRow)
+    },
+    parseNum(val) {
+      if (val == null || val === '') return 0
+      const n = Number(String(val).replace(/,/g, '').trim())
+      return Number.isFinite(n) ? n : 0
+    },
+    sortNumCol(prop) {
+      return (a, b) => this.parseNum(a[prop]) - this.parseNum(b[prop])
+    },
+    sortTextCol(prop) {
+      return (a, b) => {
+        const sa = String(a[prop] != null ? a[prop] : '').trim()
+        const sb = String(b[prop] != null ? b[prop] : '').trim()
+        return sa.localeCompare(sb, 'zh-CN')
+      }
+    },
+    cellText(v) {
+      if (v == null || String(v).trim() === '') return '无'
+      return String(v)
     },
     formatQty(val) {
       if (val === null || val === undefined || val === '') return '无'
@@ -227,6 +437,62 @@ export default {
       if (Number.isNaN(n)) return String(val)
       return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 4 })
     },
+    /** 商品编码（空则返回空串，便于单行展示） */
+    productCodeRaw(item) {
+      if (!item) return ''
+      const c =
+        item.F_Spbm ||
+        item.spbm ||
+        item.Spbm ||
+        item.商品编号 ||
+        item.code ||
+        ''
+      const t = c != null && String(c).trim() !== '' ? String(c).trim() : ''
+      return t
+    },
+    /** 商品名称 */
+    productNameRaw(item) {
+      if (!item) return ''
+      const n =
+        item.F_Spmc ||
+        item.spmc ||
+        item.Spmc ||
+        item.productName ||
+        item.商品名称 ||
+        item.name ||
+        ''
+      const t = n != null && String(n).trim() !== '' ? String(n).trim() : ''
+      return t
+    },
+    /** 选中后在输入框内显示的完整文案（编码 + 名称） */
+    formatProductLabel(item) {
+      if (!item) return ''
+      const code = this.productCodeRaw(item)
+      const name = this.productNameRaw(item)
+      if (code && name) return `${code} | ${name}`
+      if (name) return name
+      if (code) return code
+      const id = item.F_Id || item.id
+      return id ? String(id) : '无'
+    },
+    buildBasePayload() {
+      const payload = {}
+      if (this.filters.dateRange && this.filters.dateRange.length === 2) {
+        payload.startDate = this.filters.dateRange[0]
+        payload.endDate = this.filters.dateRange[1]
+      }
+      if (this.filters.contactUnit.length) payload.contactUnit = this.filters.contactUnit.join(',')
+      if (this.filters.agent.length) payload.agent = this.filters.agent.join(',')
+      if (this.filters.warehouse.length) payload.warehouse = this.filters.warehouse.join(',')
+      if (this.filters.productSpId) payload.productSpId = this.filters.productSpId
+      const bt = this.filters.billType || []
+      if (bt.length > 0 && bt.length < this.billTypeOptions.length) {
+        payload.billType = bt.join(',')
+      } else {
+        payload.billType = ''
+      }
+      return payload
+    },
     async loadFilterOptions() {
       try {
         const companyRes = await request({
@@ -255,9 +521,12 @@ export default {
 
         const userRes = await previewDataInterface('675937572047815941')
         const userList = userRes.data || []
-        this.agentOptions = Array.from(
-          new Set(userList.map(x => x.realName || x.F_RealName || x.fullName).filter(Boolean))
-        )
+        this.agentOptions = (userList || [])
+          .map(x => ({
+            label: x.realName || x.F_RealName || x.fullName || x.name || x.F_Account || x.account || '',
+            value: x.id || x.F_Id || x.userId
+          }))
+          .filter(x => x.value && x.label)
       } catch (e) {
         console.error('采购汇总筛选下拉加载失败', e)
       }
@@ -270,7 +539,7 @@ export default {
       this.productLoading = true
       try {
         const res = await request({
-          url: '/api/Extend/WtSp',
+          url: '/api/Extend/WtSp/GetListByKeyword',
           method: 'GET',
           data: { pageSize: 200, currentPage: 1, keyword: query }
         })
@@ -281,138 +550,320 @@ export default {
         this.productLoading = false
       }
     },
-    formatProductLabel(item) {
-      if (!item) return ''
-      const code = item.spbm || item.productCode || item.商品编号 || item.code || item.F_Id || item.id || ''
-      const name = item.F_Spmc || item.productName || item.商品名称 || item.name || ''
-      return [code, name].filter(Boolean).join(' ')
+    clearTreeCaches() {
+      this.brandMap = {}
+      this.brandLoading = {}
+      this.productMap = {}
+      this.productLoading = {}
+      this.lineMap = {}
+      this.linePager = {}
+      this.lineLoading = {}
     },
-    buildQueryPayload() {
-      const payload = {}
-      if (this.filters.dateRange && this.filters.dateRange.length === 2) {
-        payload.startDate = this.filters.dateRange[0]
-        payload.endDate = this.filters.dateRange[1]
+    fetchCategories() {
+      this.categoryLoading = true
+      this.clearTreeCaches()
+      request({
+        url: '/api/Extend/WtXsckd/Actions/GetPurchaseSummaryByCategory',
+        method: 'GET',
+        data: this.buildBasePayload()
+      })
+        .then(res => {
+          const rows = Array.isArray(res.data) ? res.data : (res.data && res.data.list) || []
+          this.categoryList = rows
+        })
+        .catch(() => {
+          this.categoryList = []
+        })
+        .finally(() => {
+          this.categoryLoading = false
+        })
+    },
+    onCategoryExpand(row, expandedRows) {
+      const id = String(row['分类Id'])
+      if (expandedRows.some(r => String(r['分类Id']) === id)) {
+        this.loadBrands(row)
       }
-      if (this.filters.productName) payload.product = this.filters.productName
-      if (this.filters.contactUnit.length) payload.contactUnit = this.filters.contactUnit.join(',')
-      if (this.filters.agent.length) payload.agent = this.filters.agent.join(',')
-      if (this.filters.warehouse.length) payload.warehouse = this.filters.warehouse.join(',')
-
-      if (this.filters.billType.length > 0 && this.filters.billType.length < this.billTypeOptions.length) {
-        payload.billType = this.filters.billType.join(',')
-      } else {
-        payload.billType = ''
+    },
+    loadBrands(catRow) {
+      const k = this.categoryRowKey(catRow)
+      if (this.brandMap[k] !== undefined || this.brandLoading[k]) return
+      this.$set(this.brandLoading, k, true)
+      const cid = String(catRow['分类Id'] != null ? catRow['分类Id'] : '')
+      request({
+        url: '/api/Extend/WtXsckd/Actions/GetPurchaseSummaryByBrand',
+        method: 'GET',
+        data: { ...this.buildBasePayload(), categoryId: cid }
+      })
+        .then(res => {
+          const rows = Array.isArray(res.data) ? res.data : (res.data && res.data.list) || []
+          this.$set(this.brandMap, k, rows)
+        })
+        .catch(() => {
+          this.$set(this.brandMap, k, [])
+        })
+        .finally(() => {
+          this.$set(this.brandLoading, k, false)
+        })
+    },
+    onBrandExpand(catRow, brandRow, expandedRows) {
+      if (expandedRows.some(r => this.brandRowKey(catRow, r) === this.brandRowKey(catRow, brandRow))) {
+        this.loadProducts(catRow, brandRow)
       }
-      payload.currentPage = this.pagination.currentPage
-      payload.pageSize = this.pagination.pageSize
-      return payload
     },
-    handleSearch() {
-      this.pagination.currentPage = 1
-      this.fetchData()
+    loadProducts(catRow, brandRow) {
+      const k = this.brandRowKey(catRow, brandRow)
+      if (this.productMap[k] !== undefined || this.productLoading[k]) return
+      this.$set(this.productLoading, k, true)
+      const cid = String(catRow['分类Id'] != null ? catRow['分类Id'] : '')
+      const bid = String(brandRow['品牌Id'] != null ? brandRow['品牌Id'] : '')
+      request({
+        url: '/api/Extend/WtXsckd/Actions/GetPurchaseSummaryByProductAgg',
+        method: 'GET',
+        data: { ...this.buildBasePayload(), categoryId: cid, brandId: bid }
+      })
+        .then(res => {
+          const rows = Array.isArray(res.data) ? res.data : (res.data && res.data.list) || []
+          this.$set(this.productMap, k, rows)
+        })
+        .catch(() => {
+          this.$set(this.productMap, k, [])
+        })
+        .finally(() => {
+          this.$set(this.productLoading, k, false)
+        })
     },
-    fetchData() {
-      const payload = this.buildQueryPayload()
+    onProductExpand(catRow, brandRow, prodRow, expandedRows) {
+      if (expandedRows.some(r => this.productRowKey(catRow, brandRow, r) === this.productRowKey(catRow, brandRow, prodRow))) {
+        this.initLinePager(catRow, brandRow, prodRow)
+        this.fetchLines(catRow, brandRow, prodRow, 1)
+      }
+    },
+    initLinePager(catRow, brandRow, prodRow) {
+      const lk = this.lineKey(catRow, brandRow, prodRow)
+      if (!this.linePager[lk]) {
+        this.$set(this.linePager, lk, { currentPage: 1, pageSize: 50, total: 0 })
+      }
+    },
+    fetchLines(catRow, brandRow, prodRow, page) {
+      const lk = this.lineKey(catRow, brandRow, prodRow)
+      this.initLinePager(catRow, brandRow, prodRow)
+      const pager = this.linePager[lk]
+      pager.currentPage = page || 1
+      this.$set(this.lineLoading, lk, true)
+      const cid = String(catRow['分类Id'] != null ? catRow['分类Id'] : '')
+      const bid = String(brandRow['品牌Id'] != null ? brandRow['品牌Id'] : '')
+      const pid = String(prodRow['商品Id'] != null ? prodRow['商品Id'] : '')
       request({
-        url: `/api/Extend/WtXsckd/Actions/GetPurchaseSummary`,
+        url: '/api/Extend/WtXsckd/Actions/GetPurchaseSummary',
         method: 'GET',
-        data: payload
-      }).then(res => {
-        const body = res.data
-        if (body && typeof body === 'object' && !Array.isArray(body) && body.list !== undefined) {
-          this.list = body.list || []
-          this.pagination.total = body.total != null ? Number(body.total) : 0
-        } else if (Array.isArray(body)) {
-          this.list = body
-          this.pagination.total = body.length
-        } else {
-          this.list = []
-          this.pagination.total = 0
+        data: {
+          ...this.buildBasePayload(),
+          categoryId: cid,
+          brandId: bid,
+          productSpId: pid,
+          currentPage: pager.currentPage,
+          pageSize: pager.pageSize
         }
       })
+        .then(res => {
+          const body = res.data
+          let list = []
+          let total = 0
+          if (body && typeof body === 'object' && !Array.isArray(body) && body.list !== undefined) {
+            list = body.list || []
+            total = body.total != null ? Number(body.total) : 0
+          } else if (Array.isArray(body)) {
+            list = body
+            total = body.length
+          }
+          this.$set(this.lineMap, lk, { list })
+          this.$set(this.linePager[lk], 'total', total)
+        })
+        .catch(() => {
+          this.$set(this.lineMap, lk, { list: [] })
+        })
+        .finally(() => {
+          this.$set(this.lineLoading, lk, false)
+        })
     },
-    handleSizeChange(size) {
-      this.pagination.pageSize = size
-      this.pagination.currentPage = 1
-      this.fetchData()
+    openLinearDialog(catRow) {
+      const cid = String(catRow['分类Id'] != null ? catRow['分类Id'] : '')
+      const cname = this.cellText(catRow['分类名称'])
+      this.linearHint = `分类：${cname}（最多展示 2000 条，与当前筛选条件一致）`
+      this.linearVisible = true
+      this.linearLoading = true
+      this.linearRows = []
+      request({
+        url: '/api/Extend/WtXsckd/Actions/GetPurchaseSummaryLinear',
+        method: 'GET',
+        data: { ...this.buildBasePayload(), categoryId: cid }
+      })
+        .then(res => {
+          this.linearRows = Array.isArray(res.data) ? res.data : (res.data && res.data.list) || []
+        })
+        .catch(() => {
+          this.linearRows = []
+        })
+        .finally(() => {
+          this.linearLoading = false
+        })
     },
-    handleCurrentChange(page) {
-      this.pagination.currentPage = page
-      this.fetchData()
+    handleSearch() {
+      this.fetchCategories()
     },
     handleReset() {
       this.filters = {
         dateRange: [],
         contactUnit: [],
         agent: [],
-        productName: '',
+        productSpId: '',
         warehouse: [],
-        billType: [...this.billTypeOptions]
+        billType: [...DEFAULT_BILL_TYPES]
       }
-      this.pagination.currentPage = 1
-      this.fetchData()
+      this.productOptions = []
+      this.fetchCategories()
     }
-  },
-  created() {
-    this.loadFilterOptions()
-    this.fetchData()
   }
 }
 </script>
 
-<style scoped>
-.purchase-summary-page {
-  width: 100%;
-  min-height: 100%;
-  background: #f9f9f9;
-  padding: 10px 20px;
-  box-sizing: border-box;
+<style lang="scss" scoped>
+.purchase-sum-head {
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.purchase-sum-head__title {
+  font-size: 15px;
+  font-weight: 600;
+  color: #303133;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
 }
 
-.form-section {
-  background: #fff;
-  border-radius: 6px;
-  padding: 10px 10px 0 10px;
-  margin-bottom: 10px;
+.purchase-sum-head__icon {
+  color: #409eff;
+  font-size: 18px;
+}
+
+.purchase-tree-table {
+  ::v-deep .el-table .cell {
+    white-space: nowrap;
+  }
+}
+
+.nested-wrap {
+  padding: 8px 8px 8px 24px;
+  background: #fafbfc;
 }
 
-.table-section {
-  background: #fff;
-  border-radius: 6px;
-  padding: 12px 12px 10px 12px;
-  margin: 0;
+.nested-table {
   width: 100%;
-  box-sizing: border-box;
 }
 
-.action-row {
-  display: flex;
-  justify-content: flex-start;
-  gap: 8px;
-  padding: 4px 0 10px;
+.nested-table--deep ::v-deep .el-table__body-wrapper {
+  max-height: 320px;
+  overflow-y: auto;
 }
 
-.table-title-bar {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 10px;
+.detail-wrap {
+  min-width: 720px;
+}
+
+.mini-pager {
+  margin-top: 8px;
+  text-align: left;
+}
+
+.nested-empty {
+  padding: 12px;
+  color: #909399;
+  font-size: 13px;
+}
+
+.row-ico {
+  margin-right: 4px;
+}
+
+.row-ico--primary {
+  color: #409eff;
+}
+
+.row-ico--info {
+  color: #909399;
+}
+
+.row-ico--muted {
+  color: #c0c4cc;
+}
+
+.purchase-sum-footer {
+  margin-top: 12px;
+  padding: 10px 12px;
+  background: #f5f7fa;
+  border-radius: 8px;
+  font-size: 13px;
+  color: #606266;
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
-  gap: 12px;
+  gap: 16px;
 }
 
-.table-scroll {
-  max-height: calc(100vh - 300px);
-  overflow-y: auto;
+.sum-item {
+  font-weight: 600;
+  color: #303133;
 }
 
-.pager-wrap {
-  display: flex;
-  justify-content: flex-start;
-  padding: 12px 0 4px;
+.linear-dialog-body {
+  min-height: 120px;
 }
 
-.purchase-record-table ::v-deep .cell {
+.linear-hint {
+  font-size: 12px;
+  color: #909399;
+  margin: 0 0 10px;
+}
+
+.linear-table ::v-deep .el-table .cell {
   white-space: nowrap;
 }
+
+/* 商品远程下拉：单行「编码 | 名称」，避免多行标签错位 */
+.product-opt-row {
+  display: flex;
+  align-items: center;
+  max-width: 100%;
+  font-size: 13px;
+  line-height: 1.4;
+}
+
+.product-opt-code {
+  flex-shrink: 0;
+  color: #606266;
+  font-weight: 600;
+}
+
+.product-opt-sep {
+  flex-shrink: 0;
+  margin: 0 6px;
+  color: #dcdfe6;
+}
+
+.product-opt-name {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #303133;
+}
+</style>
+
+<!-- 下拉挂到 body，需非 scoped 才能命中 popper -->
+<style lang="scss">
+.wt-purchase-sum-product-dropdown.el-select-dropdown {
+  min-width: 420px !important;
+  max-width: min(720px, 92vw);
+}
 </style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/Form.vue
index 812b6d2..37becab 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/Form.vue
@@ -91,8 +91,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -138,7 +138,7 @@
 				});
 			},
 			getjszhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.jszhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/index.vue
index f60fd3a..0560f48 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSfk/index.vue
@@ -127,10 +127,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -190,7 +190,7 @@
 				});
 			},
 			getjszhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.jszhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/Form.vue
index 44f93d4..dff88cf 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/Form.vue
@@ -32,8 +32,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -65,7 +65,7 @@
 		methods: {
 			// ✅ 获取账户名称选项（从数据字典）
 			getzhmcOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhmcOptions = res.data.list || [];
 				}).catch(() => {
 					this.zhmcOptions = [];
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/account-form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/account-form.vue
new file mode 100644
index 0000000..2f3354c
--- /dev/null
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/account-form.vue
@@ -0,0 +1,134 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建账户' : '编辑账户'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :rules="rules">
+			<el-row :gutter="15">
+				<el-col :span="24">
+					<el-form-item label="账户名称" prop="accountName">
+						<el-input v-model="dataForm.accountName" placeholder="请输入账户名称" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="业务编码" prop="accountCode">
+						<el-input v-model="dataForm.accountCode" placeholder="留空自动生成" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="!dataForm.id && !dataForm.accountCode">
+					<el-form-item label="编码规则" prop="codeRule">
+						<el-radio-group v-model="dataForm.codeRule">
+						<el-radio :label="1">数字序号</el-radio>
+						<el-radio :label="2">拼音缩写</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="账户分类" prop="category">
+						<el-select v-model="dataForm.category" placeholder="请选择或输入分类" clearable filterable allow-create default-first-option style="width:100%">
+							<el-option v-for="item in categoryOptions" :key="item" :label="item" :value="item" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="排序码" prop="sortCode">
+						<el-input-number v-model="dataForm.sortCode" :min="0" :step="1" controls-position="right" style="width:100%" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="dataForm.id">
+					<el-form-item label="状态" prop="status">
+						<el-radio-group v-model="dataForm.status">
+							<el-radio :label="1">启用</el-radio>
+							<el-radio :label="0">禁用</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" :loading="btnLoading" @click="dataFormSubmit()">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+import { getAccountInfo, createAccount, updateAccount, getAccountCategories } from '@/api/extend/wtAccount'
+export default {
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			categoryOptions: [],
+			dataForm: {
+				id: '',
+				accountName: '',
+				accountCode: '',
+				codeRule: 1,
+				category: '',
+				sortCode: 0,
+				status: 1
+			},
+			rules: {
+				accountName: [{ required: true, message: '请输入账户名称', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || ''
+			this.visible = true
+			this.loadCategories()
+			this.$nextTick(function () {
+				this.$refs['elForm'].resetFields()
+				if (this.dataForm.id) {
+					getAccountInfo(this.dataForm.id).then(function (res) {
+						this.dataForm = res.data
+					}.bind(this))
+				} else {
+					this.dataForm.codeRule = 1
+					this.dataForm.sortCode = 0
+					this.dataForm.status = 1
+				}
+			})
+		},
+		loadCategories() {
+			getAccountCategories().then(function (res) {
+				this.categoryOptions = res.data || []
+			}.bind(this)).catch(function () {
+				this.categoryOptions = []
+			}.bind(this))
+		},
+		dataFormSubmit() {
+			this.$refs['elForm'].validate(function (valid) {
+				if (!valid) return
+				this.btnLoading = true
+				var body = {
+					accountName: this.dataForm.accountName,
+					accountCode: this.dataForm.accountCode,
+					category: this.dataForm.category,
+					sortCode: this.dataForm.sortCode
+				}
+				var promise
+				if (!this.dataForm.id) {
+					body.codeRule = this.dataForm.codeRule
+					promise = createAccount(body)
+				} else {
+					body.status = this.dataForm.status
+					promise = updateAccount(this.dataForm.id, body)
+				}
+				promise.then(function (res) {
+					this.btnLoading = false
+					this.$message({
+						message: res.msg,
+						type: 'success',
+						duration: 1000,
+						onClose: function () {
+							this.visible = false
+							this.$emit('refresh', true)
+						}.bind(this)
+					})
+				}.bind(this)).catch(function () {
+					this.btnLoading = false
+				}.bind(this))
+			}.bind(this))
+		}
+	}
+}
+</script>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/index.vue
index fd9e88c..dfd1683 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSkzhb/index.vue
@@ -1,251 +1,383 @@
 <template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
-			<el-row class="NCC-common-search-box" :gutter="16">
-				<el-form @submit.native.prevent>
-					<el-col :span="6">
-						<el-form-item label="账户编号">
-							<el-input v-model="query.id" placeholder="账户编号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="账户名称">
-							<el-select v-model="query.zhmc" placeholder="请选择账户名称" clearable :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in zhmcOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="所属门店">
-							<el-select v-model="query.ssmd" placeholder="请选择门店" clearable :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in ssmdOptions" :key="index" :label="item.F_Mdmc" :value="item.F_Id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-						</el-form-item>
-					</el-col>
-				</el-form>
-			</el-row>
-			<div class="NCC-common-layout-main NCC-flex-main">
-				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+			<el-tabs v-model="activeTab" @tab-click="handleTabClick">
+				<el-tab-pane label="账户管理" name="account">
+					<!-- Tab1 搜索区 -->
+					<el-row class="NCC-common-search-box" :gutter="16">
+						<el-form @submit.native.prevent>
+							<el-col :span="6">
+								<el-form-item label="关键字">
+									<el-input v-model="accountQuery.keyword" placeholder="编码/名称模糊搜索" clearable />
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item label="账户分类">
+									<el-select v-model="accountQuery.category" placeholder="请选择分类" clearable style="width:100%">
+										<el-option v-for="item in categoryOptions" :key="item" :label="item" :value="item" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item label="状态">
+									<el-select v-model="accountQuery.status" placeholder="全部" clearable style="width:100%">
+										<el-option label="启用" :value="1" />
+										<el-option label="禁用" :value="0" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item>
+									<el-button type="primary" icon="el-icon-search" @click="accountSearch()">查询</el-button>
+									<el-button icon="el-icon-refresh-right" @click="accountReset()">重置</el-button>
+								</el-form-item>
+							</el-col>
+						</el-form>
+					</el-row>
+					<!-- Tab1 操作区 + 列表 -->
+					<div class="NCC-common-layout-main NCC-flex-main">
+						<div class="NCC-common-head">
+							<div>
+								<el-button type="primary" icon="el-icon-plus" @click="openAccountForm()">新增</el-button>
+							</div>
+							<div class="NCC-common-head-right">
+								<el-tooltip effect="dark" content="刷新" placement="top">
+									<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="accountReset()" />
+								</el-tooltip>
+								<screenfull isContainer />
+							</div>
+						</div>
+						<NCC-table v-loading="accountLoading" :data="accountList">
+							<el-table-column prop="accountCode" label="业务编码" align="left" sortable />
+							<el-table-column prop="accountName" label="账户名称" align="left" sortable />
+							<el-table-column prop="category" label="账户分类" align="left">
+								<template slot-scope="scope">
+									{{ scope.row.category || '无' }}
+								</template>
+							</el-table-column>
+							<el-table-column prop="status" label="状态" align="left" width="100">
+								<template slot-scope="scope">
+									<el-tag v-if="scope.row.status === 1" type="success" size="mini">启用</el-tag>
+									<el-tag v-else type="info" size="mini">禁用</el-tag>
+								</template>
+							</el-table-column>
+							<el-table-column prop="sortCode" label="排序码" align="left" width="100" sortable />
+							<el-table-column label="操作" fixed="right" width="120">
+								<template slot-scope="scope">
+									<el-button type="text" @click="openAccountForm(scope.row.id)">编辑</el-button>
+									<el-button type="text" class="NCC-table-delBtn" @click="accountDel(scope.row.id)">删除</el-button>
+								</template>
+							</el-table-column>
+						</NCC-table>
+						<pagination :total="accountTotal" :page.sync="accountListQuery.currentPage" :limit.sync="accountListQuery.pageSize" @pagination="loadAccountList" />
 					</div>
-					<div class="NCC-common-head-right">
-						<el-tooltip effect="dark" content="刷新" placement="top">
-							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
-						</el-tooltip>
-						<screenfull isContainer />
+				</el-tab-pane>
+
+				<el-tab-pane label="门店账户授权" name="store">
+					<!-- Tab2 搜索区（原有） -->
+					<el-row class="NCC-common-search-box" :gutter="16">
+						<el-form @submit.native.prevent>
+							<el-col :span="6">
+								<el-form-item label="账户编号">
+									<el-input v-model="query.id" placeholder="账户编号" clearable />
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item label="账户名称">
+									<el-select v-model="query.zhmc" placeholder="请选择账户名称" clearable style="width:100%">
+										<el-option v-for="(item, index) in zhmcOptions" :key="index" :label="item.fullName" :value="item.id" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item label="所属门店">
+									<el-select v-model="query.ssmd" placeholder="请选择门店" clearable style="width:100%">
+										<el-option v-for="(item, index) in ssmdOptions" :key="index" :label="item.F_Mdmc" :value="item.F_Id" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
+								<el-form-item>
+									<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+									<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+								</el-form-item>
+							</el-col>
+						</el-form>
+					</el-row>
+					<!-- Tab2 操作区 + 列表（原有） -->
+					<div class="NCC-common-layout-main NCC-flex-main">
+						<div class="NCC-common-head">
+							<div>
+								<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+								<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+								<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+							</div>
+							<div class="NCC-common-head-right">
+								<el-tooltip effect="dark" content="刷新" placement="top">
+									<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+								</el-tooltip>
+								<screenfull isContainer />
+							</div>
+						</div>
+						<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+							<el-table-column prop="id" label="账户编号" align="left" />
+							<el-table-column prop="zhmc" label="账户名称" align="left" />
+							<el-table-column prop="ssmd" label="所属门店" align="left" />
+							<el-table-column label="操作" fixed="right" width="100">
+								<template slot-scope="scope">
+									<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+									<el-button type="text" class="NCC-table-delBtn" @click="handleDel(scope.row.id)">删除</el-button>
+								</template>
+							</el-table-column>
+						</NCC-table>
+						<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
 					</div>
-				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="账户编号" align="left" />
-					<el-table-column prop="zhmc" label="账户名称" align="left" />
-					<el-table-column prop="ssmd" label="所属门店" align="left" />
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
-						</template>
-					</el-table-column>
-				</NCC-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
-            </div>
-        </div>
+				</el-tab-pane>
+			</el-tabs>
+		</div>
+		<!-- Tab1 弹窗 -->
+		<AccountForm v-if="accountFormVisible" ref="AccountForm" @refresh="accountRefresh" />
+		<!-- Tab2 弹窗 -->
 		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<!-- Tab2 导出 -->
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 	</div>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-        components: { NCCForm, ExportBox },
-        data() {
-            return {
-                showAll: false,
-				query: {
-                    id:undefined,
-                    zhmc:undefined,
-                    ssmd:undefined,
-				},
-                list: [],
-                listLoading: true,
-                multipleSelection: [], total: 0,
-                listQuery: {
-                    currentPage: 1,
-                    pageSize: 20,
-					sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    { prop: 'id', label: '账户编号' },
-                    { prop: 'zhmc', label: '账户名称' },
-                    { prop: 'ssmd', label: '所属门店' },
-				],
-				zhmcOptions: [], // ✅ 账户名称选项（从数据字典获取）
-				ssmdOptions: [], // ✅ 门店选项（从门店记录获取）
-			}
-        },
-		computed: {},
-		created() {
-			this.initData();
-			this.getzhmcOptions();
-			this.getssmdOptions();
-		},
-		methods: {
-			// ✅ 获取账户名称选项（从数据字典）
-			getzhmcOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
-					this.zhmcOptions = res.data.list || [];
-				}).catch(() => {
-					this.zhmcOptions = [];
-				});
+import request from '@/utils/request'
+import NCCForm from './Form'
+import AccountForm from './account-form'
+import ExportBox from './ExportBox'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+import {
+	getAccountSelector,
+	getAccountList,
+	deleteAccount,
+	getAccountCategories
+} from '@/api/extend/wtAccount'
+export default {
+	components: { NCCForm, AccountForm, ExportBox },
+	data() {
+		return {
+			activeTab: 'account',
+			// ---- Tab1：账户管理 ----
+			accountQuery: {
+				keyword: undefined,
+				category: undefined,
+				status: undefined
+			},
+			accountList: [],
+			accountLoading: false,
+			accountTotal: 0,
+			accountListQuery: {
+				currentPage: 1,
+				pageSize: 20,
+				sort: 'desc',
+				sidx: ''
 			},
-			// ✅ 获取门店选项（从门店记录）
-			getssmdOptions(){
-				previewDataInterface('672484412352365829').then(res => {
-					this.ssmdOptions = res.data || [];
-				}).catch(() => {
-					this.ssmdOptions = [];
-				});
+			accountFormVisible: false,
+			categoryOptions: [],
+			// ---- Tab2：门店账户授权（原有） ----
+			showAll: false,
+			query: {
+				id: undefined,
+				zhmc: undefined,
+				ssmd: undefined
 			},
-			initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query
-                };
-                let query = {}
-                for (let key in _query) {
-                    if (Array.isArray(_query[key])) {
-                        query[key] = _query[key].join()
-                    } else {
-                        query[key] = _query[key]
-                    }
-                }
-                request({
-                    url: `/api/Extend/WtSkzhb`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    this.list = res.data.list
-                    this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtSkzhb/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
-                }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtSkzhb/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/WtSkzhb/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-			search() {
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            }
+			list: [],
+			listLoading: true,
+			multipleSelection: [],
+			total: 0,
+			listQuery: {
+				currentPage: 1,
+				pageSize: 20,
+				sort: 'desc',
+				sidx: ''
+			},
+			formVisible: false,
+			exportBoxVisible: false,
+			columnList: [
+				{ prop: 'id', label: '账户编号' },
+				{ prop: 'zhmc', label: '账户名称' },
+				{ prop: 'ssmd', label: '所属门店' }
+			],
+			zhmcOptions: [],
+			ssmdOptions: []
+		}
+	},
+	created() {
+		this.loadAccountList()
+		this.loadCategories()
+	},
+	methods: {
+		handleTabClick(tab) {
+			if (tab.name === 'store' && this.list.length === 0) {
+				this.initData()
+				this.getzhmcOptions()
+				this.getssmdOptions()
+			}
+		},
+		// ========== Tab1：账户管理 ==========
+		loadAccountList() {
+			this.accountLoading = true
+			var params = {}
+			Object.assign(params, this.accountListQuery)
+			if (this.accountQuery.keyword) params.keyword = this.accountQuery.keyword
+			if (this.accountQuery.category) params.category = this.accountQuery.category
+			if (this.accountQuery.status !== undefined && this.accountQuery.status !== null) {
+				params.status = this.accountQuery.status
+			}
+			getAccountList(params).then(function (res) {
+				this.accountList = res.data.list || []
+				this.accountTotal = (res.data.pagination && res.data.pagination.total) || 0
+				this.accountLoading = false
+			}.bind(this)).catch(function () {
+				this.accountLoading = false
+			}.bind(this))
+		},
+		loadCategories() {
+			getAccountCategories().then(function (res) {
+				this.categoryOptions = res.data || []
+			}.bind(this)).catch(function () {
+				this.categoryOptions = []
+			}.bind(this))
+		},
+		accountSearch() {
+			this.accountListQuery.currentPage = 1
+			this.loadAccountList()
+		},
+		accountReset() {
+			this.accountQuery = { keyword: undefined, category: undefined, status: undefined }
+			this.accountListQuery = { currentPage: 1, pageSize: 20, sort: 'desc', sidx: '' }
+			this.loadAccountList()
+		},
+		openAccountForm(id) {
+			this.accountFormVisible = true
+			this.$nextTick(function () {
+				this.$refs.AccountForm.init(id)
+			})
+		},
+		accountRefresh(isRefresh) {
+			this.accountFormVisible = false
+			if (isRefresh) {
+				this.accountReset()
+				this.loadCategories()
+				this.getzhmcOptions()
+			}
+		},
+		accountDel(id) {
+			this.$confirm('此操作将永久删除该账户, 是否继续?', '提示', { type: 'warning' }).then(function () {
+				deleteAccount(id).then(function (res) {
+					this.$message({ type: 'success', message: res.msg, onClose: function () { this.loadAccountList() }.bind(this) })
+				}.bind(this))
+			}.bind(this)).catch(function () {})
+		},
+		// ========== Tab2：门店账户授权（原有） ==========
+		getzhmcOptions() {
+			getAccountSelector().then(function (res) {
+				this.zhmcOptions = res.data.list || []
+			}.bind(this)).catch(function () {
+				this.zhmcOptions = []
+			}.bind(this))
+		},
+		getssmdOptions() {
+			previewDataInterface('672484412352365829').then(function (res) {
+				this.ssmdOptions = res.data || []
+			}.bind(this)).catch(function () {
+				this.ssmdOptions = []
+			}.bind(this))
+		},
+		initData() {
+			this.listLoading = true
+			var _query = {}
+			Object.assign(_query, this.listQuery, this.query)
+			var queryParams = {}
+			for (var key in _query) {
+				if (Array.isArray(_query[key])) {
+					queryParams[key] = _query[key].join()
+				} else {
+					queryParams[key] = _query[key]
+				}
+			}
+			request({
+				url: '/api/Extend/WtSkzhb',
+				method: 'GET',
+				data: queryParams
+			}).then(function (res) {
+				this.list = res.data.list
+				this.total = res.data.pagination.total
+				this.listLoading = false
+			}.bind(this))
+		},
+		handleDel(id) {
+			this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { type: 'warning' }).then(function () {
+				request({
+					url: '/api/Extend/WtSkzhb/' + id,
+					method: 'DELETE'
+				}).then(function (res) {
+					this.$message({ type: 'success', message: res.msg, onClose: function () { this.initData() }.bind(this) })
+				}.bind(this))
+			}.bind(this)).catch(function () {})
+		},
+		handleSelectionChange(val) {
+			this.multipleSelection = val.map(function (item) { return item.id })
+		},
+		handleBatchRemoveDel() {
+			if (!this.multipleSelection.length) {
+				this.$message({ type: 'error', message: '请选择一条数据', duration: 1500 })
+				return
+			}
+			this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', { type: 'warning' }).then(function () {
+				request({
+					url: '/api/Extend/WtSkzhb/batchRemove',
+					method: 'POST',
+					data: this.multipleSelection
+				}).then(function (res) {
+					this.$message({ type: 'success', message: res.msg, onClose: function () { this.initData() }.bind(this) })
+				}.bind(this))
+			}.bind(this)).catch(function () {})
+		},
+		addOrUpdateHandle(id, isDetail) {
+			this.formVisible = true
+			this.$nextTick(function () {
+				this.$refs.NCCForm.init(id, isDetail)
+			})
+		},
+		exportData() {
+			this.exportBoxVisible = true
+			this.$nextTick(function () {
+				this.$refs.ExportBox.init(this.columnList)
+			})
+		},
+		download(data) {
+			var downloadQuery = {}
+			Object.assign(downloadQuery, data, this.listQuery, this.query)
+			request({
+				url: '/api/Extend/WtSkzhb/Actions/Export',
+				method: 'GET',
+				data: downloadQuery
+			}).then(function (res) {
+				if (!res.data.url) return
+				window.location.href = this.define.comUrl + res.data.url
+				this.$refs.ExportBox.visible = false
+				this.exportBoxVisible = false
+			}.bind(this))
+		},
+		search() {
+			this.listQuery = { currentPage: 1, pageSize: 20, sort: 'desc', sidx: '' }
+			this.initData()
+		},
+		refresh(isRefresh) {
+			this.formVisible = false
+			if (isRefresh) this.reset()
+		},
+		reset() {
+			for (var key in this.query) {
+				this.query[key] = undefined
+			}
+			this.listQuery = { currentPage: 1, pageSize: 20, sort: 'desc', sidx: '' }
+			this.initData()
 		}
-    }
-</script>
\ No newline at end of file
+	}
+}
+</script>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/Form.vue
index 2bb4159..83c5cd3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/Form.vue
@@ -159,8 +159,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -235,7 +235,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/index.vue
index a804ed0..6b50ff3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSwdd/index.vue
@@ -132,10 +132,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -205,7 +205,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
index 06172dc..a1081b5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
@@ -251,10 +251,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -605,7 +605,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
index 0cf3d3c..e18e9ca 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
@@ -177,12 +177,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric, postRejectGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -333,7 +333,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/index.vue
index 360297d..3d41916 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/index.vue
@@ -33,6 +33,7 @@
 					<el-col :span="6">
 						<el-form-item>
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button type="success" plain icon="el-icon-sort" @click="openSerialTrace">序列号流水</el-button>
 							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
 							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
 							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
@@ -43,9 +44,7 @@
 			<div class="NCC-common-layout-main NCC-flex-main">
 				<div class="NCC-common-head">
 					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
 						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
 					</div>
 					<div class="NCC-common-head-right">
 						<el-tooltip effect="dark" content="刷新" placement="top">
@@ -54,7 +53,7 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+                <NCC-table v-loading="listLoading" :data="list">
 					<el-table-column prop="xlh" label="序列号" align="left" />
 					<el-table-column prop="spbh" label="商品编号" align="left" />
                                         <el-table-column prop="spmc" label="商品名称" align="left" />
@@ -65,29 +64,20 @@
 					<el-table-column prop="djlx" label="单据类型" align="left" />
 					<el-table-column prop="zt" label="状态" align="left" />
                                         <el-table-column prop="djrq" label="单据日期"  :formatter="ncc.tableDateFormat" align="left" />
-
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
-						</template>
-					</el-table-column>
 				</NCC-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
             </div>
         </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<serial-trace-dialog :visible.sync="traceVisible" :xlh="traceXlh" />
 	</div>
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
     import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import SerialTraceDialog from './serial-trace-dialog.vue'
 	export default {
-        components: { NCCForm, ExportBox },
+        components: { ExportBox, SerialTraceDialog },
         data() {
             return {
                 showAll: false,
@@ -100,15 +90,16 @@
 				},
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                total: 0,
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
 					sort: "desc",
                     sidx: "",
                 },
-                formVisible: false,
                 exportBoxVisible: false,
+                traceVisible: false,
+                traceXlh: '',
                 columnList: [
                     { prop: 'xlh', label: '序列号' },
                     { prop: 'spbh', label: '商品编号' },
@@ -147,63 +138,6 @@
                     this.listLoading = false
                 })
             },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtXlh/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
-                }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtXlh/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
 			exportData() {
                 this.exportBoxVisible = true
                 this.$nextTick(() => {
@@ -232,8 +166,16 @@
                 }
                 this.initData()
             },
+            openSerialTrace() {
+                const x = (this.query.xlh != null ? String(this.query.xlh) : '').trim()
+                if (!x) {
+                    this.$message.warning('请先在「序列号」中输入要查询的完整序列号')
+                    return
+                }
+                this.traceXlh = x
+                this.traceVisible = true
+            },
             refresh(isrRefresh) {
-                this.formVisible = false
                 if (isrRefresh) this.reset()
             },
             reset() {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/serial-trace-dialog.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/serial-trace-dialog.vue
new file mode 100644
index 0000000..f894e23
--- /dev/null
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXlh/serial-trace-dialog.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="序列号单据流水"
+    :visible.sync="innerVisible"
+    width="900px"
+    append-to-body
+    class="NCC-dialog NCC-dialog_center"
+    @close="onClose"
+  >
+    <div v-if="xlhKey" class="trace-tip">
+      序列号：<strong>{{ xlhKey }}</strong>（按单据日期从早到晚排列，含出货与退货等）
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      size="small"
+      border
+      style="width: 100%; margin-top: 12px;"
+    >
+      <el-table-column prop="djrq" label="单据日期" width="168" :formatter="formatDjrq" show-overflow-tooltip />
+      <el-table-column prop="djlx" label="单据类型" width="140" show-overflow-tooltip />
+      <el-table-column prop="djbh" label="单据编号" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="zt" label="状态" width="100" show-overflow-tooltip />
+      <el-table-column prop="spmc" label="商品名称" min-width="160" show-overflow-tooltip />
+    </el-table>
+    <el-pagination
+      v-if="total > pageSize"
+      style="margin-top: 12px;"
+      background
+      layout="total, prev, pager, next"
+      :total="total"
+      :page-size="pageSize"
+      :current-page.sync="page"
+      @current-change="loadData"
+    />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="innerVisible = false">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+import ncc from '@/utils/ncc'
+
+export default {
+  name: 'SerialTraceDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    xlh: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      innerVisible: false,
+      list: [],
+      loading: false,
+      total: 0,
+      page: 1,
+      pageSize: 100,
+      xlhKey: ''
+    }
+  },
+  watch: {
+    visible(v) {
+      this.innerVisible = v
+      if (v) {
+        this.xlhKey = (this.xlh || '').trim()
+        this.page = 1
+        this.loadData()
+      }
+    },
+    innerVisible(v) {
+      if (!v) {
+        this.$emit('update:visible', false)
+      }
+    }
+  },
+  methods: {
+    formatDjrq(row, column, cellValue) {
+      return ncc.tableDateFormat(row, column, cellValue)
+    },
+    onClose() {
+      this.$emit('update:visible', false)
+    },
+    loadData() {
+      if (!this.xlhKey) {
+        this.list = []
+        this.total = 0
+        return
+      }
+      this.loading = true
+      request({
+        url: '/api/Extend/WtXlh/SerialTrace',
+        method: 'GET',
+        data: {
+          xlh: this.xlhKey,
+          currentPage: this.page,
+          pageSize: this.pageSize
+        }
+      })
+        .then(res => {
+          this.list = res.data.list || []
+          this.total = (res.data.pagination && res.data.pagination.total) || 0
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.trace-tip {
+  font-size: 13px;
+  color: #606266;
+}
+</style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/Form.vue
index 2bb4159..83c5cd3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/Form.vue
@@ -159,8 +159,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -235,7 +235,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/index.vue
index a804ed0..6b50ff3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXndd/index.vue
@@ -132,10 +132,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -205,7 +205,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
index 449ad25..c7b8766 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
@@ -147,16 +147,6 @@
 										<el-input v-model="scope.row.je" placeholder="请输入" clearable readonly></el-input>
 									</template>
 								</el-table-column>
-								<el-table-column prop="cbdj" label="成本单价" width="100" align="right">
-									<template slot-scope="scope">
-										<span class="cost-cell">{{ formatCostCell(scope.row.cbdj) }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column prop="cbje" label="成本金额" width="100" align="right">
-									<template slot-scope="scope">
-										<span class="cost-cell">{{ formatCostCell(scope.row.cbje) }}</span>
-									</template>
-								</el-table-column>
 								<el-table-column prop="description" label="备注">
 									<template slot-scope="scope">
 										<el-input v-model="scope.row.description" placeholder="请输入备注" clearable></el-input>
@@ -220,19 +210,14 @@
 							</div>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="12">
 						<el-form-item label="收款账户" prop="skzh">
 							<el-select v-model="dataForm.skzh" placeholder="请选择" clearable :style='{"width":"100%"}' filterable >
 								<el-option v-for="(item, index) in skzhOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
-						<el-form-item label="出库成本合计">
-							<el-input :value="displayOutboundCostTotalText" placeholder="按明细成本汇总" readonly :style='{"width":"100%"}' />
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
+					<el-col :span="12">
 						<el-form-item label="收款金额" prop="skje">
 							<el-input v-model="dataForm.skje" placeholder="自动计算" clearable :style='{"width":"100%"}' readonly>
 							</el-input>
@@ -299,10 +284,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -339,8 +324,6 @@
 				},
 				rules: {
 				},
-				// 当前出库门店下各商品成本预览（下拉展示用，key=商品F_Id）
-				productCostPreviewMap: {},
 				cjckOptions : [],
 				rkckOptions : [],
 				khOptions : [],
@@ -364,19 +347,6 @@
 			totalJe() {
 				return (this.dataForm.wtXsckdMxList || []).reduce((sum, row) => sum + (parseFloat(row.je) || 0), 0)
 			},
-			// 详情页优先用主表 cbje；新建/编辑按明细成本金额汇总
-			displayOutboundCostTotal() {
-				if (this.isDetail && this.dataForm.cbje != null && this.dataForm.cbje !== '') {
-					const m = parseFloat(this.dataForm.cbje)
-					if (!isNaN(m)) return m
-				}
-				return (this.dataForm.wtXsckdMxList || []).reduce((s, r) => s + (parseFloat(r.cbje) || 0), 0)
-			},
-			displayOutboundCostTotalText() {
-				const v = this.displayOutboundCostTotal
-				return (typeof v === 'number' && !isNaN(v)) ? v.toFixed(2) : '0.00'
-			},
-
 		},
         watch: {},
         created() {
@@ -643,7 +613,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
@@ -723,7 +693,6 @@
 							_this.restoreSerialNumbers();
 							// 编辑时自动获取所有明细行的账面库存
 							_this.$nextTick(() => {
-								_this.loadProductCostPreviewMap();
 								_this.dataForm.wtXsckdMxList.forEach(row => {
 									if (row.spbh && row.ckck) {
 										_this.getStockQuantity(row);
@@ -745,7 +714,6 @@
 								if (res.data.mrwldw) _this.dataForm.kh = res.data.mrwldw
 								if (res.data.mrskzh) _this.dataForm.skzh = res.data.mrskzh
 							}
-							_this.loadProductCostPreviewMap();
 						}).catch(() => {})
 					}
 				})
@@ -1117,7 +1085,12 @@
 					if (!this.currentBarcodeRow.ckck && this.dataForm.cjck) {
 						this.currentBarcodeRow.ckck = this.dataForm.cjck
 					}
-					this.fetchRowCost(this.currentBarcodeRow)
+					// 与下拉选商品一致：拉序列号类型、账面库存（销售单价仍手工录入）
+					this.$nextTick(() => {
+						if (this.currentBarcodeRow && this.currentBarcodeRow.spbh) {
+							this.handleProductChange(this.currentBarcodeRow)
+						}
+					})
 				}
 			},
 
@@ -1154,7 +1127,6 @@
 					if (currentRow.dj) {
 						currentRow.je = (parseFloat(currentRow.sl) * parseFloat(currentRow.dj)).toFixed(2)
 					}
-					this.updateRowCostAmount(currentRow)
 					// 更新总收款金额
 					this.calculateTotalAmount();
 					
@@ -1165,7 +1137,6 @@
 				const sl = parseFloat(row.sl) || 0;
 				const dj = parseFloat(row.dj) || 0;
 				row.je = (sl * dj).toFixed(2);
-				this.updateRowCostAmount(row)
 				// 自动计算总收款金额
 				this.calculateTotalAmount();
 				// 检查数量与序列号数量是否一致
@@ -1187,12 +1158,10 @@
 				}
 				// 同步更新所有明细行的出库仓库
 				this.syncDetailWarehouses();
-				this.loadProductCostPreviewMap()
-				// 更新所有明细行的库存与成本预览
+				// 更新所有明细行的账面库存
 				this.dataForm.wtXsckdMxList.forEach(row => {
 					if (row.spbh) {
 						this.getStockQuantity(row);
-						this.fetchRowCost(row);
 					}
 				});
 			},
@@ -1561,12 +1530,12 @@
 						sums[index] = '合计';
 						return;
 					}
-					if (['kucun', 'sl', 'je', 'cbje'].includes(column.property)) {
+					if (['kucun', 'sl', 'je'].includes(column.property)) {
 						const t = data.reduce((total, row) => {
 							const value = parseFloat(row[column.property]);
 							return total + (isNaN(value) ? 0 : value);
 						}, 0);
-						sums[index] = (column.property === 'cbje' || column.property === 'je') ? t.toFixed(2) : t;
+						sums[index] = column.property === 'je' ? t.toFixed(2) : t;
 					} else {
 						sums[index] = '';
 					}
@@ -1578,99 +1547,24 @@
 				const label = (option.label || '').toLowerCase();
 				return label.includes(query.toLowerCase());
 			},
-			// 成本/库存接口使用的门店或仓库ID
-			costContextCk() {
-				if (this.dataForm.cjckId != null && this.dataForm.cjckId !== '') {
-					return this.dataForm.cjckId
-				}
-				return this.dataForm.cjck
-			},
-			formatCostCell(val) {
-				if (val == null || val === '') return '无'
-				const n = parseFloat(val)
-				if (isNaN(n)) return '无'
-				return n.toFixed(2)
-			},
 			getSpOptionLabel(item) {
 				const base = ((item.spbm || '') + ' ' + (item.F_Spmc || '')).trim()
-				// const c = this.productCostPreviewMap[item.F_Id]
-				// if (c != null && c !== '' && !isNaN(parseFloat(c))) {
-				// 	return base + '  (成本¥' + parseFloat(c).toFixed(2) + ')'
-				// }
-				// if (!this.costContextCk()) {
-				// 	return base + '  (选仓库后显示成本)'
-				// }
 				return base
 			},
-			async loadProductCostPreviewMap() {
-				const ck = this.costContextCk()
-				if (!ck) {
-					this.productCostPreviewMap = {}
-					return
-				}
-				try {
-					const res = await request({
-						url: '/api/Extend/WtTjd/Actions/GetCostPreviewForStore',
-						method: 'get',
-						data: { ck }
-					})
-					let items = res.data
-					if (items && items.items) items = items.items
-					else if (res.items) items = res.items
-					const map = {}
-					;(Array.isArray(items) ? items : []).forEach(x => {
-						if (x && x.spbh != null && map[x.spbh] == null) {
-							map[x.spbh] = parseFloat(x.cbj) || 0
-						}
-					})
-					this.productCostPreviewMap = map
-				} catch (e) {
-					console.warn('loadProductCostPreviewMap failed', e)
-					this.productCostPreviewMap = {}
-				}
-			},
-			async fetchRowCost(row) {
-				const ck = row.ckck || this.costContextCk()
-				if (!row.spbh || !ck) {
-					this.$set(row, 'cbdj', undefined)
-					this.$set(row, 'cbje', undefined)
-					return
-				}
-				try {
-					const res = await request({
-						url: '/api/Extend/WtTjd/Actions/GetCost',
-						method: 'get',
-						data: { spbh: row.spbh, ck }
-					})
-					let payload = res.data
-					if (payload && typeof payload.cbj === 'undefined' && res.data && res.data.data) {
-						payload = res.data.data
-					}
-					const cbj = parseFloat(payload && payload.cbj != null ? payload.cbj : 0) || 0
-					this.$set(row, 'cbdj', cbj)
-					this.updateRowCostAmount(row)
-				} catch (e) {
-					this.$set(row, 'cbdj', 0)
-					this.updateRowCostAmount(row)
-				}
-			},
-			updateRowCostAmount(row) {
-				const sl = parseFloat(row.sl) || 0
-				const cbdj = parseFloat(row.cbdj) || 0
-				this.$set(row, 'cbje', (cbdj * sl).toFixed(2))
-			},
 			handleProductChange(row) {
 				if (!row.spbh) {
 					this.$set(row, 'cbdj', undefined)
 					this.$set(row, 'cbje', undefined)
+					this.$set(row, 'dj', undefined)
+					this.$set(row, 'je', undefined)
+					this.$set(row, 'spmc', '')
 					return
 				}
 				// 选中商品后可自动回填商品名称等信息
 				const product = this.spbhOptions.find(item => item.F_Id === row.spbh);
 				if (product) {
 					row.spmc = product.F_Spmc || '';
-					// ✅ 从商品主档回填单价（零售价）
-					row.dj = product.F_Lsj || 0;
+					// 销售单价由用户手工录入，不从商品主档自动带出
 					// 选中商品后，立即加载商品信息（如序列号类型）
 					this.getProductInfo(row.spbh).then(productInfo => {
 						// 触发当前行的响应式刷新
@@ -1697,11 +1591,9 @@
 						return;
 					}
 					
-					// 如果已选择出库仓库，自动获取库存与成本
+					// 如果已选择出库仓库，自动获取账面库存
 					console.log('开始获取库存...');
-					this.getStockQuantity(row).finally(() => {
-						this.fetchRowCost(row)
-					});
+					this.getStockQuantity(row)
 				}
 			},
 			handleProductQuery(val, scope) {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
index 6d8cb5b..6addcb4 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/detail-view.vue
@@ -134,11 +134,6 @@
 							<span class="cell-nowrap mx-cell__money">{{ formatMoneyCol(scope.row.je) }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="cbje" label="成本" width="96" align="right">
-						<template slot-scope="scope">
-							<span class="cell-nowrap">{{ formatMoneyCol(scope.row.cbje) }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="序列号" min-width="168">
 						<template slot-scope="scope">
 							<div v-if="scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length" class="sn-tags">
@@ -181,12 +176,6 @@
 							{{ displayDiscountAmount }}
 						</span>
 					</el-descriptions-item>
-					<el-descriptions-item label="出库成本">
-						<span class="cell-nowrap">
-							<i class="el-icon-s-grid desc-icon desc-icon--info" />
-							{{ formatMoneyCol(detail.cbje) }}
-						</span>
-					</el-descriptions-item>
 					<el-descriptions-item label="制单人">
 						<span class="cell-nowrap">
 							<i class="el-icon-edit-outline desc-icon desc-icon--muted" />
@@ -310,9 +299,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 import {
 	formatWtSkzhDisplay,
 	resolveSkzhDictionaryLabel,
@@ -473,12 +462,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -494,10 +494,6 @@ export default {
 					sums[index] = data
 						.reduce((t, row) => t + (parseFloat(row.je) || 0), 0)
 						.toFixed(2)
-				} else if (column.property === 'cbje') {
-					sums[index] = data
-						.reduce((t, row) => t + (parseFloat(row.cbje) || 0), 0)
-						.toFixed(2)
 				} else {
 					sums[index] = ''
 				}
@@ -539,7 +535,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				const d = res.data
 				this.skzhOptions =
 					d && Array.isArray(d.list) ? d.list : Array.isArray(d) ? d : []
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
index a4519bd..37b6ea2 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
@@ -140,15 +140,9 @@
 					<el-table-column label="优惠金额" align="right" min-width="96" show-overflow-tooltip>
 						<template slot-scope="scope">{{ getDisplayDiscountAmount(scope.row) }}</template>
 					</el-table-column>
-					<el-table-column label="出库成本" align="right" min-width="96" show-overflow-tooltip>
-						<template slot-scope="scope">{{ getDisplayOutboundCost(scope.row) }}</template>
-					</el-table-column>
 					<el-table-column label="收款账户" prop="skzh" align="left" min-width="120" show-overflow-tooltip>
 						<template slot-scope="scope">{{ displayText(formatSkzhRow(scope.row)) }}</template>
 					</el-table-column>
-					<el-table-column prop="zdr" label="制单人" align="left" min-width="88" show-overflow-tooltip>
-						<template slot-scope="scope">{{ displayText(scope.row.zdr) }}</template>
-					</el-table-column>
 					<el-table-column prop="shr" label="审核人" align="left" min-width="88" show-overflow-tooltip>
 						<template slot-scope="scope">{{ displayText(scope.row.shr) }}</template>
 					</el-table-column>
@@ -210,7 +204,6 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
@@ -218,6 +211,7 @@
     import { promptApprovalRemark, postApproveSalesOutbound, postRejectGeneric } from '@/utils/wtRejectApproval'
     import { formatWtSkzhDisplay } from '@/utils/wtComboSkzhDisplay'
     import { dynamicText } from '@/filters'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -260,7 +254,6 @@
                     { prop: 'skzh', label: '收款账户' },
                     { prop: 'skje', label: '收款金额' },
                     { prop: 'ysje', label: '优惠金额' },
-                    { prop: 'zdr', label: '制单人' },
                     { prop: 'shr', label: '审核人' },
                     { prop: 'gzr', label: '过账人' },
                     { prop: 'bz', label: '备注' },
@@ -404,11 +397,6 @@
 				}
 				return (row.skje != null && row.skje !== '') ? parseFloat(row.skje).toFixed(2) : '0.00';
 			},
-			// ✅ 出库成本：使用主表字段 cbje，空值按金额风格显示为 0.00
-			getDisplayOutboundCost(row) {
-				const val = parseFloat(row.cbje);
-				return isNaN(val) ? '0.00' : val.toFixed(2);
-			},
 			getcjckOptions(){
 				previewDataInterface('681758216954053893').then(res => {
 					this.cjckOptions = res.data
@@ -420,7 +408,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/Form.vue
index cb8ac83..1c71669 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/Form.vue
@@ -250,10 +250,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import SerialNumberSelect from '../wtXsckd/SerialNumberSelect.vue'
 	import ShipmentOrderSelect from '../wtXswtdxjsd/ShipmentOrderSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { SerialNumberSelect, ShipmentOrderSelect },
 		props: [],
@@ -345,7 +345,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
index e19e625..1ec54d7 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/detail-view.vue
@@ -203,10 +203,10 @@
 <script>
 import request from '@/utils/request'
 import { getUserInfoList } from '@/api/permission/user'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
 import XsckdDetailView from '../wtXsckd/detail-view'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtXsthdDetailView',
@@ -298,12 +298,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -419,7 +430,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 		}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/index.vue
index f844ade..a73fb78 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsthd/index.vue
@@ -161,13 +161,13 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import XsckdDetailView from '../wtXsckd/detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric, postRejectGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, XsckdDetailView, ExportBox },
         data() {
@@ -280,7 +280,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/Form.vue
index 6640be6..abfb986 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/Form.vue
@@ -280,10 +280,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -632,7 +632,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/detail-view.vue
index b2d6895..76cc91f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/detail-view.vue
@@ -133,11 +133,6 @@
 							<span class="cell-nowrap mx-cell__money">{{ formatMoneyCol(scope.row.je) }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="cbje" label="成本" width="96" align="right">
-						<template slot-scope="scope">
-							<span class="cell-nowrap">{{ formatMoneyCol(scope.row.cbje) }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="序列号" min-width="168">
 						<template slot-scope="scope">
 							<div v-if="scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length" class="sn-tags">
@@ -180,12 +175,6 @@
 							{{ displayDiscountAmount }}
 						</span>
 					</el-descriptions-item>
-					<el-descriptions-item label="出库成本">
-						<span class="cell-nowrap">
-							<i class="el-icon-s-grid desc-icon desc-icon--info" />
-							{{ formatMoneyCol(detail.cbje) }}
-						</span>
-					</el-descriptions-item>
 					<el-descriptions-item label="制单人">
 						<span class="cell-nowrap">
 							<i class="el-icon-edit-outline desc-icon desc-icon--muted" />
@@ -225,9 +214,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtXswtdxfhdDetailView',
@@ -330,12 +319,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -351,10 +351,6 @@ export default {
 					sums[index] = data
 						.reduce((t, row) => t + (parseFloat(row.je) || 0), 0)
 						.toFixed(2)
-				} else if (column.property === 'cbje') {
-					sums[index] = data
-						.reduce((t, row) => t + (parseFloat(row.cbje) || 0), 0)
-						.toFixed(2)
 				} else {
 					sums[index] = ''
 				}
@@ -396,7 +392,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 			request({
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/index.vue
index 738795f..51dd631 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxfhd/index.vue
@@ -165,12 +165,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -244,7 +244,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/Form.vue
index 032b592..25b9d04 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/Form.vue
@@ -278,11 +278,11 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
 	import ShipmentOrderSelect from './ShipmentOrderSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect, ShipmentOrderSelect },
 		props: [],
@@ -596,7 +596,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/detail-view.vue
index e19e002..3df2b77 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/detail-view.vue
@@ -230,9 +230,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtXswtdxjsdDetailView',
@@ -303,12 +303,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -365,7 +376,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 		}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/index.vue
index 85258b6..c07375c 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxjsd/index.vue
@@ -155,12 +155,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -231,7 +231,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/Form.vue
index d86becc..19355ae 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/Form.vue
@@ -264,10 +264,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import SerialNumberSelect from '../wtXsckd/SerialNumberSelect.vue'
 	import ShipmentOrderSelect from '../wtXswtdxjsd/ShipmentOrderSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { SerialNumberSelect, ShipmentOrderSelect },
 		props: [],
@@ -363,7 +363,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/detail-view.vue
index 82b7b00..22e5563 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/detail-view.vue
@@ -196,9 +196,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtXswtdxthdDetailView',
@@ -287,12 +287,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -405,7 +416,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 		}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/index.vue
index 87bd4cc..ad4b613 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXswtdxthd/index.vue
@@ -156,12 +156,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -234,7 +234,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/Form.vue
index ac8458a..affd53d 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/Form.vue
@@ -127,6 +127,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -202,17 +203,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/index.vue
index 18e5dcf..1649ec4 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs/index.vue
@@ -121,10 +121,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -178,12 +178,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/Form.vue
index 05e90d3..00adf13 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/Form.vue
@@ -110,6 +110,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -183,17 +184,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/index.vue
index a924263..591e09d 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYfkzjjs_js/index.vue
@@ -121,10 +121,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -178,12 +178,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue
index 78b4897..885d4f8 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue
@@ -278,10 +278,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import BarcodeSelect from '../wtCgrkd/BarcodeSelect.vue'
 	import SerialNumberSelect from './SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { BarcodeSelect, SerialNumberSelect },
 		props: [],
@@ -608,7 +608,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/detail-view.vue
index cfc1ba9..6a83871 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/detail-view.vue
@@ -139,11 +139,6 @@
 							<span class="cell-nowrap mx-cell__money">{{ formatMoneyCol(scope.row.je) }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="cbje" label="成本" width="96" align="right">
-						<template slot-scope="scope">
-							<span class="cell-nowrap">{{ formatMoneyCol(scope.row.cbje) }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="序列号" min-width="168">
 						<template slot-scope="scope">
 							<div v-if="scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length" class="sn-tags">
@@ -186,12 +181,6 @@
 							{{ displayDiscountAmount }}
 						</span>
 					</el-descriptions-item>
-					<el-descriptions-item label="出库成本">
-						<span class="cell-nowrap">
-							<i class="el-icon-s-grid desc-icon desc-icon--info" />
-							{{ formatMoneyCol(detail.cbje) }}
-						</span>
-					</el-descriptions-item>
 					<el-descriptions-item label="制单人">
 						<span class="cell-nowrap">
 							<i class="el-icon-edit-outline desc-icon desc-icon--muted" />
@@ -312,9 +301,9 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 import {
 	formatWtSkzhDisplay,
 	resolveSkzhDictionaryLabel,
@@ -467,12 +456,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -488,10 +488,6 @@ export default {
 					sums[index] = data
 						.reduce((t, row) => t + (parseFloat(row.je) || 0), 0)
 						.toFixed(2)
-				} else if (column.property === 'cbje') {
-					sums[index] = data
-						.reduce((t, row) => t + (parseFloat(row.cbje) || 0), 0)
-						.toFixed(2)
 				} else {
 					sums[index] = ''
 				}
@@ -530,7 +526,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				const d = res.data
 				this.skzhOptions =
 					d && Array.isArray(d.list) ? d.list : Array.isArray(d) ? d : []
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/index.vue
index 6b98506..f048ee1 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/index.vue
@@ -135,9 +135,6 @@
 					<el-table-column label="优惠金额" align="left" min-width="90">
 						<template slot-scope="scope">{{ getDisplayDiscountAmount(scope.row) }}</template>
 					</el-table-column>
-					<el-table-column label="出库成本" align="left" min-width="90">
-						<template slot-scope="scope">{{ getDisplayOutboundCost(scope.row) }}</template>
-					</el-table-column>
 					<el-table-column label="收款账户" prop="skzh" align="left">
 							<template slot-scope="scope">{{ formatSkzhRow(scope.row) }}</template>
 					</el-table-column>
@@ -257,7 +254,6 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
@@ -265,6 +261,7 @@
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveSalesOutbound } from '@/utils/wtRejectApproval'
     import { formatWtSkzhDisplay } from '@/utils/wtComboSkzhDisplay'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox, SerialNumberSelect },
         data() {
@@ -307,7 +304,6 @@
                     { prop: 'skzh', label: '收款账户' },
                     { prop: 'skje', label: '收款金额' },
                     { prop: 'ysje', label: '优惠金额' },
-                    { prop: 'cbje', label: '出库成本' },
                     { prop: 'zdr', label: '制单人' },
                     { prop: 'shr', label: '审核人' },
                     { prop: 'gzr', label: '过账人' },
@@ -369,10 +365,6 @@
 			formatSkzhRow(row) {
 				return formatWtSkzhDisplay(row, this.skzhOptions)
 			},
-			getDisplayOutboundCost(row) {
-				const val = parseFloat(row.cbje)
-				return isNaN(val) ? '0.00' : val.toFixed(2)
-			},
 			openDetail(id) {
 				if (!id) return
 				this.detailVisible = true
@@ -454,7 +446,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/Form.vue
index 4210810..f33144f 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/Form.vue
@@ -127,6 +127,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -202,17 +203,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/index.vue
index 7ae0ba0..e09a682 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs/index.vue
@@ -122,10 +122,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -178,12 +178,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/Form.vue
index b4db5c9..e9711f1 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/Form.vue
@@ -152,6 +152,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -234,17 +235,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/detail-view.vue
index 2c6b7ee..8952994 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/detail-view.vue
@@ -43,7 +43,7 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtYskzjjsHyDetailView',
@@ -60,7 +60,7 @@ export default {
 	},
 	methods: {
 		loadAccountOptions() {
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.accountOptions = (res.data && res.data.list) || []
 			})
 		},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/index.vue
index 6fab4e2..62d17e9 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_hy/index.vue
@@ -101,11 +101,11 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox, DetailView },
         data() {
@@ -155,12 +155,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/Form.vue
index e44f837..2a72974 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/Form.vue
@@ -110,6 +110,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -183,17 +184,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/index.vue
index 840478a..2db22f3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_js/index.vue
@@ -121,10 +121,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -178,12 +178,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_qt/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_qt/Form.vue
index 56a6a8b..970b2cf 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_qt/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_qt/Form.vue
@@ -120,6 +120,7 @@
 <script>
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -177,12 +178,12 @@
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
index 662ba3e..9d13d98 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/Form.vue
@@ -121,6 +121,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -198,17 +199,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/detail-view.vue
index f01c1dc..c8dbbe3 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/detail-view.vue
@@ -44,6 +44,7 @@
 <script>
 import request from '@/utils/request'
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtYskzjjsXjDetailView',
@@ -81,7 +82,7 @@ export default {
 			})
 		},
 		loadAccounts() {
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.accountOptions = res.data.list || []
 			})
 		},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/index.vue
index 2fff4e9..4b699ce 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_xj/index.vue
@@ -118,10 +118,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -170,12 +170,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/Form.vue
index 8aeecf0..4324de5 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/Form.vue
@@ -106,6 +106,7 @@
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -183,17 +184,17 @@
 				});
 			},
 			getzhbhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.zhbhOptions = res.data.list
 				});
 			},
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/detail-view.vue
index 21add96..0188a88 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/detail-view.vue
@@ -47,7 +47,7 @@
 
 <script>
 import request from '@/utils/request'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtYskzjjsZkDetailView',
@@ -64,7 +64,7 @@ export default {
 	},
 	methods: {
 		getZhOptions() {
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.zhOptions = (res.data && res.data.list) || []
 			})
 		},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/index.vue
index 885087f..f39308e 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYskzjjs_zk/index.vue
@@ -126,10 +126,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import ExportBox from './ExportBox'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, ExportBox },
         data() {
@@ -180,12 +180,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/Form.vue
index 0984361..92ce4b2 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/Form.vue
@@ -223,9 +223,9 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import SerialNumberSelect from '../wtXsckd/SerialNumberSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { SerialNumberSelect },
 		props: [],
@@ -317,7 +317,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/index.vue
index d2debdd..665d7b9 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd copy/index.vue
@@ -127,10 +127,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -199,7 +199,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/Form.vue
index 3f51129..4f0f67a 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/Form.vue
@@ -251,10 +251,10 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
 	import SerialNumberSelect from '../wtXsckd/SerialNumberSelect.vue'
 	import ShipmentOrderSelect from '../wtXswtdxjsd/ShipmentOrderSelect.vue'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: { SerialNumberSelect, ShipmentOrderSelect },
 		props: [],
@@ -347,7 +347,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/detail-view.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/detail-view.vue
index eb9200f..f6a543c 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/detail-view.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/detail-view.vue
@@ -201,10 +201,10 @@
 <script>
 import request from '@/utils/request'
 import { getUserInfoList } from '@/api/permission/user'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { dynamicText } from '@/filters'
 import YsckdDetailView from '../wtYsckd/detail-view'
+import { getAccountSelector } from '@/api/extend/wtAccount'
 
 export default {
 	name: 'WtYsthdDetailView',
@@ -289,12 +289,23 @@ export default {
 		},
 		formatDjrq(ts) {
 			if (ts == null || ts === '') return '无'
-			const d = new Date(typeof ts === 'number' ? ts : Number(ts))
+			const raw = typeof ts === 'string' ? ts.trim() : ts
+			if (raw === '') return '无'
+			let d
+			if (typeof raw === 'number') {
+				d = new Date(raw)
+			} else {
+				const n = Number(raw)
+				d = !isNaN(n) ? new Date(n) : new Date(String(raw).replace(/-/g, '/'))
+			}
 			if (isNaN(d.getTime())) return '无'
 			const y = d.getFullYear()
 			const m = String(d.getMonth() + 1).padStart(2, '0')
 			const day = String(d.getDate()).padStart(2, '0')
-			return `${y}-${m}-${day}`
+			const h = String(d.getHours()).padStart(2, '0')
+			const mi = String(d.getMinutes()).padStart(2, '0')
+			const s = String(d.getSeconds()).padStart(2, '0')
+			return `${y}-${m}-${day} ${h}:${mi}:${s}`
 		},
 		getSummaries(param) {
 			const { columns, data } = param
@@ -418,7 +429,7 @@ export default {
 			previewDataInterface('681758216954053893').then(res => {
 				this.cjckOptions = res.data || []
 			})
-			getDictionaryDataSelector('681761709836207365').then(res => {
+			getAccountSelector().then(res => {
 				this.skzhOptions = res.data.list || []
 			})
 		}
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/index.vue
index c902dee..7935f57 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsthd/index.vue
@@ -159,13 +159,13 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import DetailView from './detail-view'
     import YsckdDetailView from '../wtYsckd/detail-view'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
     import { promptApprovalRemark, postApproveGeneric } from '@/utils/wtRejectApproval'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, DetailView, YsckdDetailView, ExportBox },
         data() {
@@ -279,7 +279,7 @@
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/Form.vue
index 5a17553..9262896 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/Form.vue
@@ -92,8 +92,8 @@
 </template>
 <script>
 	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
 		components: {},
 		props: [],
@@ -134,12 +134,12 @@
         },
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/index.vue
index e388afd..1349891 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtZkd/index.vue
@@ -133,10 +133,10 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import { getAccountSelector } from '@/api/extend/wtAccount'
 	export default {
         components: { NCCForm, ExportBox },
         data() {
@@ -195,12 +195,12 @@
 		},
 		methods: {
 			getfkzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.fkzhOptions = res.data.list
 				});
 			},
 			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
+				getAccountSelector().then(res => {
 					this.skzhOptions = res.data.list
 				});
 			},
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountCrInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountCrInput.cs
new file mode 100644
index 0000000..2a4dadf
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountCrInput.cs
@@ -0,0 +1,33 @@
+namespace NCC.Extend.Entitys.Dto.WtAccount
+{
+    /// <summary>
+    /// 账户管理 - 新建入参
+    /// </summary>
+    public class WtAccountCrInput
+    {
+        /// <summary>
+        /// 账户名称（必填）
+        /// </summary>
+        public string accountName { get; set; }
+
+        /// <summary>
+        /// 账户分类
+        /// </summary>
+        public string category { get; set; }
+
+        /// <summary>
+        /// 业务编码；留空则按 codeRule 自动生成
+        /// </summary>
+        public string accountCode { get; set; }
+
+        /// <summary>
+        /// 编码生成规则：1=数字序号（SKZH00001 递增），2=名称拼音首字母缩写；默认1
+        /// </summary>
+        public int? codeRule { get; set; }
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public int? sortCode { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountInfoOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountInfoOutput.cs
new file mode 100644
index 0000000..5f01242
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountInfoOutput.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.WtAccount
+{
+    /// <summary>
+    /// 账户管理 - 详情输出
+    /// </summary>
+    public class WtAccountInfoOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 业务编码
+        /// </summary>
+        public string accountCode { get; set; }
+
+        /// <summary>
+        /// 账户名称
+        /// </summary>
+        public string accountName { get; set; }
+
+        /// <summary>
+        /// 账户分类
+        /// </summary>
+        public string category { get; set; }
+
+        /// <summary>
+        /// 状态：1=启用 0=禁用
+        /// </summary>
+        public int status { get; set; }
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public int sortCode { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListOutput.cs
new file mode 100644
index 0000000..bf07ba0
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListOutput.cs
@@ -0,0 +1,38 @@
+namespace NCC.Extend.Entitys.Dto.WtAccount
+{
+    /// <summary>
+    /// 账户管理 - 列表输出
+    /// </summary>
+    public class WtAccountListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 业务编码
+        /// </summary>
+        public string accountCode { get; set; }
+
+        /// <summary>
+        /// 账户名称
+        /// </summary>
+        public string accountName { get; set; }
+
+        /// <summary>
+        /// 账户分类
+        /// </summary>
+        public string category { get; set; }
+
+        /// <summary>
+        /// 状态：1=启用 0=禁用
+        /// </summary>
+        public int status { get; set; }
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public int sortCode { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListQueryInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListQueryInput.cs
new file mode 100644
index 0000000..5288101
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountListQueryInput.cs
@@ -0,0 +1,30 @@
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.WtAccount
+{
+    /// <summary>
+    /// 账户管理 - 列表查询入参
+    /// </summary>
+    public class WtAccountListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 导出类型
+        /// </summary>
+        public int dataType { get; set; }
+
+        /// <summary>
+        /// 账户分类（精确）
+        /// </summary>
+        public string category { get; set; }
+
+        /// <summary>
+        /// 状态：1=启用 0=禁用（不传则全部）
+        /// </summary>
+        public int? status { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountUpInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountUpInput.cs
new file mode 100644
index 0000000..a8cdfb1
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtAccount/WtAccountUpInput.cs
@@ -0,0 +1,18 @@
+namespace NCC.Extend.Entitys.Dto.WtAccount
+{
+    /// <summary>
+    /// 账户管理 - 更新入参
+    /// </summary>
+    public class WtAccountUpInput : WtAccountCrInput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 状态：1=启用 0=禁用
+        /// </summary>
+        public int? status { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPurchaseSummaryQueryInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPurchaseSummaryQueryInput.cs
index 0be88d6..04bcae5 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPurchaseSummaryQueryInput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPurchaseSummaryQueryInput.cs
@@ -41,6 +41,21 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         public string BillType { get; set; }
 
         /// <summary>
+        /// 下钻：商品分类主键（wt_pl.F_Id），与明细接口联用
+        /// </summary>
+        public string CategoryId { get; set; }
+
+        /// <summary>
+        /// 下钻：品牌主键（wt_pp.F_Id）
+        /// </summary>
+        public string BrandId { get; set; }
+
+        /// <summary>
+        /// 下钻：商品主键（wt_sp.F_Id，与明细 mx.spbh 一致）
+        /// </summary>
+        public string ProductSpId { get; set; }
+
+        /// <summary>
         /// 当前页（默认 1）
         /// </summary>
         public int? CurrentPage { get; set; }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtAccountEntity.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtAccountEntity.cs
new file mode 100644
index 0000000..0d33d9d
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtAccountEntity.cs
@@ -0,0 +1,72 @@
+using NCC.Common.Const;
+using SqlSugar;
+using System;
+
+namespace NCC.Extend.Entitys
+{
+    /// <summary>
+    /// 账户管理（独立业务表，替代原数据字典 681761709836207365）
+    /// </summary>
+    /// <remarks>
+    /// 建表 SQL：
+    /// CREATE TABLE wt_account (
+    ///   F_Id          VARCHAR(50) NOT NULL PRIMARY KEY COMMENT '主键',
+    ///   account_code  VARCHAR(32) NOT NULL COMMENT '业务编码（唯一，用于检索）',
+    ///   account_name  VARCHAR(100) NOT NULL COMMENT '账户名称',
+    ///   category      VARCHAR(64) NULL COMMENT '账户分类',
+    ///   status        INT NOT NULL DEFAULT 1 COMMENT '状态：1=启用 0=禁用',
+    ///   sort_code     INT NOT NULL DEFAULT 0 COMMENT '排序',
+    ///   create_time   DATETIME NULL COMMENT '创建时间',
+    ///   UNIQUE INDEX IX_wt_account_code (account_code)
+    /// ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='账户主数据';
+    ///
+    /// 门店-账户关联继续用 wt_skzhb 表，zhmc 字段改存 wt_account.F_Id：
+    /// UPDATE wt_skzhb SET zhmc = (新账户ID) WHERE zhmc = (旧字典ID);
+    /// </remarks>
+    [SugarTable("wt_account")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class WtAccountEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 业务编码（唯一，用于检索：数字序号 SKZH00001 或名称拼音首字母缩写）
+        /// </summary>
+        [SugarColumn(ColumnName = "account_code")]
+        public string AccountCode { get; set; }
+
+        /// <summary>
+        /// 账户名称
+        /// </summary>
+        [SugarColumn(ColumnName = "account_name")]
+        public string AccountName { get; set; }
+
+        /// <summary>
+        /// 账户分类
+        /// </summary>
+        [SugarColumn(ColumnName = "category")]
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 状态：1=启用 0=禁用
+        /// </summary>
+        [SugarColumn(ColumnName = "status")]
+        public int Status { get; set; } = 1;
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        [SugarColumn(ColumnName = "sort_code")]
+        public int SortCode { get; set; } = 0;
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "create_time")]
+        public DateTime? CreateTime { get; set; }
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtAccountService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtAccountService.cs
new file mode 100644
index 0000000..260efe7
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtAccountService.cs
@@ -0,0 +1,9 @@
+namespace NCC.Extend.Interfaces.WtAccount
+{
+    /// <summary>
+    /// 账户管理服务接口
+    /// </summary>
+    public interface IWtAccountService
+    {
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtAccountService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtAccountService.cs
new file mode 100644
index 0000000..ac0aef3
--- /dev/null
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtAccountService.cs
@@ -0,0 +1,404 @@
+using NCC.Common.Core.Manager;
+using NCC.Common.Enum;
+using NCC.Common.Extension;
+using NCC.Common.Filter;
+using NCC.Common.Util;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+using NCC.FriendlyException;
+using NCC.Extend.Interfaces.WtAccount;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using NCC.Extend.Entitys;
+using NCC.Extend.Entitys.Dto.WtAccount;
+using Yitter.IdGenerator;
+using NCC.Common.Helper;
+using NCC.JsonSerialization;
+using NCC.Common.Model.NPOI;
+using NCC.Common.Configuration;
+using NCC.DataEncryption;
+using NCC.ClayObject;
+
+namespace NCC.Extend.WtAccount
+{
+    /// <summary>
+    /// 账户管理服务（独立业务模块，替代原数据字典）
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "Extend", Name = "WtAccount", Order = 200)]
+    [Route("api/Extend/[controller]")]
+    public class WtAccountService : IWtAccountService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<WtAccountEntity> _repo;
+        private readonly SqlSugarScope _db;
+        private readonly IUserManager _userManager;
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public WtAccountService(
+            ISqlSugarRepository<WtAccountEntity> repo,
+            IUserManager userManager)
+        {
+            _repo = repo;
+            _db = _repo.Context;
+            _userManager = userManager;
+        }
+
+        /// <summary>
+        /// 获取账户详情
+        /// </summary>
+        [HttpGet("{id}")]
+        public async Task<dynamic> GetInfo(string id)
+        {
+            var entity = await _db.Queryable<WtAccountEntity>().Where(p => p.Id == id).FirstAsync();
+            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
+            return new WtAccountInfoOutput
+            {
+                id = entity.Id,
+                accountCode = entity.AccountCode,
+                accountName = entity.AccountName,
+                category = entity.Category,
+                status = entity.Status,
+                sortCode = entity.SortCode,
+                createTime = entity.CreateTime
+            };
+        }
+
+        /// <summary>
+        /// 获取账户列表（分页）
+        /// </summary>
+        [HttpGet("")]
+        public async Task<dynamic> GetList([FromQuery] WtAccountListQueryInput input)
+        {
+            // MergeTable 后 OrderBy 的列名须与 Select 投影别名一致（camelCase），不能用库表列名 sort_code
+            var sidx = string.IsNullOrEmpty(input.sidx) ? "accountCode" : input.sidx;
+            var data = await _db.Queryable<WtAccountEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.keyword),
+                    p => p.AccountCode.Contains(input.keyword)
+                      || p.AccountName.Contains(input.keyword))
+                .WhereIF(!string.IsNullOrEmpty(input.category), p => p.Category == input.category)
+                .WhereIF(input.status.HasValue, p => p.Status == input.status.Value)
+                .Select(it => new WtAccountListOutput
+                {
+                    id = it.Id,
+                    accountCode = it.AccountCode,
+                    accountName = it.AccountName,
+                    category = it.Category,
+                    status = it.Status,
+                    sortCode = it.SortCode
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + input.sort)
+                .ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<WtAccountListOutput>.SqlSugarPageResult(data);
+        }
+
+        /// <summary>
+        /// 获取账户下拉选项（前端 el-select 用，只返回启用账户）。
+        /// 若传 storeId，只返回该门店在 wt_skzhb 中关联的账户；不传则返回全部启用账户。
+        /// </summary>
+        [HttpGet("Selector")]
+        public async Task<dynamic> GetSelector([FromQuery] string storeId = null)
+        {
+            ISugarQueryable<WtAccountEntity> query;
+            if (!string.IsNullOrWhiteSpace(storeId))
+            {
+                var sid = storeId.Trim();
+                var accountIds = await _db.Queryable<WtSkzhbEntity>()
+                    .Where(r => r.Ssmd == sid)
+                    .Select(r => r.Zhmc)
+                    .ToListAsync();
+                var idSet = accountIds.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().ToList();
+                query = _db.Queryable<WtAccountEntity>()
+                    .Where(p => p.Status == 1 && idSet.Contains(p.Id));
+            }
+            else
+            {
+                query = _db.Queryable<WtAccountEntity>().Where(p => p.Status == 1);
+            }
+
+            var list = await query
+                .OrderBy(p => p.AccountCode)
+                .Select(p => new
+                {
+                    id = p.Id,
+                    accountCode = p.AccountCode,
+                    accountName = p.AccountName,
+                    fullName = p.AccountName,
+                    category = p.Category
+                })
+                .ToListAsync();
+            return new { list };
+        }
+
+        /// <summary>
+        /// 新建账户
+        /// </summary>
+        [HttpPost("")]
+        public async Task Create([FromBody] WtAccountCrInput input)
+        {
+            if (string.IsNullOrWhiteSpace(input.accountName))
+            {
+                throw NCCException.Oh("账户名称不能为空");
+            }
+
+            var entity = new WtAccountEntity
+            {
+                Id = YitIdHelper.NextId().ToString(),
+                AccountName = input.accountName.Trim(),
+                Category = string.IsNullOrWhiteSpace(input.category) ? null : input.category.Trim(),
+                Status = 1,
+                SortCode = input.sortCode ?? 0,
+                CreateTime = DateTime.Now
+            };
+
+            if (string.IsNullOrWhiteSpace(input.accountCode))
+            {
+                var rule = input.codeRule.GetValueOrDefault(1);
+                entity.AccountCode = await GenerateCodeAsync(rule, entity.AccountName);
+            }
+            else
+            {
+                var manual = input.accountCode.Trim();
+                if (await _db.Queryable<WtAccountEntity>().AnyAsync(x => x.AccountCode == manual))
+                {
+                    throw NCCException.Oh("业务编码已存在，请更换或留空自动生成");
+                }
+                entity.AccountCode = manual;
+            }
+
+            var isOk = await _db.Insertable(entity).ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+        }
+
+        /// <summary>
+        /// 更新账户
+        /// </summary>
+        [HttpPut("{id}")]
+        public async Task Update(string id, [FromBody] WtAccountUpInput input)
+        {
+            var entity = await _db.Queryable<WtAccountEntity>().FirstAsync(p => p.Id == id);
+            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
+
+            if (!string.IsNullOrWhiteSpace(input.accountName))
+            {
+                entity.AccountName = input.accountName.Trim();
+            }
+
+            entity.Category = string.IsNullOrWhiteSpace(input.category) ? null : input.category.Trim();
+
+            if (input.status.HasValue)
+            {
+                entity.Status = input.status.Value;
+            }
+
+            if (input.sortCode.HasValue)
+            {
+                entity.SortCode = input.sortCode.Value;
+            }
+
+            if (!string.IsNullOrWhiteSpace(input.accountCode))
+            {
+                var code = input.accountCode.Trim();
+                if (await _db.Queryable<WtAccountEntity>().AnyAsync(x => x.AccountCode == code && x.Id != id))
+                {
+                    throw NCCException.Oh("业务编码已存在");
+                }
+                entity.AccountCode = code;
+            }
+
+            var isOk = await _db.Updateable(entity).ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
+        }
+
+        /// <summary>
+        /// 删除账户
+        /// </summary>
+        [HttpDelete("{id}")]
+        public async Task Delete(string id)
+        {
+            var entity = await _db.Queryable<WtAccountEntity>().FirstAsync(p => p.Id == id);
+            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
+            var isOk = await _db.Deleteable<WtAccountEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
+        }
+
+        /// <summary>
+        /// 批量删除账户
+        /// </summary>
+        [HttpPost("batchRemove")]
+        public async Task BatchRemove([FromBody] List<string> ids)
+        {
+            if (ids == null || ids.Count == 0) return;
+            try
+            {
+                _db.BeginTran();
+                await _db.Deleteable<WtAccountEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
+                _db.CommitTran();
+            }
+            catch (Exception)
+            {
+                _db.RollbackTran();
+                throw NCCException.Oh(ErrorCode.COM1002);
+            }
+        }
+
+        /// <summary>
+        /// 导出账户
+        /// </summary>
+        [HttpGet("Actions/Export")]
+        public async Task<dynamic> Export([FromQuery] WtAccountListQueryInput input)
+        {
+            var exportData = new List<WtAccountListOutput>();
+            if (input.dataType == 0)
+            {
+                var data = Clay.Object(await this.GetList(input));
+                exportData = data.Solidify<PageResult<WtAccountListOutput>>().list;
+            }
+            else
+            {
+                exportData = await GetNoPagingList(input);
+            }
+            List<ParamsModel> paramList = "[{\"value\":\"业务编码\",\"field\":\"accountCode\"},{\"value\":\"账户名称\",\"field\":\"accountName\"},{\"value\":\"账户分类\",\"field\":\"category\"},{\"value\":\"状态\",\"field\":\"status\"}]".ToList<ParamsModel>();
+            var excelconfig = new ExcelConfig();
+            excelconfig.FileName = "账户管理.xls";
+            excelconfig.HeadFont = "微软雅黑";
+            excelconfig.HeadPoint = 10;
+            excelconfig.IsAllSizeColumn = true;
+            excelconfig.ColumnModel = new List<ExcelColumnModel>();
+            var selectKeyList = input.selectKey.Split(',').ToList();
+            foreach (var item in selectKeyList)
+            {
+                var isExist = paramList.Find(p => p.field == item);
+                if (isExist != null)
+                {
+                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
+                }
+            }
+            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
+            ExcelExportHelper<WtAccountListOutput>.Export(exportData, excelconfig, addPath);
+            var fileName = _userManager.UserId + "|" + addPath + "|xls";
+            return new
+            {
+                name = excelconfig.FileName,
+                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
+            };
+        }
+
+        /// <summary>
+        /// 获取分类列表（去重）
+        /// </summary>
+        [HttpGet("Categories")]
+        public async Task<dynamic> GetCategories()
+        {
+            var categories = await _db.Queryable<WtAccountEntity>()
+                .Where(p => p.Category != null && p.Category != "")
+                .GroupBy(p => p.Category)
+                .Select(p => p.Category)
+                .ToListAsync();
+            return categories;
+        }
+
+        #region 私有方法
+
+        private async Task<List<WtAccountListOutput>> GetNoPagingList(WtAccountListQueryInput input)
+        {
+            var sidx = string.IsNullOrEmpty(input.sidx) ? "accountCode" : input.sidx;
+            return await _db.Queryable<WtAccountEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.keyword),
+                    p => p.AccountCode.Contains(input.keyword)
+                      || p.AccountName.Contains(input.keyword))
+                .WhereIF(!string.IsNullOrEmpty(input.category), p => p.Category == input.category)
+                .WhereIF(input.status.HasValue, p => p.Status == input.status.Value)
+                .Select(it => new WtAccountListOutput
+                {
+                    id = it.Id,
+                    accountCode = it.AccountCode,
+                    accountName = it.AccountName,
+                    category = it.Category,
+                    status = it.Status,
+                    sortCode = it.SortCode
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + input.sort)
+                .ToListAsync();
+        }
+
+        private const string CodePrefix = "SKZH";
+
+        private async Task<string> GenerateCodeAsync(int codeRule, string accountName)
+        {
+            if (codeRule == 2)
+            {
+                var abbr = BuildPinyinAbbreviation(accountName);
+                return await EnsureUniqueCodeAsync(abbr);
+            }
+
+            return await NextSequentialCodeAsync();
+        }
+
+        private async Task<string> NextSequentialCodeAsync()
+        {
+            var codes = await _db.Queryable<WtAccountEntity>()
+                .Where(x => x.AccountCode != null && x.AccountCode.StartsWith(CodePrefix))
+                .Select(x => x.AccountCode)
+                .ToListAsync();
+            var max = 0;
+            foreach (var z in codes)
+            {
+                if (z == null || z.Length <= CodePrefix.Length) continue;
+                var tail = z.Substring(CodePrefix.Length);
+                if (int.TryParse(tail, out var n) && n > max) max = n;
+            }
+            return CodePrefix + (max + 1).ToString("D5");
+        }
+
+        private static string BuildPinyinAbbreviation(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text)) return "ZH";
+            var sb = new StringBuilder();
+            foreach (var c in text.Trim())
+            {
+                if (c >= 0x4e00 && c <= 0x9fff)
+                {
+                    var py = PinyinUtil.PinyinString(c.ToString());
+                    if (!string.IsNullOrEmpty(py))
+                    {
+                        var token = py.Split(',')[0].Trim();
+                        if (token.Length > 0 && char.IsLetter(token[0]))
+                            sb.Append(char.ToUpperInvariant(token[0]));
+                    }
+                }
+                else if (char.IsLetterOrDigit(c))
+                {
+                    sb.Append(char.ToUpperInvariant(c));
+                }
+            }
+            var raw = Regex.Replace(sb.ToString(), "[^A-Z0-9]", "");
+            if (string.IsNullOrEmpty(raw)) return "ZH";
+            return raw.Length > 12 ? raw.Substring(0, 12) : raw;
+        }
+
+        private async Task<string> EnsureUniqueCodeAsync(string candidate)
+        {
+            var baseCode = string.IsNullOrWhiteSpace(candidate) ? "ZH" : candidate.Trim();
+            var c = baseCode;
+            var n = 0;
+            while (await _db.Queryable<WtAccountEntity>().AnyAsync(x => x.AccountCode == c))
+            {
+                n++;
+                c = baseCode + n;
+            }
+            return c;
+        }
+
+        #endregion
+    }
+}
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs
index 54e1ef8..2061a66 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs
@@ -734,7 +734,7 @@ namespace NCC.Extend.WtCzd
                         {
                             await _db.Ado.ExecuteCommandAsync(
                                 "INSERT INTO wt_sp_cost (F_Id, spbh, ck, cbj, sl, update_time) VALUES (@id, @spbh, @ck, @cbj, @sl, NOW())",
-                                new { id = $"{item.Spbh}_{warehouseId}", spbh = item.Spbh, ck = warehouseId, cbj = inCostPerUnit, sl = qty });
+                                new { id = YitIdHelper.NextId().ToString(), spbh = item.Spbh, ck = warehouseId, cbj = inCostPerUnit, sl = qty });
                         }
                     }
                 }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtMdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtMdService.cs
index b4b8bc4..aa6dac6 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtMdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtMdService.cs
@@ -178,7 +178,58 @@ namespace NCC.Extend.WtMd
         }
 
         /// <summary>
-        /// 批量删除门店管理
+        /// 查询 <c>wt_ck.F_ssmd</c> 中与门店主键或门店分组绑定的仓库名称（单值或逗号分隔多值均匹配）。
+        /// </summary>
+        private static (string WhereSql, object Pars) BuildSsmdMatchWhere(string sid, string grp)
+        {
+            if (string.IsNullOrWhiteSpace(grp))
+            {
+                const string sql = "(`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0)";
+                return (sql, new { sid });
+            }
+
+            var sqlGrp =
+                "( (`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0) OR " +
+                "(`F_ssmd` = @grp OR FIND_IN_SET(@grp, `F_ssmd`) > 0) )";
+            return (sqlGrp, new { sid, grp });
+        }
+
+        /// <summary>
+        /// 返回 <c>wt_ck</c> 中与门店主键或门店分组（<c>F_MdfzId</c>）在 <c>F_ssmd</c> 上绑定的仓库名称列表。
+        /// </summary>
+        private async Task<List<string>> GetLinkedWarehouseNamesAsync(WtMdEntity md)
+        {
+            if (md == null) return new List<string>();
+            var sid = md.Id?.Trim();
+            if (string.IsNullOrEmpty(sid)) return new List<string>();
+            var grp = string.IsNullOrWhiteSpace(md.MdfzId) ? null : md.MdfzId.Trim();
+            var (whereSql, pars) = BuildSsmdMatchWhere(sid, grp);
+            var names = await _db.Queryable<WtCkEntity>()
+                .Where(whereSql + " AND (`F_ssmd` IS NOT NULL AND TRIM(`F_ssmd`) <> '')", pars)
+                .Select(c => c.Mdmc)
+                .ToListAsync();
+            return names
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.Ordinal)
+                .ToList();
+        }
+
+        /// <summary>
+        /// 若存在关联仓库（所属门店指向本店或本店分组），则抛出业务异常。
+        /// </summary>
+        private async Task EnsureNoLinkedWarehousesAsync(WtMdEntity md)
+        {
+            var distinct = await GetLinkedWarehouseNamesAsync(md);
+            if (distinct.Count == 0) return;
+            var sid = md.Id?.Trim();
+            var mdLabel = string.IsNullOrWhiteSpace(md.Mdmc) ? sid : md.Mdmc.Trim();
+            throw NCCException.Oh(
+                $"门店「{mdLabel}」存在关联仓库（{string.Join("、", distinct)}），请先在仓库管理中将所属门店解绑后再删除。");
+        }
+
+        /// <summary>
+        /// 批量删除门店管理；任一条门店存在关联仓库则整批不删并返回汇总提示。
         /// </summary>
         /// <param name="ids">主键数组</param>
         /// <returns></returns>
@@ -188,6 +239,19 @@ namespace NCC.Extend.WtMd
             var entitys = await _db.Queryable<WtMdEntity>().In(it => it.Id, ids).ToListAsync();
             if (entitys.Count > 0)
             {
+                var blocks = new List<string>();
+                foreach (var e in entitys)
+                {
+                    var wh = await GetLinkedWarehouseNamesAsync(e);
+                    if (wh.Count == 0) continue;
+                    var sid = e.Id?.Trim();
+                    var mdLabel = string.IsNullOrWhiteSpace(e.Mdmc) ? sid : e.Mdmc.Trim();
+                    blocks.Add($"「{mdLabel}」：{string.Join("、", wh)}");
+                }
+
+                if (blocks.Count > 0)
+                    throw NCCException.Oh(
+                        "以下门店存在关联仓库，请先在仓库管理中将所属门店解绑后再删除：" + string.Join("；", blocks));
                 try
                 {
                     //开启事务
@@ -221,7 +285,7 @@ namespace NCC.Extend.WtMd
         }
 
         /// <summary>
-        /// 删除门店管理
+        /// 删除门店管理；若 <c>wt_ck</c> 中仍有仓库的所属门店指向该门店（或门店分组），则禁止删除。
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{id}")]
@@ -229,6 +293,7 @@ namespace NCC.Extend.WtMd
         {
             var entity = await _db.Queryable<WtMdEntity>().FirstAsync(p => p.Id == id);
             _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
+            await EnsureNoLinkedWarehousesAsync(entity);
             var isOk = await _db.Deleteable<WtMdEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkfkChannelStatService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkfkChannelStatService.cs
index 326af6d..5ca57f6 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkfkChannelStatService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkfkChannelStatService.cs
@@ -552,14 +552,14 @@ namespace NCC.Extend.WtSkfkChannelStat
             var idList = ids.Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
             if (idList.Count == 0)
                 return map;
-            var rows = await _db.Queryable<DictionaryDataEntity>()
-                .Where(d => d.DeleteMark == null && idList.Contains(d.Id))
-                .Select(d => new { d.Id, d.FullName })
+            var rows = await _db.Queryable<WtAccountEntity>()
+                .Where(a => idList.Contains(a.Id))
+                .Select(a => new { a.Id, a.AccountName })
                 .ToListAsync();
             foreach (var r in rows)
             {
                 if (!string.IsNullOrEmpty(r.Id))
-                    map[r.Id] = r.FullName ?? "";
+                    map[r.Id] = r.AccountName ?? "";
             }
 
             return map;
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkzhbService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkzhbService.cs
index 60b98b6..5049cb8 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkzhbService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSkzhbService.cs
@@ -57,17 +57,16 @@ namespace NCC.Extend.WtSkzhb
         [HttpGet("{id}")]
         public async Task<dynamic> GetInfo(string id)
         {
-            var output = await _db.Queryable<WtSkzhbEntity>()
-                .Where(p => p.Id == id)
-                .Select(it => new WtSkzhbInfoOutput
+            var output = await _db.Queryable<WtSkzhbEntity, WtAccountEntity, DictionaryDataEntity, WtMdEntity>((sk, acc, dict, md) => new JoinQueryInfos(
+                    JoinType.Left, sk.Zhmc == acc.Id,
+                    JoinType.Left, sk.Zhmc == dict.Id && (dict.DeleteMark == null || dict.DeleteMark == 0),
+                    JoinType.Left, sk.Ssmd == md.Id))
+                .Where((sk, acc, dict, md) => sk.Id == id)
+                .Select((sk, acc, dict, md) => new WtSkzhbInfoOutput
                 {
-                    id = it.Id,
-                    zhmc = SqlFunc.Subqueryable<DictionaryDataEntity>()
-                        .Where(d => d.Id == it.Zhmc)
-                        .Select(d => d.FullName),
-                    ssmd = SqlFunc.Subqueryable<WtMdEntity>()
-                        .Where(m => m.Id == it.Ssmd)
-                        .Select(m => m.Mdmc),
+                    id = sk.Id,
+                    zhmc = SqlFunc.IsNull(SqlFunc.IsNull(acc.AccountName, dict.FullName), sk.Zhmc),
+                    ssmd = md.Mdmc,
                 })
                 .FirstAsync();
             return output;
@@ -81,25 +80,36 @@ namespace NCC.Extend.WtSkzhb
         [HttpGet("")]
         public async Task<dynamic> GetList([FromQuery] WtSkzhbListQueryInput input)
         {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<WtSkzhbEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.zhmc), p => p.Zhmc.Contains(input.zhmc))
-                .WhereIF(!string.IsNullOrEmpty(input.ssmd), p => p.Ssmd.Contains(input.ssmd))
-                .Select(it=> new WtSkzhbListOutput
+            input ??= new WtSkzhbListQueryInput();
+            var pageIndex = input.currentPage > 0 ? input.currentPage : 1;
+            var pageSize = input.pageSize > 0 ? input.pageSize : 50;
+            var sidxRaw = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx.Trim();
+            var sortRaw = string.IsNullOrWhiteSpace(input.sort) ? "desc" : input.sort.Trim();
+            // MergeTable 后 OrderBy 使用输出列名；限制字段避免注入
+            var sidx = new[] { "id", "zhmc", "ssmd", "skzhDictId" }.Contains(sidxRaw, StringComparer.OrdinalIgnoreCase) ? sidxRaw : "id";
+            var sort = sortRaw.Equals("asc", StringComparison.OrdinalIgnoreCase) ? "asc" : "desc";
+            var ssmdEq = string.IsNullOrWhiteSpace(input.ssmd) ? null : input.ssmd.Trim();
+            // 不用 Select 内嵌 Subqueryable + MergeTable（SqlSugar SubResolve 会 NRE），改为 LeftJoin 拼列
+            var data = await _db.Queryable<WtSkzhbEntity, WtAccountEntity, DictionaryDataEntity, WtMdEntity>((sk, acc, dict, md) => new JoinQueryInfos(
+                    JoinType.Left, sk.Zhmc == acc.Id,
+                    JoinType.Left, sk.Zhmc == dict.Id && (dict.DeleteMark == null || dict.DeleteMark == 0),
+                    JoinType.Left, sk.Ssmd == md.Id))
+                .WhereIF(!string.IsNullOrEmpty(input.id), (sk, acc, dict, md) => sk.Id.Contains(input.id))
+                .WhereIF(!string.IsNullOrEmpty(input.zhmc), (sk, acc, dict, md) => sk.Zhmc.Contains(input.zhmc))
+                .WhereIF(ssmdEq != null, (sk, acc, dict, md) => sk.Ssmd != null && (
+                    SqlFunc.Trim(sk.Ssmd) == ssmdEq ||
+                    sk.Ssmd.Contains(ssmdEq)))
+                .Select((sk, acc, dict, md) => new WtSkzhbListOutput
                 {
-                    id = it.Id,
-                    skzhDictId = it.Zhmc,
-                    // ✅ 账户名称：通过子查询关联字典表，将ID转换为中文名称
-                    zhmc = SqlFunc.Subqueryable<DictionaryDataEntity>()
-                        .Where(d => d.Id == it.Zhmc)
-                        .Select(d => d.FullName),
-                    // ✅ 门店：通过子查询关联门店表，将ID转换为中文名称
-                    ssmd = SqlFunc.Subqueryable<WtMdEntity>()
-                        .Where(m => m.Id == it.Ssmd)
-                        .Select(m => m.Mdmc),
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<WtSkzhbListOutput>.SqlSugarPageResult(data);
+                    id = sk.Id,
+                    skzhDictId = sk.Zhmc,
+                    zhmc = SqlFunc.IsNull(SqlFunc.IsNull(acc.AccountName, dict.FullName), sk.Zhmc),
+                    ssmd = md.Mdmc,
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + sort)
+                .ToPagedListAsync(pageIndex, pageSize);
+            return PageResult<WtSkzhbListOutput>.SqlSugarPageResult(data);
         }
 
         /// <summary>
@@ -125,25 +135,32 @@ namespace NCC.Extend.WtSkzhb
         [NonAction]
         public async Task<dynamic> GetNoPagingList([FromQuery] WtSkzhbListQueryInput input)
         {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<WtSkzhbEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.zhmc), p => p.Zhmc.Contains(input.zhmc))
-                .WhereIF(!string.IsNullOrEmpty(input.ssmd), p => p.Ssmd.Contains(input.ssmd))
-                .Select(it=> new WtSkzhbListOutput
+            input ??= new WtSkzhbListQueryInput();
+            var sidxRaw = string.IsNullOrWhiteSpace(input.sidx) ? "id" : input.sidx.Trim();
+            var sortRaw = string.IsNullOrWhiteSpace(input.sort) ? "desc" : input.sort.Trim();
+            var sidx = new[] { "id", "zhmc", "ssmd", "skzhDictId" }.Contains(sidxRaw, StringComparer.OrdinalIgnoreCase) ? sidxRaw : "id";
+            var sort = sortRaw.Equals("asc", StringComparison.OrdinalIgnoreCase) ? "asc" : "desc";
+            var ssmdEq = string.IsNullOrWhiteSpace(input.ssmd) ? null : input.ssmd.Trim();
+            var data = await _db.Queryable<WtSkzhbEntity, WtAccountEntity, DictionaryDataEntity, WtMdEntity>((sk, acc, dict, md) => new JoinQueryInfos(
+                    JoinType.Left, sk.Zhmc == acc.Id,
+                    JoinType.Left, sk.Zhmc == dict.Id && (dict.DeleteMark == null || dict.DeleteMark == 0),
+                    JoinType.Left, sk.Ssmd == md.Id))
+                .WhereIF(!string.IsNullOrEmpty(input.id), (sk, acc, dict, md) => sk.Id.Contains(input.id))
+                .WhereIF(!string.IsNullOrEmpty(input.zhmc), (sk, acc, dict, md) => sk.Zhmc.Contains(input.zhmc))
+                .WhereIF(ssmdEq != null, (sk, acc, dict, md) => sk.Ssmd != null && (
+                    SqlFunc.Trim(sk.Ssmd) == ssmdEq ||
+                    sk.Ssmd.Contains(ssmdEq)))
+                .Select((sk, acc, dict, md) => new WtSkzhbListOutput
                 {
-                    id = it.Id,
-                    skzhDictId = it.Zhmc,
-                    // ✅ 账户名称：通过子查询关联字典表，将ID转换为中文名称
-                    zhmc = SqlFunc.Subqueryable<DictionaryDataEntity>()
-                        .Where(d => d.Id == it.Zhmc)
-                        .Select(d => d.FullName),
-                    // ✅ 门店：通过子查询关联门店表，将ID转换为中文名称
-                    ssmd = SqlFunc.Subqueryable<WtMdEntity>()
-                        .Where(m => m.Id == it.Ssmd)
-                        .Select(m => m.Mdmc),
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+                    id = sk.Id,
+                    skzhDictId = sk.Zhmc,
+                    zhmc = SqlFunc.IsNull(SqlFunc.IsNull(acc.AccountName, dict.FullName), sk.Zhmc),
+                    ssmd = md.Mdmc,
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + sort)
+                .ToListAsync();
+            return data;
         }
 
         /// <summary>
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
index 3a50109..7c51f2c 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using NCC.Extend.Entitys;
@@ -37,6 +38,7 @@ namespace NCC.Extend.WtSp
         private readonly ISqlSugarRepository<WtSpEntity> _wtSpRepository;
         private readonly SqlSugarScope _db;
         private readonly IUserManager _userManager;
+        private static bool _spCostCkMigrated;
 
         /// <summary>
         /// 初始化一个<see cref="WtSpService"/>类型的新实例
@@ -61,23 +63,95 @@ namespace NCC.Extend.WtSp
         }
 
         /// <summary>
-        /// 解析门店下属仓库 ID（<c>F_ssmd</c> 为单 ID 或逗号分隔多门店时均匹配，与品类 FIND_IN_SET 口径一致）。
+        /// 从门店名称得到用于匹配仓库名称（<c>F_mdmc</c>）的简称：去掉常见业态后缀，便于「景枫店」与「景枫仓」对齐。
+        /// </summary>
+        private static string StoreNameToWarehouseStem(string mdmc)
+        {
+            if (string.IsNullOrWhiteSpace(mdmc)) return "";
+            var s = mdmc.Trim();
+            var suffixes = new[]
+            {
+                "旗舰店", "专卖店", "体验店", "直营店", "加盟店", "概念店", "快闪店",
+                "店", "厅", "馆", "部", "行", "中心", "超市", "商场", "广场"
+            };
+            foreach (var suf in suffixes.OrderByDescending(x => x.Length))
+            {
+                if (s.EndsWith(suf, StringComparison.Ordinal) && s.Length > suf.Length)
+                {
+                    s = s.Substring(0, s.Length - suf.Length).Trim();
+                    break;
+                }
+            }
+
+            return s;
+        }
+
+        /// <summary>
+        /// 当 <c>wt_ck.F_ssmd</c> 未维护或与门店/分组不一致（历史删店、换主键）导致查不到仓库时，
+        /// 按门店名称前缀匹配 <c>F_mdmc</c>（<c>StartsWith</c> 简称）作为兜底，避免 <c>wt_sp_cost</c> 有数而列表 <c>mdkc</c> 恒为 0。
+        /// </summary>
+        private async Task<List<string>> GetWarehouseIdsByStoreNameStemAsync(string storeId)
+        {
+            if (string.IsNullOrWhiteSpace(storeId)) return new List<string>();
+            var mdmc = await _db.Queryable<WtMdEntity>()
+                .Where(m => m.Id == storeId)
+                .Select(m => m.Mdmc)
+                .FirstAsync();
+            var stem = StoreNameToWarehouseStem(mdmc);
+            if (string.IsNullOrEmpty(stem) || stem.Length < 2) return new List<string>();
+
+            var ids = await _db.Queryable<WtCkEntity>()
+                .Where(c => c.Mdmc != null && c.Mdmc.StartsWith(stem))
+                .Select(c => c.Id)
+                .ToListAsync();
+            return ids
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        /// <summary>
+        /// 解析门店下属仓库 ID（<c>F_ssmd</c> 为单 ID 或逗号分隔多值时均匹配）。
+        /// 同时匹配<strong>门店主键</strong>与门店绑定的<strong>门店分组</strong>（<c>wt_md.F_MdfzId</c>）：
+        /// 业务上仓库常挂在分组下，仅按门店 ID 查会漏库，导致 <c>wt_sp_cost</c> 汇总为 0。
+        /// 若仍无结果，再按门店名称前缀匹配仓库名称（见 <see cref="GetWarehouseIdsByStoreNameStemAsync"/>）。
         /// </summary>
         private async Task<List<string>> GetWarehouseIdsForStoreAsync(string xsmd)
         {
             var sid = xsmd?.Trim();
             if (string.IsNullOrEmpty(sid)) return new List<string>();
+            var grp = await ResolveMdfzIdForStoreAsync(sid);
+            object pars;
+            string whereSql;
+            if (string.IsNullOrEmpty(grp))
+            {
+                whereSql = "(`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0)";
+                pars = new { sid };
+            }
+            else
+            {
+                whereSql =
+                    "( (`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0) OR " +
+                    "(`F_ssmd` = @grp OR FIND_IN_SET(@grp, `F_ssmd`) > 0) )";
+                pars = new { sid, grp };
+            }
+
             var ids = await _db.Queryable<WtCkEntity>()
-                .Where("(`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0)", new { sid })
+                .Where(whereSql, pars)
                 .Select(c => c.Id)
                 .ToListAsync();
-            return ids
+            var list = ids
                 .Where(x => !string.IsNullOrWhiteSpace(x))
                 .Select(x => x.Trim())
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
+            if (list.Count > 0) return list;
+
+            return await GetWarehouseIdsByStoreNameStemAsync(sid);
         }
 
+
         /// <summary>
         /// 当前门店所属分组 ID（<c>wt_md.F_MdfzId</c>）；非门店主键或未绑定时返回 null。
         /// </summary>
@@ -168,48 +242,90 @@ namespace NCC.Extend.WtSp
         }
 
         /// <summary>
-        /// 按门店写入列表行的 <see cref="WtSpListOutput.mdkc"/>：与商品库存汇总一致，仅按 <c>wt_sp_cost.sl</c> 汇总（不按序列号条数；无成本行则为 0）。
+        /// 在指定门店/分组上下文下，按 <c>wt_sp_cost</c> 汇总各商品 <c>sl</c>（与列表 <c>mdkc</c>、<c>BatchCheckStock</c> 一致）。
+        /// <c>wt_sp_cost.ck</c> 统一存仓库 ID（<c>MigrateSpCostCkToWarehouseId</c> 保证）。
+        /// 已解析出下属仓库时先只计仓库维度；仅当某商品在下属仓库合计为 0 时再回退 <c>ck=门店主键</c>，避免与误存门店行重复加计。
         /// </summary>
-        private async Task ApplyMdkcBySerialAsync(List<WtSpListOutput> resultList, string xsmd)
+        private async Task<Dictionary<string, int>> SumSpCostSlForStoreContextAsync(List<string> productIds, string storeIdTrimmed)
         {
-            if (resultList == null || resultList.Count == 0) return;
+            var costDict = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+            if (productIds == null || productIds.Count == 0 || string.IsNullOrEmpty(storeIdTrimmed))
+                return costDict;
 
-            var productIds = resultList.Select(p => p.id).Distinct().ToList();
-            var storeId = xsmd?.Trim();
+            var storeId = storeIdTrimmed.Trim();
+            var warehouseIds = await GetWarehouseIdsForStoreAsync(storeId);
 
-            List<string> warehouseIds = null;
-            if (!string.IsNullOrEmpty(storeId))
+            if (warehouseIds != null && warehouseIds.Count > 0)
             {
-                warehouseIds = await GetWarehouseIdsForStoreAsync(storeId);
-                if (warehouseIds.Count == 0)
+                var whSet = new HashSet<string>(
+                    warehouseIds.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()),
+                    StringComparer.OrdinalIgnoreCase);
+                var sumsWh = await _db.Queryable<WtSpCostEntity>()
+                    .Where(c => productIds.Contains(c.Spbh) && c.Ck != null && whSet.Contains(c.Ck.Trim()))
+                    .GroupBy(c => c.Spbh)
+                    .Select(c => new { Spbh = c.Spbh, SumSl = SqlFunc.AggregateSum(c.Sl) })
+                    .ToListAsync();
+                foreach (var row in sumsWh)
+                    costDict[row.Spbh] = (int)(row.SumSl);
+
+                var needStoreCk = productIds
+                    .Where(pid =>
+                    {
+                        var key = pid?.Trim();
+                        if (string.IsNullOrEmpty(key)) return false;
+                        return !costDict.TryGetValue(key, out var n) || n == 0;
+                    })
+                    .ToList();
+                if (needStoreCk.Count > 0)
                 {
-                    foreach (var item in resultList)
-                        item.mdkc = "0";
-                    return;
+                    var sumsStore = await _db.Queryable<WtSpCostEntity>()
+                        .Where(c => needStoreCk.Contains(c.Spbh) && c.Ck == storeId)
+                        .GroupBy(c => c.Spbh)
+                        .Select(c => new { Spbh = c.Spbh, SumSl = SqlFunc.AggregateSum(c.Sl) })
+                        .ToListAsync();
+                    foreach (var row in sumsStore)
+                        costDict[row.Spbh] = (int)(row.SumSl);
                 }
             }
-
-            var costDict = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
-            if (warehouseIds == null)
+            else
             {
                 var sums = await _db.Queryable<WtSpCostEntity>()
-                    .Where(c => productIds.Contains(c.Spbh))
+                    .Where(c => productIds.Contains(c.Spbh) && c.Ck == storeId)
                     .GroupBy(c => c.Spbh)
                     .Select(c => new { Spbh = c.Spbh, SumSl = SqlFunc.AggregateSum(c.Sl) })
                     .ToListAsync();
                 foreach (var row in sums)
                     costDict[row.Spbh] = (int)(row.SumSl);
             }
-            else
+
+            return costDict;
+        }
+
+        /// <summary>
+        /// 按门店写入列表行的 <see cref="WtSpListOutput.mdkc"/>：与库存汇总一致，按 <c>wt_sp_cost.sl</c> 汇总（<strong>不是</strong>按序列号条数；方法名历史遗留）。
+        /// 口径：<c>ck</c> 为仓库主键时须落在门店下属 <c>wt_ck</c>；兼容 <c>ck</c> 误存为<strong>门店主键</strong>的旧数据；未配置门店仓库时不再整表置 0，改为仅按 <c>ck=门店Id</c> 汇总。
+        /// </summary>
+        private async Task ApplyMdkcBySerialAsync(List<WtSpListOutput> resultList, string xsmd)
+        {
+            if (resultList == null || resultList.Count == 0) return;
+
+            var productIds = resultList.Select(p => p.id).Distinct().ToList();
+            var storeId = xsmd?.Trim();
+
+            Dictionary<string, int> costDict;
+            if (string.IsNullOrEmpty(storeId))
             {
+                costDict = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
                 var sums = await _db.Queryable<WtSpCostEntity>()
-                    .Where(c => productIds.Contains(c.Spbh) && warehouseIds.Contains(c.Ck))
+                    .Where(c => productIds.Contains(c.Spbh))
                     .GroupBy(c => c.Spbh)
                     .Select(c => new { Spbh = c.Spbh, SumSl = SqlFunc.AggregateSum(c.Sl) })
                     .ToListAsync();
                 foreach (var row in sums)
                     costDict[row.Spbh] = (int)(row.SumSl);
             }
+            else
+                costDict = await SumSpCostSlForStoreContextAsync(productIds, storeId);
 
             foreach (var item in resultList)
                 item.mdkc = costDict.TryGetValue(item.id, out var csum) ? csum.ToString() : "0";
@@ -297,6 +413,48 @@ namespace NCC.Extend.WtSp
         }
 
         /// <summary>
+        /// 一次性修复 wt_sp_cost 历史数据：ck 存仓库名称的改为仓库 ID；F_Id 为「商品_仓库」等非雪花主键的改为 YitId。
+        /// </summary>
+        private void MigrateSpCostCkToWarehouseId()
+        {
+            if (_spCostCkMigrated) return;
+            lock (typeof(WtSpService))
+            {
+                if (_spCostCkMigrated) return;
+                try
+                {
+                    var affected = _db.Ado.ExecuteCommand(
+                        @"UPDATE wt_sp_cost sc
+                          INNER JOIN wt_ck ck ON ck.F_mdmc = sc.ck
+                          LEFT  JOIN wt_ck ck2 ON ck2.F_Id = sc.ck
+                          SET sc.ck = ck.F_Id
+                          WHERE ck2.F_Id IS NULL");
+                    if (affected > 0)
+                        Console.WriteLine($"✅ wt_sp_cost.ck 数据修复：{affected} 行由仓库名称改为仓库 ID");
+
+                    var dt = _db.Ado.GetDataTable("SELECT F_Id FROM wt_sp_cost WHERE F_Id REGEXP '[^0-9]'");
+                    if (dt != null && dt.Rows.Count > 0)
+                    {
+                        var fidFixed = 0;
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            var oldId = dr["F_Id"]?.ToString()?.Trim();
+                            if (string.IsNullOrEmpty(oldId)) continue;
+                            var newId = YitIdHelper.NextId().ToString();
+                            fidFixed += _db.Ado.ExecuteCommand(
+                                "UPDATE wt_sp_cost SET F_Id = @newId WHERE F_Id = @oldId",
+                                new SugarParameter("@newId", newId), new SugarParameter("@oldId", oldId));
+                        }
+                        if (fidFixed > 0)
+                            Console.WriteLine($"✅ wt_sp_cost.F_Id 数据修复：{fidFixed} 行由复合键改为雪花 ID");
+                    }
+                }
+                catch (Exception ex) { Console.WriteLine($"⚠️ MigrateSpCostCkToWarehouseId: {ex.Message}"); }
+                _spCostCkMigrated = true;
+            }
+        }
+
+        /// <summary>
 		/// 获取商品档案列表
 		/// </summary>
 		/// <param name="input">请求参数</param>
@@ -304,6 +462,7 @@ namespace NCC.Extend.WtSp
         [HttpGet("")]
         public async Task<dynamic> GetList([FromQuery] WtSpListQueryInput input)
         {
+            MigrateSpCostCkToWarehouseId();
             Console.WriteLine("=== GetList方法开始执行 ===");
             Console.WriteLine($"输入参数: spmc={input.spmc}, spbm={input.spbm}, xsmd={input.xsmd}");
             
@@ -398,7 +557,12 @@ namespace NCC.Extend.WtSp
           
           
             var qk0 = WherePlCategoryIfAny(_db.Queryable<WtSpEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Spmc.Contains(input.keyword)||p.Spbm.Contains(input.keyword)||p.Dyspid.Contains(input.keyword)), input.pl);
+                .WhereIF(
+                    !string.IsNullOrEmpty(input.keyword),
+                    p => p.Spmc.Contains(input.keyword)
+                        || p.Spbm.Contains(input.keyword)
+                        || (!SqlFunc.IsNullOrEmpty(p.Dyspid) && p.Dyspid.Contains(input.keyword))),
+                input.pl);
             var qk1 = await ApplyXsmdFilterAsync(qk0, input.xsmd);
             var data = await qk1
                 .Select(it=> new WtSpListOutput
@@ -882,10 +1046,6 @@ namespace NCC.Extend.WtSp
             try
             {
                 var storeId = input.StoreId.Trim();
-                var warehouseIds = await GetWarehouseIdsForStoreAsync(storeId);
-
-                if (warehouseIds == null || warehouseIds.Count == 0)
-                    return new { success = false, msg = "该门店下没有关联的仓库" };
 
                 var spbmList = input.Items.Select(i => i.Spbm).Where(s => !string.IsNullOrEmpty(s)).Distinct().ToList();
 
@@ -896,13 +1056,7 @@ namespace NCC.Extend.WtSp
 
                 var productIds = products.Select(p => p.Id).ToList();
 
-                var costSums = await _db.Queryable<WtSpCostEntity>()
-                    .Where(c => productIds.Contains(c.Spbh) && warehouseIds.Contains(c.Ck))
-                    .GroupBy(c => c.Spbh)
-                    .Select(c => new { Spbh = c.Spbh, SumSl = SqlFunc.AggregateSum(c.Sl) })
-                    .ToListAsync();
-
-                var stockDict = costSums.ToDictionary(x => x.Spbh, x => (int)(x.SumSl));
+                var stockDict = await SumSpCostSlForStoreContextAsync(productIds, storeId);
 
                 var results = input.Items.Select(item =>
                 {
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXlhService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXlhService.cs
index fc0242d..7052264 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXlhService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXlhService.cs
@@ -49,6 +49,46 @@ namespace NCC.Extend.WtXlh
         }
 
         /// <summary>
+        /// 按完整序列号查询关联单据流水（出货、退货等），按单据日期升序，便于查看单条序列号全链路。
+        /// </summary>
+        /// <param name="xlh">完整序列号（精确匹配，区分大小写与数据库一致）</param>
+        /// <param name="currentPage">页码</param>
+        /// <param name="pageSize">每页条数，最大 200</param>
+        [HttpGet("SerialTrace")]
+        public async Task<dynamic> GetSerialTrace([FromQuery] string xlh, [FromQuery] int currentPage = 1, [FromQuery] int pageSize = 100)
+        {
+            var key = xlh?.Trim();
+            if (string.IsNullOrEmpty(key))
+                throw NCCException.Bah("请输入序列号");
+
+            if (currentPage < 1) currentPage = 1;
+            if (pageSize < 1) pageSize = 20;
+            if (pageSize > 200) pageSize = 200;
+
+            var querySql = _db.Queryable<WtXlhEntity, WtSpEntity, WtXsckdEntity>((it, sp, xs) => it.Spbh == sp.Id && it.Djbh == xs.Id)
+                .Where((it, sp, xs) => it.Xlh == key);
+
+            var data = await querySql
+                .Select((it, sp, xs) => new WtXlhListOutput
+                {
+                    id = it.Id,
+                    xlh = it.Xlh,
+                    spbh = it.Spbh,
+                    djbh = it.Djbh,
+                    djlx = it.Djlx,
+                    zt = it.Zt,
+                    spmc = sp.Spmc,
+                    djrq = SqlFunc.ToDate(xs.Djrq),
+                    pp = SqlFunc.Subqueryable<WtPpEntity>().Where(u => u.Id == sp.Pp).Select(u => u.Ppmc)
+                })
+                .MergeTable()
+                .OrderBy("djrq asc")
+                .ToPagedListAsync(currentPage, pageSize);
+
+            return PageResult<WtXlhListOutput>.SqlSugarPageResult(data);
+        }
+
+        /// <summary>
         /// 获取序列号管理
         /// </summary>
         /// <param name="id">参数</param>
@@ -76,8 +116,7 @@ namespace NCC.Extend.WtXlh
                 .WhereIF(!string.IsNullOrEmpty(input.djbh), it => it.Djbh.Contains(input.djbh))
                 .WhereIF(!string.IsNullOrEmpty(input.djlx), it => it.Djlx.Contains(input.djlx))
                 .WhereIF(!string.IsNullOrEmpty(input.zt), it => it.Zt.Contains(input.zt));
-            Console.WriteLine(query_sql.ToSql());  
-                
+
             var data =await query_sql.Select((it,sp,xs)=> new WtXlhListOutput
                 {
                     id = it.Id,
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
index 7acb546..3111d7f 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Authorization;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -60,6 +61,52 @@ namespace NCC.Extend.WtXsckd
         private static bool _bjhcbColumnChecked;
         private static bool _fkmxColumnChecked;
         private static bool _syPchColumnChecked;
+        private static bool _spCostCkMigrated;
+
+        /// <summary>
+        /// 一次性修复 wt_sp_cost 历史数据：ck 存仓库名称的改为仓库 ID；F_Id 为「商品_仓库」等非雪花主键的改为 YitId。
+        /// </summary>
+        private void MigrateSpCostCkToWarehouseId()
+        {
+            if (_spCostCkMigrated) return;
+            lock (typeof(WtXsckdService))
+            {
+                if (_spCostCkMigrated) return;
+                try
+                {
+                    var affected = _db.Ado.ExecuteCommand(
+                        @"UPDATE wt_sp_cost sc
+                          INNER JOIN wt_ck ck ON ck.F_mdmc = sc.ck
+                          LEFT  JOIN wt_ck ck2 ON ck2.F_Id = sc.ck
+                          SET sc.ck = ck.F_Id
+                          WHERE ck2.F_Id IS NULL");
+                    if (affected > 0)
+                        Console.WriteLine($"✅ wt_sp_cost.ck 数据修复：{affected} 行由仓库名称改为仓库 ID");
+
+                    var dt = _db.Ado.GetDataTable("SELECT F_Id FROM wt_sp_cost WHERE F_Id REGEXP '[^0-9]'");
+                    if (dt != null && dt.Rows.Count > 0)
+                    {
+                        var fidFixed = 0;
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            var oldId = dr["F_Id"]?.ToString()?.Trim();
+                            if (string.IsNullOrEmpty(oldId)) continue;
+                            var newId = YitIdHelper.NextId().ToString();
+                            fidFixed += _db.Ado.ExecuteCommand(
+                                "UPDATE wt_sp_cost SET F_Id = @newId WHERE F_Id = @oldId",
+                                new SugarParameter("@newId", newId), new SugarParameter("@oldId", oldId));
+                        }
+                        if (fidFixed > 0)
+                            Console.WriteLine($"✅ wt_sp_cost.F_Id 数据修复：{fidFixed} 行由复合键改为雪花 ID");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"⚠️ MigrateSpCostCkToWarehouseId: {ex.Message}");
+                }
+                _spCostCkMigrated = true;
+            }
+        }
 
         /// <summary>
         /// 确保收银批次号列存在（同一次结账拆单关联）
@@ -377,6 +424,131 @@ namespace NCC.Extend.WtXsckd
         }
 
         /// <summary>
+        /// 删除销售类出库单（销售出库单/零售单/预售出库单）时冲回创建时产生的会员消费送积分、积分抵扣、余额支付；
+        /// 同时删除导购提成记录（wt_dgtchsb）。与 Create 中写入逻辑对称。
+        /// </summary>
+        private async Task TryReverseSalesOutboundMemberAndCommissionAsync(WtXsckdEntity entity, string reasonTag = "删除单据")
+        {
+            if (entity == null) return;
+            if (entity.Djlx != "销售出库单" && entity.Djlx != "零售单" && entity.Djlx != "预售出库单") return;
+
+            // 导购提成（与 Update 中先删除再重建逻辑一致）
+            try
+            {
+                if (entity.Djlx == "销售出库单" || entity.Djlx == "零售单")
+                {
+                    await _db.Deleteable<WtDgtchsbEntity>().Where(t => t.Djbh == entity.Id).ExecuteCommandAsync();
+                    Console.WriteLine($"✅ {reasonTag}删除导购提成: 单{entity.Id}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"⚠️ {reasonTag}删除导购提成失败(不影响删除): {ex.Message}");
+            }
+
+            if (string.IsNullOrEmpty(entity.Kh)) return;
+
+            try
+            {
+                // 冲回消费送积分
+                if (entity.Skje > 0)
+                {
+                    var points = (int)Math.Floor(entity.Skje);
+                    if (points > 0)
+                    {
+                        await _db.Insertable(new WtHyJfEntity
+                        {
+                            Id = YitIdHelper.NextId().ToString(),
+                            Jfgz = $"{reasonTag}冲回消费送积分",
+                            Jfyxq = 0,
+                            Jf = (-points).ToString(),
+                            JfUserId = entity.Kh,
+                            Jfsj = DateTime.Now
+                        }).ExecuteCommandAsync();
+                        Console.WriteLine($"✅ {reasonTag}冲回消费送积分: 会员{entity.Kh}, -{points}积分");
+                    }
+                }
+
+                // 退回积分抵扣
+                var pointsDeductYuan = ParsePointsDeductYuanFromFkmxSkmx(entity.Fkmx, entity.Skmx);
+                if (pointsDeductYuan > 0)
+                {
+                    var pointsToReturn = (int)Math.Ceiling(pointsDeductYuan * 100m);
+                    await _db.Insertable(new WtHyJfEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        Jfgz = $"{reasonTag}退回积分抵扣",
+                        Jfyxq = 0,
+                        Jf = pointsToReturn.ToString(),
+                        JfUserId = entity.Kh,
+                        Jfsj = DateTime.Now
+                    }).ExecuteCommandAsync();
+                    Console.WriteLine($"✅ {reasonTag}退回积分抵扣: 会员{entity.Kh}, +{pointsToReturn}积分");
+                }
+
+                // 退回余额支付
+                var balYuan = ParseBalanceConsumeYuanFromFkmxSkmx(entity.Fkmx, entity.Skmx);
+                if (balYuan > 0)
+                {
+                    await InsertMemberBalanceLedgerAsync(entity.Kh, -balYuan,
+                        $"{entity.Djlx}{entity.Id}{reasonTag}退回余额支付");
+                    Console.WriteLine($"✅ {reasonTag}退回余额支付: 会员{entity.Kh}, ¥{balYuan}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"⚠️ {reasonTag}冲回会员影响失败(不影响删除): {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 删除退货单（销售退货单/预售退货单/委托代销退货单）时，将创建时恢复为在库的序列号还原为已售出状态。
+        /// 利用 wt_xlh 中 zt="退货入库" 的跟踪记录定位被恢复的序列号（须在 DeleteWtXlhTrackingForDocumentAsync 之前调用）。
+        /// 与 ApplySalesReturnSerialRestoreForEntityAsync 对称。
+        /// </summary>
+        private async Task RevertSerialNumbersForDeletedReturnAsync(WtXsckdEntity returnEntity)
+        {
+            if (returnEntity == null) return;
+            if (returnEntity.Djlx != "销售退货单" && returnEntity.Djlx != "预售退货单"
+                && !returnEntity.Djlx.Contains("委托代销退货单")) return;
+
+            var origId = returnEntity.Ycddh;
+            if (string.IsNullOrEmpty(origId))
+                origId = TryParseYcddhFromRemark(returnEntity.Bz);
+
+            // 从 wt_xlh 找到本退货单「退货入库」的序列号列表
+            var xlhRecords = await _db.Queryable<WtXlhEntity>()
+                .Where(x => x.Djbh == returnEntity.Id && x.Zt == "退货入库")
+                .Select(x => new { x.Xlh, x.Spbh })
+                .ToListAsync();
+
+            if (xlhRecords == null || xlhRecords.Count == 0) return;
+
+            var serialNumbers = xlhRecords
+                .Where(x => !string.IsNullOrWhiteSpace(x.Xlh))
+                .Select(x => x.Xlh.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (serialNumbers.Count == 0) return;
+
+            // 将这些序列号还原为已售出状态（OutDjbh 指回原出库单，与出库时写入一致）
+            await _db.Updateable<WtSerialNumberEntity>()
+                .SetColumns(it => new WtSerialNumberEntity
+                {
+                    Status = 1,
+                    OutDjbh = origId ?? "",
+                    OutDjlx = returnEntity.Djlx == "销售退货单" ? "销售出库单"
+                            : (returnEntity.Djlx == "预售退货单" ? "预售出库单" : "委托代销发货单"),
+                    OutTime = DateTime.Now
+                })
+                .Where(it => serialNumbers.Contains(it.SerialNumber) && it.Status == 0)
+                .ExecuteCommandAsync();
+
+            Console.WriteLine($"✅ 删除退货单{returnEntity.Id}：已将 {serialNumbers.Count} 条序列号还原为已售出(原单{origId})");
+        }
+
+        /// <summary>
         /// 确保原价金额列存在（迁移）
         /// </summary>
         private void EnsureYdjeColumn()
@@ -591,6 +763,200 @@ namespace NCC.Extend.WtXsckd
         }
 
         /// <summary>
+        /// 将门店主键或仓库主键展开为仓库 ID 列表，用于 <c>wt_sp_cost</c> / <c>wt_serial_number</c> 操作。
+        /// 与 <c>WtSpService.GetWarehouseIdsForStoreAsync</c> 保持一致的解析口径：
+        /// 支持 <c>FIND_IN_SET</c>（逗号分隔的 <c>F_ssmd</c>）与门店分组 <c>F_MdfzId</c>。
+        /// </summary>
+        private async Task<List<string>> ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(string storeOrWarehouseId)
+        {
+            if (string.IsNullOrWhiteSpace(storeOrWarehouseId)) return new List<string>();
+            var raw = storeOrWarehouseId.Trim();
+
+            string grp = null;
+            var mdRow = await _db.Queryable<WtMdEntity>()
+                .Where(m => m.Id == raw)
+                .Select(m => new { m.MdfzId })
+                .FirstAsync();
+            if (mdRow != null) grp = mdRow?.MdfzId;
+
+            List<string> ids;
+            if (!string.IsNullOrEmpty(grp))
+            {
+                ids = await _db.Ado.SqlQueryAsync<string>(
+                    "SELECT F_Id FROM wt_ck WHERE F_Id = @sid " +
+                    "OR (`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0) " +
+                    "OR (`F_ssmd` = @grp OR FIND_IN_SET(@grp, `F_ssmd`) > 0)",
+                    new { sid = raw, grp });
+            }
+            else
+            {
+                ids = await _db.Ado.SqlQueryAsync<string>(
+                    "SELECT F_Id FROM wt_ck WHERE F_Id = @sid " +
+                    "OR `F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0",
+                    new { sid = raw });
+            }
+
+            var list = ids?
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList() ?? new List<string>();
+            if (list.Count > 0) return list;
+
+            var wid = await ResolveWarehouseIdForSerialAsync(raw);
+            return string.IsNullOrWhiteSpace(wid) ? new List<string>() : new List<string> { wid.Trim() };
+        }
+
+        /// <summary>
+        /// 删除与某出库单关联的 <c>wt_xlh</c> 跟踪行（删单或反审恢复序列号前调用，避免列表残留）。
+        /// </summary>
+        private async Task DeleteWtXlhTrackingForDocumentAsync(string djbh)
+        {
+            if (string.IsNullOrWhiteSpace(djbh)) return;
+            await _db.Deleteable<WtXlhEntity>().Where(x => x.Djbh == djbh).ExecuteCommandAsync();
+        }
+
+        /// <summary>
+        /// 向 <c>wt_xlh</c> 写入跟踪行（出货、退货等）；同一 <c>djbh + xlh</c> 已存在则跳过，可重复调用。
+        /// </summary>
+        private async Task InsertWtXlhDistinctAsync(string djbh, string djlx, string spbh, IEnumerable<string> xlhs, string zt)
+        {
+            if (string.IsNullOrWhiteSpace(djbh) || string.IsNullOrWhiteSpace(spbh)) return;
+            if (string.IsNullOrWhiteSpace(zt)) zt = "已出库";
+            var list = xlhs?
+                .Where(s => !string.IsNullOrWhiteSpace(s))
+                .Select(s => s.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList() ?? new List<string>();
+            if (list.Count == 0) return;
+
+            var existing = await _db.Queryable<WtXlhEntity>()
+                .Where(x => x.Djbh == djbh && list.Contains(x.Xlh))
+                .Select(x => x.Xlh)
+                .ToListAsync();
+            var existingSet = new HashSet<string>(
+                existing.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()),
+                StringComparer.OrdinalIgnoreCase);
+            var toAdd = list.Where(x => !existingSet.Contains(x)).ToList();
+            if (toAdd.Count == 0) return;
+
+            var rows = toAdd.Select(xlh => new WtXlhEntity
+            {
+                Id = YitIdHelper.NextId().ToString(),
+                Xlh = xlh,
+                Spbh = spbh,
+                Djbh = djbh,
+                Djlx = djlx ?? "",
+                Zt = zt
+            }).ToList();
+            await _db.Insertable(rows).ExecuteCommandAsync();
+        }
+
+        /// <summary>
+        /// 根据 <c>wt_serial_number</c> 中已出库（<c>status=1</c> 且 <c>out_djbh</c> 为本单）的记录，补全 <c>wt_xlh</c> 序列号跟踪表，
+        /// 与 <see cref="WtXlhService"/> 列表（联查 <c>wt_xsckd</c>）一致；幂等，已存在同单同序列号则跳过。
+        /// </summary>
+        private async Task SyncWtXlhOutboundFromSerialTableAsync(string djbh, string djlx, string spbh)
+        {
+            if (string.IsNullOrWhiteSpace(djbh) || string.IsNullOrWhiteSpace(spbh)) return;
+            var outSn = await _db.Queryable<WtSerialNumberEntity>()
+                .Where(s => s.OutDjbh == djbh && s.Spbh == spbh && s.Status == 1)
+                .Select(s => s.SerialNumber)
+                .ToListAsync();
+            if (outSn.Count == 0) return;
+            await InsertWtXlhDistinctAsync(djbh, djlx, spbh, outSn, "已出库");
+        }
+
+        /// <summary>
+        /// 销售类建单后补齐 <c>wt_xlh</c>：先按请求明细中的 <c>selectedSerialNumbers</c> 写入（收银台已选序列号但
+        /// <c>wt_serial_number.in_warehouse</c> 与门店/仓库解析不一致时，原逻辑会 <c>continue</c> 导致未更新序列号池、跟踪表也为空），
+        /// 再按库表 <c>out_djbh</c> 同步 FIFO 等已落库的出库记录。幂等。
+        /// </summary>
+        private async Task EnsureWtXlhForSalesOutboundCreateAsync(
+            string djbh,
+            string djlx,
+            List<WtXsckdMxCrInput> inputMxList,
+            List<WtXsckdMxEntity> mxList)
+        {
+            if (string.IsNullOrWhiteSpace(djbh) || mxList == null || mxList.Count == 0) return;
+            for (var i = 0; i < mxList.Count; i++)
+            {
+                var detail = mxList[i];
+                if (string.IsNullOrEmpty(detail?.Spbh)) continue;
+                var inputDetail = inputMxList != null && inputMxList.Count > i ? inputMxList[i] : null;
+                var sel = inputDetail?.selectedSerialNumbers?
+                    .Where(s => !string.IsNullOrWhiteSpace(s))
+                    .Select(s => s.Trim())
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList() ?? new List<string>();
+                if (sel.Count > 0)
+                    await InsertWtXlhDistinctAsync(djbh, djlx, detail.Spbh, sel, "已出库");
+                await SyncWtXlhOutboundFromSerialTableAsync(djbh, djlx, detail.Spbh);
+            }
+        }
+
+        /// <summary>
+        /// 退货单保存后补齐 <c>wt_xlh</c>「退货入库」行：<see cref="ApplySalesReturnSerialRestoreForEntityAsync"/> 依赖
+        /// <c>wt_serial_number.out_djbh</c> 指向原出库单；若出货时仅写入 <c>wt_xlh</c> 而序列号池未写 <c>out_djbh</c>，则回库为 0 且无退货跟踪。
+        /// 此时按<strong>原单</strong>在 <c>wt_xlh</c> 中「已出库」记录 FIFO 与退货数量补写；请求体带 <c>selectedSerialNumbers</c> 时优先使用。
+        /// 同一原单多行同商品共用队列，避免重复分配序列号。
+        /// </summary>
+        private async Task EnsureWtXlhAfterSalesReturnCreateAsync(
+            WtXsckdEntity header,
+            List<WtXsckdMxCrInput> inputMxList,
+            List<WtXsckdMxEntity> mxList,
+            string returnDocId)
+        {
+            if (header == null || string.IsNullOrWhiteSpace(returnDocId) || mxList == null || mxList.Count == 0) return;
+            var lx = header.Djlx ?? "";
+            if (lx != "销售退货单" && lx != "预售退货单" && !lx.Contains("委托代销退货单")) return;
+
+            var pools = new Dictionary<string, Queue<string>>(StringComparer.Ordinal);
+
+            for (var i = 0; i < mxList.Count; i++)
+            {
+                var detail = mxList[i];
+                if (string.IsNullOrEmpty(detail?.Spbh) || !int.TryParse(detail.Sl, out var slVal) || slVal <= 0)
+                    continue;
+
+                var orig = ResolveOriginalOutboundDjbhForSalesReturn(detail, header, returnDocId);
+                if (string.IsNullOrEmpty(orig)) continue;
+
+                var inputDetail = inputMxList != null && inputMxList.Count > i ? inputMxList[i] : null;
+                var fromInput = inputDetail?.selectedSerialNumbers?
+                    .Where(s => !string.IsNullOrWhiteSpace(s))
+                    .Select(s => s.Trim())
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList() ?? new List<string>();
+                if (fromInput.Count > 0)
+                {
+                    var use = fromInput.Count <= slVal ? fromInput : fromInput.Take(slVal).ToList();
+                    await InsertWtXlhDistinctAsync(returnDocId, lx, detail.Spbh, use, "退货入库");
+                    continue;
+                }
+
+                var poolKey = orig + "\u001f" + detail.Spbh;
+                if (!pools.TryGetValue(poolKey, out var q))
+                {
+                    var rows = await _db.Queryable<WtXlhEntity>()
+                        .Where(x => x.Djbh == orig && x.Spbh == detail.Spbh &&
+                            (x.Zt == "已出库" || SqlFunc.IsNullOrEmpty(x.Zt)))
+                        .OrderBy(x => x.Id)
+                        .Select(x => x.Xlh)
+                        .ToListAsync();
+                    q = new Queue<string>(rows.Where(x => !string.IsNullOrWhiteSpace(x)));
+                    pools[poolKey] = q;
+                }
+
+                var consume = new List<string>();
+                while (consume.Count < slVal && q.Count > 0)
+                    consume.Add(q.Dequeue());
+                if (consume.Count > 0)
+                    await InsertWtXlhDistinctAsync(returnDocId, lx, detail.Spbh, consume, "退货入库");
+            }
+        }
+
+        /// <summary>
         /// 销售/预售/委托代销退货单：将原单已出库序列号恢复为在库（按主表原单号纠正明细 djbh）。幂等。
         /// </summary>
         /// <returns>成功更新为在库的序列号条数</returns>
@@ -645,6 +1011,8 @@ namespace NCC.Extend.WtXsckd
                     .ExecuteCommandAsync();
 
                 total += updateCount;
+                if (updateCount > 0)
+                    await InsertWtXlhDistinctAsync(returnDocId, header.Djlx ?? "", detail.Spbh, toUpdate, "退货入库");
             }
 
             return total;
@@ -1036,6 +1404,7 @@ namespace NCC.Extend.WtXsckd
             EnsureYcddhColumn();
             EnsureYtWtfhdColumn();
             EnsureSyPchColumn();
+            MigrateSpCostCkToWarehouseId();
             var entity = await _db.Queryable<WtXsckdEntity>().FirstAsync(p => p.Id == id);
             _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
             var output = entity.Adapt<WtXsckdInfoOutput>();
@@ -1980,7 +2349,6 @@ namespace NCC.Extend.WtXsckd
                                     // 将字符串类型的Sl转换为int
                                     if (!string.IsNullOrEmpty(detail.Spbh) && int.TryParse(detail.Sl, out int slValue) && slValue > 0)
                                     {
-                                        // 确定出库门店（优先使用明细的ckck，否则使用主表的cjck）
                                         var outStoreId = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : entity.Cjck;
 
                                         if (string.IsNullOrEmpty(outStoreId))
@@ -1989,15 +2357,9 @@ namespace NCC.Extend.WtXsckd
                                             continue;
                                         }
 
-                                        // 门店下属仓库；兼容仓库主键误填在 ckck 的情况（与采购退货明细一致）
-                                        var warehouseIds = await _db.Queryable<WtCkEntity>()
-                                            .Where(c => c.Ssmd == outStoreId || c.Id == outStoreId)
-                                            .Select(c => c.Id)
-                                            .ToListAsync();
-                                        if (warehouseIds == null || warehouseIds.Count == 0)
-                                        {
-                                            warehouseIds = new List<string> { outStoreId };
-                                        }
+                                        // 序列号操作只用仓库 ID（wt_serial_number.in_warehouse 存的是 ID）
+                                        var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(outStoreId);
+                                        if (warehouseIds.Count == 0) warehouseIds = new List<string> { outStoreId };
 
                                         var selectedSerials = inputDetail?.selectedSerialNumbers?
                                             .Where(s => !string.IsNullOrWhiteSpace(s))
@@ -2059,9 +2421,16 @@ namespace NCC.Extend.WtXsckd
                                             .ExecuteCommandAsync();
 
                                         Console.WriteLine($"✅ 商品 {detail.Spmc} 已出库序列号 {updated} 条（指定或 FIFO）");
+                                        await SyncWtXlhOutboundFromSerialTableAsync(newEntity.Id, input.djlx, detail.Spbh);
                                     }
                                 }
                             }
+
+                            await EnsureWtXlhForSalesOutboundCreateAsync(
+                                newEntity.Id,
+                                input.djlx,
+                                input.wtXsckdMxList,
+                                wtXsckdMxEntityList);
                         }
                         // ✅ 销售/预售/委托代销退货单：按原单号恢复在库序列号
                         else if (input.djlx == "销售退货单" || input.djlx == "预售退货单" || input.djlx == "委托代销退货单")
@@ -2071,6 +2440,11 @@ namespace NCC.Extend.WtXsckd
                             {
                                 var n = await ApplySalesReturnSerialRestoreForEntityAsync(newEntity, wtXsckdMxEntityList, newEntity.Id);
                                 Console.WriteLine($"✅ 退货序列号恢复合计 {n} 条");
+                                await EnsureWtXlhAfterSalesReturnCreateAsync(
+                                    newEntity,
+                                    input.wtXsckdMxList,
+                                    wtXsckdMxEntityList,
+                                    newEntity.Id);
                             }
                         }
                         // ✅ 处理采购退货单：扣减在库序列号（Status 0 -> 1）
@@ -2097,16 +2471,10 @@ namespace NCC.Extend.WtXsckd
                                         {
                                             throw new Exception($"商品 {detail.Spmc} 未指定出库仓库，无法处理采购退货序列号");
                                         }
-                                        
-                                        var warehouseIds = await _db.Queryable<WtCkEntity>()
-                                            .Where(c => c.Ssmd == outStoreId || c.Id == outStoreId)
-                                            .Select(c => c.Id)
-                                            .ToListAsync();
-                                        if (warehouseIds == null || warehouseIds.Count == 0)
-                                        {
-                                            warehouseIds = new List<string> { outStoreId };
-                                        }
-                                        
+
+                                        var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(outStoreId);
+                                        if (warehouseIds.Count == 0) warehouseIds = new List<string> { outStoreId };
+
                                         var selectedSerials = inputDetail?.selectedSerialNumbers?
                                             .Where(s => !string.IsNullOrWhiteSpace(s))
                                             .Select(s => s.Trim())
@@ -2157,6 +2525,7 @@ namespace NCC.Extend.WtXsckd
                                             })
                                             .Where(it => serialsToOut.Contains(it.SerialNumber))
                                             .ExecuteCommandAsync();
+                                        await SyncWtXlhOutboundFromSerialTableAsync(newEntity.Id, input.djlx, detail.Spbh);
                                     }
                                 }
                             }
@@ -2521,15 +2890,26 @@ namespace NCC.Extend.WtXsckd
                 {
                     _db.BeginTran();
 
-                    // 逐单回退成本；退货单同步冲回会员账（审核不通过已冲回的跳过）
+                    // 逐单回退成本/积分/余额/提成/序列号
                     foreach (var entity in entitys)
                     {
-                        if ((entity.Djlx == "销售退货单" || entity.Djlx == "预售退货单")
-                            && !string.Equals(entity.Djzt, "审核不通过", StringComparison.Ordinal))
-                            await TryReverseReturnMemberRefundAsync(entity, "删除单据");
-                        if (IsStockOutboundDocumentForSerialRevert(entity.Djlx))
-                            await RevertSerialNumbersForDeletedOutboundAsync(entity.Id);
-                        await RollbackSpCostOnDelete(entity);
+                        var isRejected = string.Equals(entity.Djzt, "审核不通过", StringComparison.Ordinal);
+
+                        if (!isRejected)
+                        {
+                            if (entity.Djlx == "销售退货单" || entity.Djlx == "预售退货单")
+                                await TryReverseReturnMemberRefundAsync(entity, "删除单据");
+
+                            await TryReverseSalesOutboundMemberAndCommissionAsync(entity, "删除单据");
+
+                            if (IsStockOutboundDocumentForSerialRevert(entity.Djlx))
+                                await RevertSerialNumbersForDeletedOutboundAsync(entity.Id);
+
+                            await RevertSerialNumbersForDeletedReturnAsync(entity);
+                            await RollbackSpCostOnDelete(entity);
+                        }
+
+                        await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
                     }
 
                     await _wtDjzyService.DeleteByXsckdAsync(ids);
@@ -2610,6 +2990,37 @@ namespace NCC.Extend.WtXsckd
                 {
                     await RollbackSamePriceTransferStock(oldHeader, oldMxList);
                 }
+
+                // 编辑前先按旧明细冲回 wt_sp_cost，避免 UpdateSpCostOnCreate 二次扣减/加回
+                var oldLx = oldHeader.Djlx ?? "";
+                var oldDjzt = oldHeader.Djzt ?? "";
+                var skipCostRollback = string.Equals(oldDjzt, "草稿", StringComparison.Ordinal)
+                    || string.Equals(oldDjzt, "审核不通过", StringComparison.Ordinal);
+
+                // 销售类出库：非序列号品会被 DeductWtSpCostNonSerialOutboundAsync 重复扣减
+                if ((oldLx == "销售出库单" || oldLx == "零售单" || oldLx == "预售出库单" || oldLx == "委托代销发货单")
+                    && !skipCostRollback && oldMxList.Count > 0)
+                {
+                    await RollbackSpCostOnDelete(oldHeader);
+                }
+
+                // 退货单编辑：先冲回旧明细已加回的 wt_sp_cost
+                if ((string.Equals(oldLx, "销售退货单", StringComparison.Ordinal)
+                     || string.Equals(oldLx, "预售退货单", StringComparison.Ordinal)
+                     || oldLx.Contains("委托代销退货单"))
+                    && !skipCostRollback && oldMxList.Count > 0)
+                {
+                    await RollbackSpCostOnDelete(oldHeader);
+                    // 退货单编辑：冲回旧单创建时的会员余额/积分退回，后续 TryApplyReturnMemberRefundAsync 按新明细重写
+                    if (oldLx == "销售退货单" || oldLx == "预售退货单")
+                        await TryReverseReturnMemberRefundAsync(oldHeader, "编辑退货单");
+                }
+
+                // 采购退货单编辑：先冲回旧明细的成本扣减
+                if (oldLx == "采购退货单" && !skipCostRollback && oldMxList.Count > 0)
+                {
+                    await RollbackSpCostOnDelete(oldHeader);
+                }
                 
                 //更新销售出库单记录
                 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
@@ -2661,6 +3072,17 @@ namespace NCC.Extend.WtXsckd
                 
                 //关闭事务
                 _db.CommitTran();
+
+                // 退货单编辑完成后：按新的退货明细重新入账会员余额/积分退回（事务外，与 Create 一致）
+                if ((entity.Djlx == "销售退货单" || entity.Djlx == "预售退货单")
+                    && !input.isDraft
+                    && !string.Equals(entity.Djzt, "草稿", StringComparison.Ordinal)
+                    && !string.Equals(entity.Djzt, "审核不通过", StringComparison.Ordinal))
+                {
+                    var updatedEntity = await _db.Queryable<WtXsckdEntity>().FirstAsync(p => p.Id == id);
+                    if (updatedEntity != null)
+                        await TryApplyReturnMemberRefundAsync(updatedEntity);
+                }
             }
             catch (Exception)
             {
@@ -2689,17 +3111,35 @@ namespace NCC.Extend.WtXsckd
             {
                 _db.BeginTran();
 
-                // 退货单创建时已入账会员余额/积分；删除时先冲回（审核不通过时已冲过，避免重复）
-                if ((entity.Djlx == "销售退货单" || entity.Djlx == "预售退货单")
-                    && !string.Equals(entity.Djzt, "审核不通过", StringComparison.Ordinal))
-                    await TryReverseReturnMemberRefundAsync(entity, "删除单据");
+                // 审核不通过的单据在 RejectDocument 中已冲回所有副作用，此处仅清理记录即可
+                var isRejected = string.Equals(entity.Djzt, "审核不通过", StringComparison.Ordinal);
 
-                // 销售类出库：先恢复本单序列号为在库，再回退成本（与建单时先扣序列号再扣账对称，避免删单后账面与序列号不一致）
-                if (IsStockOutboundDocumentForSerialRevert(entity.Djlx))
-                    await RevertSerialNumbersForDeletedOutboundAsync(entity.Id);
+                if (!isRejected)
+                {
+                    // 退货单会员余额/积分冲回
+                    if (entity.Djlx == "销售退货单" || entity.Djlx == "预售退货单")
+                        await TryReverseReturnMemberRefundAsync(entity, "删除单据");
 
-                // 删除前回退成本
-                await RollbackSpCostOnDelete(entity);
+                    // 销售类出库：冲回会员积分/余额 + 删除导购提成
+                    await TryReverseSalesOutboundMemberAndCommissionAsync(entity, "删除单据");
+
+                    // 销售类出库：恢复序列号为在库
+                    if (IsStockOutboundDocumentForSerialRevert(entity.Djlx))
+                        await RevertSerialNumbersForDeletedOutboundAsync(entity.Id);
+
+                    // 退货单：将退货恢复的序列号还原为已售出（须在 DeleteWtXlhTracking 前调用）
+                    await RevertSerialNumbersForDeletedReturnAsync(entity);
+
+                    await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
+
+                    // 回退成本
+                    await RollbackSpCostOnDelete(entity);
+                }
+                else
+                {
+                    // 审核不通过：仅清理残留跟踪（序列号/xlh 回退在 Reject 中已执行，再调是安全 no-op）
+                    await DeleteWtXlhTrackingForDocumentAsync(entity.Id);
+                }
 
                 await _wtDjzyService.DeleteByXsckdAsync(id);
 
@@ -3258,14 +3698,8 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
                 var pid = productId.Trim();
                 var wid = warehouseId.Trim();
 
-                var warehouseIds = await _db.Queryable<WtCkEntity>()
-                    .Where(c => c.Ssmd == wid || c.Id == wid)
-                    .Select(c => c.Id)
-                    .ToListAsync();
-                if (warehouseIds == null || warehouseIds.Count == 0)
-                {
-                    warehouseIds = new List<string> { wid };
-                }
+                var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(wid);
+                if (warehouseIds.Count == 0) warehouseIds = new List<string> { wid };
 
                 var whSet = new HashSet<string>(
                     warehouseIds.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()),
@@ -3307,6 +3741,7 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
                 return new { success = false, restored = 0, msg = "无明细" };
 
             var restored = await ApplySalesReturnSerialRestoreForEntityAsync(entity, mxList, id);
+            await EnsureWtXlhAfterSalesReturnCreateAsync(entity, null, mxList, id);
             return new { success = true, restored, msg = restored > 0 ? $"已回库 {restored} 条序列号" : "无待回库序列号（可能已处理或原单不匹配）" };
         }
 
@@ -3325,14 +3760,8 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
 
             try
             {
-                var warehouseIds = await _db.Queryable<WtCkEntity>()
-                    .Where(c => c.Ssmd == ckOrMdId || c.Id == ckOrMdId)
-                    .Select(c => c.Id)
-                    .ToListAsync();
-                if (warehouseIds == null || warehouseIds.Count == 0)
-                {
-                    warehouseIds = new List<string> { ckOrMdId.Trim() };
-                }
+                var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(ckOrMdId);
+                if (warehouseIds.Count == 0) warehouseIds = new List<string> { ckOrMdId.Trim() };
 
                 var ps = new List<SugarParameter> { new SugarParameter("@spbh", spbh.Trim()) };
                 for (var i = 0; i < warehouseIds.Count; i++)
@@ -3357,13 +3786,25 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
             }
         }
 
+        private const string PurchaseSummaryJoinFromSql = @"
+FROM wt_xsckd_mx mx
+INNER JOIN wt_xsckd d ON d.F_Id = mx.djbh
+LEFT JOIN wt_sp sp ON sp.F_Id = mx.spbh
+LEFT JOIN wt_pl pl ON pl.F_Id = sp.F_Pl
+LEFT JOIN wt_pp pp ON pp.F_Id = sp.F_Pp
+LEFT JOIN wt_wldw w ON w.F_Id = d.gys
+LEFT JOIN BASE_USER u ON u.F_Id = d.jsr
+LEFT JOIN wt_ck ck ON ck.F_Id = IFNULL(NULLIF(TRIM(mx.rkck), ''), d.rkck)
+WHERE 1 = 1";
+
         /// <summary>
-        /// 商品采购订单汇总：按明细行返回过往采购记录（筛选后分页），列与业务导出表一致。
+        /// 采购汇总公共 WHERE（需配合含 sp/pl/pp 的 PurchaseSummaryJoinFromSql 使用）。
         /// </summary>
-        /// <param name="input">筛选条件：时间范围、往来单位、经手人、商品、入库仓库、单据类型、分页</param>
-        /// <returns>list：明细行；total：总条数</returns>
-        [HttpGet("Actions/GetPurchaseSummary")]
-        public async Task<dynamic> GetPurchaseSummary([FromQuery] WtPurchaseSummaryQueryInput input = null)
+        private (string whereSql, List<SugarParameter> paramList) BuildPurchaseSummaryWhere(
+            WtPurchaseSummaryQueryInput input,
+            string scopeCategoryId,
+            string scopeBrandId,
+            string scopeProductSpId)
         {
             input ??= new WtPurchaseSummaryQueryInput();
             var whereList = new List<string>();
@@ -3405,34 +3846,22 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
 
             if (DateTime.TryParse(input.StartDate, out var startDate))
             {
-                whereList.Add("d.djrq >= @startDate");
-                paramList.Add(new SugarParameter("@startDate", startDate.Date));
+                whereList.Add("d.djrq >= @purSumStartDate");
+                paramList.Add(new SugarParameter("@purSumStartDate", startDate.Date));
             }
 
             if (DateTime.TryParse(input.EndDate, out var endDate))
             {
-                whereList.Add("d.djrq < @endDate");
-                paramList.Add(new SugarParameter("@endDate", endDate.Date.AddDays(1)));
+                whereList.Add("d.djrq < @purSumEndDate");
+                paramList.Add(new SugarParameter("@purSumEndDate", endDate.Date.AddDays(1)));
             }
 
-            AddInCondition("d.gys", input.ContactUnit, "contactUnit");
-
-            // 经手人：主表存用户 ID，筛选按姓名匹配 BASE_USER
-            var agentNames = SplitCsv(input.Agent);
-            if (agentNames.Count > 0)
-            {
-                var agentParamNames = new List<string>();
-                for (var i = 0; i < agentNames.Count; i++)
-                {
-                    var p = $"@agentName{i}";
-                    agentParamNames.Add(p);
-                    paramList.Add(new SugarParameter(p, agentNames[i]));
-                }
+            AddInCondition("d.gys", input.ContactUnit, "purSumContact");
 
-                whereList.Add($"d.jsr IN (SELECT F_Id FROM BASE_USER WHERE F_RealName IN ({string.Join(",", agentParamNames)}))");
-            }
+            // 经手人：主表 wt_xsckd.jsr 存 BASE_USER.F_Id，按用户主键 IN 筛选（与前端下拉 value 一致）
+            AddInCondition("d.jsr", input.Agent, "purSumJsr");
 
-            AddInCondition("IFNULL(NULLIF(TRIM(mx.rkck), ''), d.rkck)", input.Warehouse, "warehouse");
+            AddInCondition("IFNULL(NULLIF(TRIM(mx.rkck), ''), d.rkck)", input.Warehouse, "purSumWh");
 
             var billTypeValues = SplitCsv(input.BillType);
             if (billTypeValues.Count == 0)
@@ -3441,7 +3870,7 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
                 billTypeValues.Add("采购退货单");
             }
 
-            AddInCondition("d.djlx", string.Join(",", billTypeValues), "billType");
+            AddInCondition("d.djlx", string.Join(",", billTypeValues), "purSumDjlx");
 
             var productValues = SplitCsv(input.Product);
             if (productValues.Count > 0)
@@ -3449,17 +3878,182 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
                 var productConditions = new List<string>();
                 for (var i = 0; i < productValues.Count; i++)
                 {
-                    var codeParam = $"@productCode{i}";
-                    var nameParam = $"@productName{i}";
-                    productConditions.Add($"(mx.spbh = {codeParam} OR mx.spmc LIKE {nameParam})");
-                    paramList.Add(new SugarParameter(codeParam, productValues[i]));
-                    paramList.Add(new SugarParameter(nameParam, $"%{productValues[i]}%"));
+                    var pEq = $"@purProdEq{i}";
+                    var pLike = $"@purProdLike{i}";
+                    productConditions.Add($"(mx.spbh = {pEq} OR sp.F_Spbm = {pEq} OR mx.spmc LIKE {pLike} OR IFNULL(sp.F_Spmc, '') LIKE {pLike})");
+                    paramList.Add(new SugarParameter(pEq, productValues[i]));
+                    paramList.Add(new SugarParameter(pLike, $"%{productValues[i]}%"));
                 }
 
                 whereList.Add($"({string.Join(" OR ", productConditions)})");
             }
 
+            var cat = !string.IsNullOrWhiteSpace(scopeCategoryId) ? scopeCategoryId.Trim() : (input.CategoryId ?? string.Empty).Trim();
+            if (cat == "__NONE__")
+            {
+                whereList.Add("(sp.F_Pl IS NULL OR TRIM(IFNULL(sp.F_Pl,'')) = '')");
+            }
+            else if (!string.IsNullOrEmpty(cat))
+            {
+                whereList.Add("sp.F_Pl = @purSumScopeCat");
+                paramList.Add(new SugarParameter("@purSumScopeCat", cat));
+            }
+
+            var brand = !string.IsNullOrWhiteSpace(scopeBrandId) ? scopeBrandId.Trim() : (input.BrandId ?? string.Empty).Trim();
+            if (!string.IsNullOrEmpty(brand))
+            {
+                whereList.Add("sp.F_Pp = @purSumScopePp");
+                paramList.Add(new SugarParameter("@purSumScopePp", brand));
+            }
+
+            var spId = !string.IsNullOrWhiteSpace(scopeProductSpId) ? scopeProductSpId.Trim() : (input.ProductSpId ?? string.Empty).Trim();
+            if (!string.IsNullOrEmpty(spId))
+            {
+                whereList.Add("mx.spbh = @purSumScopeSp");
+                paramList.Add(new SugarParameter("@purSumScopeSp", spId));
+            }
+
             var whereSql = whereList.Count > 0 ? $" AND {string.Join(" AND ", whereList)}" : string.Empty;
+            return (whereSql, paramList);
+        }
+
+        /// <summary>
+        /// 商品采购汇总（按分类聚合）：数量、加权平均入库单价、采购金额。
+        /// </summary>
+        [HttpGet("Actions/GetPurchaseSummaryByCategory")]
+        public async Task<dynamic> GetPurchaseSummaryByCategory([FromQuery] WtPurchaseSummaryQueryInput input = null)
+        {
+            input ??= new WtPurchaseSummaryQueryInput();
+            var (whereSql, paramList) = BuildPurchaseSummaryWhere(input, null, null, null);
+            var sql = $@"
+SELECT
+  IFNULL(NULLIF(TRIM(sp.F_Pl), ''), '__NONE__') AS `分类Id`,
+  IFNULL(NULLIF(TRIM(MAX(pl.F_Plmc)), ''), '无') AS `分类名称`,
+  '无' AS `商品编号`,
+  IFNULL(NULLIF(TRIM(MAX(pl.F_Plmc)), ''), '无') AS `商品名称`,
+  SUM(CAST(mx.sl AS DECIMAL(18,4))) AS `数量`,
+  CASE WHEN ABS(SUM(CAST(mx.sl AS DECIMAL(18,4)))) < 0.00000001 THEN 0
+       ELSE SUM(CAST(mx.je AS DECIMAL(18,4))) / SUM(CAST(mx.sl AS DECIMAL(18,4))) END AS `入库单价`,
+  SUM(CAST(mx.je AS DECIMAL(18,4))) AS `采购金额`
+{PurchaseSummaryJoinFromSql}
+{whereSql}
+GROUP BY sp.F_Pl, pl.F_Plmc
+ORDER BY SUM(CAST(mx.je AS DECIMAL(18,4))) DESC";
+            var list = await _db.Ado.GetDataTableAsync(sql, paramList);
+            return list;
+        }
+
+        /// <summary>
+        /// 商品采购汇总（指定分类下按品牌聚合）。
+        /// </summary>
+        [HttpGet("Actions/GetPurchaseSummaryByBrand")]
+        public async Task<dynamic> GetPurchaseSummaryByBrand([FromQuery] string categoryId, [FromQuery] WtPurchaseSummaryQueryInput input = null)
+        {
+            if (string.IsNullOrWhiteSpace(categoryId))
+            {
+                throw NCCException.Oh("categoryId 不能为空");
+            }
+
+            input ??= new WtPurchaseSummaryQueryInput();
+            var (whereSql, paramList) = BuildPurchaseSummaryWhere(input, categoryId, null, null);
+            var sql = $@"
+SELECT
+  IFNULL(NULLIF(TRIM(sp.F_Pp), ''), '') AS `品牌Id`,
+  IFNULL(NULLIF(TRIM(MAX(pp.F_Ppmc)), ''), '无') AS `品牌名称`,
+  '无' AS `商品编号`,
+  IFNULL(NULLIF(TRIM(MAX(pp.F_Ppmc)), ''), '无') AS `商品名称`,
+  SUM(CAST(mx.sl AS DECIMAL(18,4))) AS `数量`,
+  CASE WHEN ABS(SUM(CAST(mx.sl AS DECIMAL(18,4)))) < 0.00000001 THEN 0
+       ELSE SUM(CAST(mx.je AS DECIMAL(18,4))) / SUM(CAST(mx.sl AS DECIMAL(18,4))) END AS `入库单价`,
+  SUM(CAST(mx.je AS DECIMAL(18,4))) AS `采购金额`
+{PurchaseSummaryJoinFromSql}
+{whereSql}
+GROUP BY sp.F_Pp, pp.F_Ppmc
+ORDER BY SUM(CAST(mx.je AS DECIMAL(18,4))) DESC";
+            var list = await _db.Ado.GetDataTableAsync(sql, paramList);
+            return list;
+        }
+
+        /// <summary>
+        /// 商品采购汇总（指定分类+品牌下按商品聚合）。
+        /// </summary>
+        [HttpGet("Actions/GetPurchaseSummaryByProductAgg")]
+        public async Task<dynamic> GetPurchaseSummaryByProductAgg([FromQuery] string categoryId, [FromQuery] string brandId, [FromQuery] WtPurchaseSummaryQueryInput input = null)
+        {
+            if (string.IsNullOrWhiteSpace(categoryId))
+            {
+                throw NCCException.Oh("categoryId 不能为空");
+            }
+
+            if (string.IsNullOrWhiteSpace(brandId))
+            {
+                throw NCCException.Oh("brandId 不能为空");
+            }
+
+            input ??= new WtPurchaseSummaryQueryInput();
+            var (whereSql, paramList) = BuildPurchaseSummaryWhere(input, categoryId, brandId, null);
+            var sql = $@"
+SELECT
+  sp.F_Id AS `商品Id`,
+  IFNULL(NULLIF(TRIM(MAX(sp.F_Spbm)), ''), '无') AS `商品编号`,
+  IFNULL(NULLIF(TRIM(MAX(sp.F_Spmc)), ''), '无') AS `商品名称`,
+  IFNULL(NULLIF(TRIM(CONCAT_WS(' / ', NULLIF(TRIM(sp.F_Splx1), ''), NULLIF(TRIM(sp.F_Splx2), ''))), ''), '无') AS `明细分类`,
+  SUM(CAST(mx.sl AS DECIMAL(18,4))) AS `数量`,
+  CASE WHEN ABS(SUM(CAST(mx.sl AS DECIMAL(18,4)))) < 0.00000001 THEN 0
+       ELSE SUM(CAST(mx.je AS DECIMAL(18,4))) / SUM(CAST(mx.sl AS DECIMAL(18,4))) END AS `入库单价`,
+  SUM(CAST(mx.je AS DECIMAL(18,4))) AS `采购金额`
+{PurchaseSummaryJoinFromSql}
+{whereSql}
+GROUP BY sp.F_Id, sp.F_Splx1, sp.F_Splx2
+ORDER BY IFNULL(MAX(sp.F_Spbm), ''), IFNULL(MAX(sp.F_Spmc), '')";
+            var list = await _db.Ado.GetDataTableAsync(sql, paramList);
+            return list;
+        }
+
+        /// <summary>
+        /// 商品采购「线性列表」：指定分类下全部采购明细行（最多 2000 条），与明细列表列一致。
+        /// </summary>
+        [HttpGet("Actions/GetPurchaseSummaryLinear")]
+        public async Task<dynamic> GetPurchaseSummaryLinear([FromQuery] string categoryId, [FromQuery] WtPurchaseSummaryQueryInput input = null)
+        {
+            if (string.IsNullOrWhiteSpace(categoryId))
+            {
+                throw NCCException.Oh("categoryId 不能为空");
+            }
+
+            input ??= new WtPurchaseSummaryQueryInput();
+            var (whereSql, paramList) = BuildPurchaseSummaryWhere(input, categoryId, null, null);
+            const int maxRows = 2000;
+            var sql = $@"
+SELECT
+  DATE_FORMAT(d.djrq, '%Y-%m-%d') AS `单据日期`,
+  d.F_Id AS `单据编号`,
+  d.djlx AS `单据类型`,
+  IFNULL(NULLIF(TRIM(w.dwmc), ''), '无') AS `往来单位`,
+  IFNULL(NULLIF(TRIM(u.F_RealName), ''), IFNULL(NULLIF(TRIM(d.jsr), ''), '无')) AS `经手人`,
+  IFNULL(NULLIF(TRIM(ck.F_mdmc), ''), '无') AS `仓库名称`,
+  IFNULL(NULLIF(TRIM(mx.spmc), ''), '无') AS `商品名称`,
+  CAST(mx.sl AS DECIMAL(18,4)) AS `数量`,
+  mx.dj AS `入库单价`,
+  mx.je AS `采购金额`
+{PurchaseSummaryJoinFromSql}
+{whereSql}
+ORDER BY d.djrq DESC, d.F_Id, mx.F_Id
+LIMIT {maxRows}";
+            var list = await _db.Ado.GetDataTableAsync(sql, paramList);
+            return list;
+        }
+
+        /// <summary>
+        /// 商品采购订单汇总：按明细行返回过往采购记录（筛选后分页），列与业务导出表一致。
+        /// </summary>
+        /// <param name="input">筛选条件：时间范围、往来单位、经手人（用户主键）、商品、入库仓库、单据类型、分页；可选 CategoryId/BrandId/ProductSpId 下钻</param>
+        /// <returns>list：明细行；total：总条数</returns>
+        [HttpGet("Actions/GetPurchaseSummary")]
+        public async Task<dynamic> GetPurchaseSummary([FromQuery] WtPurchaseSummaryQueryInput input = null)
+        {
+            input ??= new WtPurchaseSummaryQueryInput();
+            var (whereSql, paramList) = BuildPurchaseSummaryWhere(input, null, null, null);
 
             var page = input.CurrentPage.GetValueOrDefault(1);
             if (page < 1)
@@ -3480,15 +4074,7 @@ ORDER BY IFNULL(MAX(pp.F_Ppmc), ''), IFNULL(MAX(s.F_Spbm), '')";
 
             var offset = (page - 1) * pageSize;
 
-            var fromSql = @"
-FROM wt_xsckd_mx mx
-INNER JOIN wt_xsckd d ON d.F_Id = mx.djbh
-LEFT JOIN wt_wldw w ON w.F_Id = d.gys
-LEFT JOIN BASE_USER u ON u.F_Id = d.jsr
-LEFT JOIN wt_ck ck ON ck.F_Id = IFNULL(NULLIF(TRIM(mx.rkck), ''), d.rkck)
-WHERE 1 = 1";
-
-            var countSql = "SELECT COUNT(*) " + fromSql + whereSql;
+            var countSql = "SELECT COUNT(*) " + PurchaseSummaryJoinFromSql + whereSql;
             var totalObj = await _db.Ado.GetScalarAsync(countSql, paramList);
             var total = Convert.ToInt32(totalObj ?? 0);
 
@@ -3504,7 +4090,7 @@ SELECT
   CAST(mx.sl AS DECIMAL(18,4)) AS `数量`,
   mx.dj AS `入库单价`,
   mx.je AS `采购金额`
-{fromSql}
+{PurchaseSummaryJoinFromSql}
 {whereSql}
 ORDER BY d.djrq DESC, d.F_Id, mx.F_Id
 LIMIT {offset}, {pageSize}";
@@ -3875,6 +4461,37 @@ LIMIT {offset}, {pageSize}";
                             .ExecuteCommandAsync();
                     }
                 }
+
+                if (!isDraft && serialNumbers != null && serialNumbers.Count > 0 &&
+                    !string.IsNullOrEmpty(outDocumentId) &&
+                    outDocumentType != "销售退货单" && outDocumentType != "预售退货单" &&
+                    outDocumentType != "委托代销退货单" && outDocumentType != "采购退货单")
+                {
+                    var spbhList = await _db.Queryable<WtSerialNumberEntity>()
+                        .Where(s => serialNumbers.Contains(s.SerialNumber) && s.OutDjbh == outDocumentId)
+                        .Select(s => s.Spbh)
+                        .ToListAsync();
+                    foreach (var sp in spbhList.Distinct(StringComparer.OrdinalIgnoreCase))
+                    {
+                        if (!string.IsNullOrEmpty(sp))
+                            await SyncWtXlhOutboundFromSerialTableAsync(outDocumentId, outDocumentType, sp);
+                    }
+                }
+
+                if (!isDraft && serialNumbers != null && serialNumbers.Count > 0 && !string.IsNullOrEmpty(outDocumentId) &&
+                    (outDocumentType == "销售退货单" || outDocumentType == "预售退货单" || outDocumentType == "委托代销退货单"))
+                {
+                    var snRows = await _db.Queryable<WtSerialNumberEntity>()
+                        .Where(s => serialNumbers.Contains(s.SerialNumber))
+                        .Select(s => new { s.SerialNumber, s.Spbh })
+                        .ToListAsync();
+                    foreach (var g in snRows.GroupBy(x => x.Spbh ?? "", StringComparer.OrdinalIgnoreCase))
+                    {
+                        if (string.IsNullOrEmpty(g.Key)) continue;
+                        await InsertWtXlhDistinctAsync(outDocumentId, outDocumentType, g.Key,
+                            g.Select(x => x.SerialNumber).ToList(), "退货入库");
+                    }
+                }
                 
                 return new { success = true, message = "序列号状态更新成功", created = missingSerialNumbers.Count };
             }
@@ -4441,8 +5058,50 @@ LIMIT {offset}, {pageSize}";
                         return new { success = false, message = "单据不存在" };
                     }
 
-                    AppendApprovalSpbzLine(row, "审核不通过", approvalRemark);
+                    var rowDjlx = row.Djlx ?? "";
+                    var wasNotDraft = !string.Equals(row.Djzt, "草稿", StringComparison.Ordinal);
 
+                    // ★ 审核不通过 = 单据从未生效：先按旧状态冲回所有 Create 时产生的副作用
+                    if (wasNotDraft)
+                    {
+                        // 销售类出库：冲回 wt_sp_cost / 序列号 / wt_xlh / 会员 / 提成
+                        if (rowDjlx == "销售出库单" || rowDjlx == "零售单" || rowDjlx == "预售出库单" || rowDjlx == "委托代销发货单")
+                        {
+                            if (IsStockOutboundDocumentForSerialRevert(rowDjlx))
+                                await RevertSerialNumbersForDeletedOutboundAsync(row.Id);
+                            await DeleteWtXlhTrackingForDocumentAsync(row.Id);
+                            await RollbackSpCostOnDelete(row);
+                            await TryReverseSalesOutboundMemberAndCommissionAsync(row, "审核不通过");
+                        }
+                        // 退货单：冲回 wt_sp_cost / 序列号还原 / wt_xlh / 会员退回
+                        else if (rowDjlx == "销售退货单" || rowDjlx == "预售退货单" || rowDjlx.Contains("委托代销退货单"))
+                        {
+                            await RevertSerialNumbersForDeletedReturnAsync(row);
+                            await DeleteWtXlhTrackingForDocumentAsync(row.Id);
+                            await RollbackSpCostOnDelete(row);
+                            if (rowDjlx == "销售退货单" || rowDjlx == "预售退货单")
+                                await TryReverseReturnMemberRefundAsync(row, "审核不通过");
+                        }
+                        // 采购退货单：冲回 wt_sp_cost
+                        else if (rowDjlx == "采购退货单")
+                        {
+                            await RollbackSpCostOnDelete(row);
+                        }
+                        // 变价调拨单：冲回变价成本
+                        else if (rowDjlx == "变价调拨单")
+                        {
+                            var mxList = await _db.Queryable<WtXsckdMxEntity>().Where(d => d.Djbh == id).ToListAsync();
+                            if (mxList.Count > 0)
+                            {
+                                EnsureBjsxColumn();
+                                EnsureBjhcbColumn();
+                                await RollbackVariablePriceTransferCost(row, mxList);
+                            }
+                        }
+                    }
+
+                    // ★ 更新状态为审核不通过
+                    AppendApprovalSpbzLine(row, "审核不通过", approvalRemark);
                     row.Djzt = "审核不通过";
                     row.Shr = userId;
                     row.Shr1 = null;
@@ -4451,10 +5110,6 @@ LIMIT {offset}, {pageSize}";
                         .UpdateColumns(x => new { x.Djzt, x.Spbz, x.Shr, x.Shr1, x.Shr2 })
                         .ExecuteCommandAsync();
 
-                    // 创建退货单时已写入会员余额/积分；审核不通过须冲回，避免反复退审后再退货重复扣减
-                    if (row.Djlx == "销售退货单" || row.Djlx == "预售退货单")
-                        await TryReverseReturnMemberRefundAsync(row, "审核不通过");
-
                     _db.CommitTran();
                     return new { success = true, message = "已标记为审核不通过" };
                 }
@@ -4694,6 +5349,100 @@ LIMIT {offset}, {pageSize}";
             }
         }
 
+        /// <summary>门店名称去后缀简称，与 <c>wt_ck.F_mdmc</c> 前缀匹配（预售转销售库存校验用）。</summary>
+        private static string StoreNameToWarehouseStemForPresaleConvert(string mdmc)
+        {
+            if (string.IsNullOrWhiteSpace(mdmc)) return "";
+            var s = mdmc.Trim();
+            var suffixes = new[]
+            {
+                "旗舰店", "专卖店", "体验店", "直营店", "加盟店", "概念店", "快闪店",
+                "店", "厅", "馆", "部", "行", "中心", "超市", "商场", "广场"
+            };
+            foreach (var suf in suffixes.OrderByDescending(x => x.Length))
+            {
+                if (s.EndsWith(suf, StringComparison.Ordinal) && s.Length > suf.Length)
+                {
+                    s = s.Substring(0, s.Length - suf.Length).Trim();
+                    break;
+                }
+            }
+
+            return s;
+        }
+
+        /// <summary>门店主键对应的 <c>wt_md.F_MdfzId</c>（无则 null）。</summary>
+        private async Task<string> ResolveMdfzIdForPresaleConvertAsync(string storeIdTrimmed)
+        {
+            if (string.IsNullOrEmpty(storeIdTrimmed)) return null;
+            var rows = await _db.Queryable<WtMdEntity>()
+                .Where(m => m.Id == storeIdTrimmed)
+                .Select(m => m.MdfzId)
+                .Take(1)
+                .ToListAsync();
+            return rows.Count > 0 ? rows[0] : null;
+        }
+
+        private async Task<List<string>> GetWarehouseIdsByStoreNameStemForPresaleConvertAsync(string storeId)
+        {
+            if (string.IsNullOrWhiteSpace(storeId)) return new List<string>();
+            var mdmc = await _db.Queryable<WtMdEntity>()
+                .Where(m => m.Id == storeId)
+                .Select(m => m.Mdmc)
+                .FirstAsync();
+            var stem = StoreNameToWarehouseStemForPresaleConvert(mdmc);
+            if (string.IsNullOrEmpty(stem) || stem.Length < 2) return new List<string>();
+            var ids = await _db.Queryable<WtCkEntity>()
+                .Where(c => c.Mdmc != null && c.Mdmc.StartsWith(stem))
+                .Select(c => c.Id)
+                .ToListAsync();
+            return ids
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        /// <summary>
+        /// 预售转销售时按门店/仓库解析 <c>wt_ck</c> 主键列表（含分组 <c>F_ssmd</c>、<c>ck</c> 即仓库主键、名称前缀兜底），与商品列表库存口径一致。
+        /// </summary>
+        private async Task<List<string>> ResolveWarehouseIdsForPresaleConvertAsync(string storeOrWarehouseId)
+        {
+            if (string.IsNullOrWhiteSpace(storeOrWarehouseId)) return new List<string>();
+            var sid = storeOrWarehouseId.Trim();
+            var byCkId = await _db.Queryable<WtCkEntity>().Where(c => c.Id == sid).Select(c => c.Id).Take(1).ToListAsync();
+            if (byCkId.Count > 0) return new List<string> { byCkId[0] };
+
+            var grp = await ResolveMdfzIdForPresaleConvertAsync(sid);
+            object pars;
+            string whereSql;
+            if (string.IsNullOrEmpty(grp))
+            {
+                whereSql = "(`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0)";
+                pars = new { sid };
+            }
+            else
+            {
+                whereSql =
+                    "( (`F_ssmd` = @sid OR FIND_IN_SET(@sid, `F_ssmd`) > 0) OR " +
+                    "(`F_ssmd` = @grp OR FIND_IN_SET(@grp, `F_ssmd`) > 0) )";
+                pars = new { sid, grp };
+            }
+
+            var ids = await _db.Queryable<WtCkEntity>()
+                .Where(whereSql, pars)
+                .Select(c => c.Id)
+                .ToListAsync();
+            var list = ids
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+            if (list.Count > 0) return list;
+
+            return await GetWarehouseIdsByStoreNameStemForPresaleConvertAsync(sid);
+        }
+
         /// <summary>
         /// 预售出库单转销售出库单
         /// </summary>
@@ -4759,54 +5508,38 @@ LIMIT {offset}, {pageSize}";
                     return new { success = false, message = "预售出库单明细不存在" };
                 }
                 
-                // 4. 检查库存是否充足
+                // 4. 检查在库序列号是否充足（与 Create 明细序列号、商品库存口径一致：分组/门店/仓库主键、名称兜底、in_warehouse 误存门店主键）
                 var insufficientStock = new List<string>();
-                var outStoreId = presaleOrder.Cjck; // 出库门店
-                
-                // 将门店ID转换为仓库ID列表
-                var warehouseIds = new List<string>();
-                if (!string.IsNullOrEmpty(outStoreId))
-                {
-                    warehouseIds = await _db.Queryable<WtCkEntity>()
-                        .Where(c => c.Ssmd == outStoreId)
-                        .Select(c => c.Id)
-                        .ToListAsync();
-                }
-                
+                var outStoreId = presaleOrder.Cjck;
+
                 foreach (var detail in presaleDetails)
                 {
-                    if (!string.IsNullOrEmpty(detail.Spbh) && int.TryParse(detail.Sl, out int requiredQty) && requiredQty > 0)
+                    if (string.IsNullOrEmpty(detail.Spbh) || !int.TryParse(detail.Sl, out int requiredQty) || requiredQty <= 0)
+                        continue;
+
+                    var detailOutStoreId = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : outStoreId;
+
+                    if (string.IsNullOrEmpty(detailOutStoreId))
                     {
-                        // 确定出库门店（优先使用明细的ckck，否则使用主表的cjck）
-                        var detailOutStoreId = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : outStoreId;
-                        
-                        if (string.IsNullOrEmpty(detailOutStoreId))
-                        {
-                            insufficientStock.Add($"{detail.Spmc}（未指定出库门店）");
-                            continue;
-                        }
-                        
-                        // 查询该门店所属仓库中的可用序列号数量
-                        var detailWarehouseIds = await _db.Queryable<WtCkEntity>()
-                            .Where(c => c.Ssmd == detailOutStoreId)
-                            .Select(c => c.Id)
-                            .ToListAsync();
-                        
-                        if (detailWarehouseIds == null || detailWarehouseIds.Count == 0)
-                        {
-                            insufficientStock.Add($"{detail.Spmc}（门店未找到关联的仓库）");
-                            continue;
-                        }
-                        
-                        var availableCount = await _db.Queryable<WtSerialNumberEntity>()
-                            .Where(s => s.Spbh == detail.Spbh && (s.Status == 0 || s.Status == 3) && detailWarehouseIds.Contains(s.InWarehouse))
-                            .CountAsync();
-                        
-                        if (availableCount < requiredQty)
-                        {
-                            insufficientStock.Add($"{detail.Spmc}（需要{requiredQty}个，可用{availableCount}个）");
-                        }
+                        insufficientStock.Add($"{detail.Spmc}（未指定出库门店）");
+                        continue;
                     }
+
+                    var detailWarehouseIds = await ResolveWarehouseIdsForPresaleConvertAsync(detailOutStoreId);
+                    if (detailWarehouseIds == null || detailWarehouseIds.Count == 0)
+                        detailWarehouseIds = new List<string> { detailOutStoreId };
+
+                    var whSet = new HashSet<string>(
+                        detailWarehouseIds.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()),
+                        StringComparer.OrdinalIgnoreCase);
+
+                    var availableCount = await _db.Queryable<WtSerialNumberEntity>()
+                        .Where(s => s.Spbh == detail.Spbh && (s.Status == 0 || s.Status == 3)
+                            && (whSet.Contains(s.InWarehouse) || s.InWarehouse == detailOutStoreId))
+                        .CountAsync();
+
+                    if (availableCount < requiredQty)
+                        insufficientStock.Add($"{detail.Spmc}（需要{requiredQty}个，可用{availableCount}个）");
                 }
                 
                 if (insufficientStock.Any())
@@ -4919,7 +5652,16 @@ LIMIT {offset}, {pageSize}";
                     Skmx = presaleOrder.Skmx,
                     Fkmx = presaleOrder.Fkmx
                 };
-                
+
+                // 与收银台下单一致：非「后台」来源的销售出库单不走 ERP 待审（见 IsSalesOutboundSkipErpAudit），落库为已审核
+                if (IsSalesOutboundSkipErpAudit(newSalesOrder))
+                {
+                    var approver = userId ?? "";
+                    newSalesOrder.Djzt = "已审核";
+                    newSalesOrder.Shr = approver;
+                    newSalesOrder.Shr1 = approver;
+                }
+
                 var newSalesOrderEntity = await _db.Insertable(newSalesOrder).ExecuteReturnEntityAsync();
                 
                 // 7. 创建销售出库单明细并处理序列号
@@ -4975,6 +5717,7 @@ LIMIT {offset}, {pageSize}";
                                 .ExecuteCommandAsync();
                             
                             totalUpdated += updateCount;
+                            await SyncWtXlhOutboundFromSerialTableAsync(newSalesOrderEntity.Id, "销售出库单", newDetail.Spbh);
                         }
                     }
                 }
@@ -5331,7 +6074,7 @@ LIMIT {offset}, {pageSize}";
                     {
                         await _db.Ado.ExecuteCommandAsync(
                             "INSERT INTO wt_sp_cost (F_Id, spbh, ck, cbj, sl, update_time) VALUES (@id, @spbh, @ck, @cbj, @sl, NOW())",
-                            new { id = $"{detail.Spbh}_{detailWarehouse}", spbh = detail.Spbh, ck = detailWarehouse, cbj = purchasePrice, sl = qty });
+                            new { id = YitIdHelper.NextId().ToString(), spbh = detail.Spbh, ck = detailWarehouse, cbj = purchasePrice, sl = qty });
                     }
                 }
             }
@@ -5462,7 +6205,6 @@ LIMIT {offset}, {pageSize}";
             {
                 if (djlx == "销售出库单" || djlx == "零售单" || djlx == "预售出库单" || djlx == "委托代销发货单")
                 {
-                    // 草稿不扣减账面库存，避免未生效单据影响 wt_sp_cost
                     if (isDraft || string.Equals(entity.Djzt, "草稿", StringComparison.Ordinal))
                         return;
 
@@ -5474,16 +6216,9 @@ LIMIT {offset}, {pageSize}";
                         if (string.IsNullOrEmpty(detail.Spbh)) continue;
                         if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
 
-                        // 兼容前端传门店ID或仓库ID：按明细仓库优先，其次主表出库仓库
                         var detailStoreOrWarehouseId = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : outStoreId;
-                        var warehouseIds = await _db.Queryable<WtCkEntity>()
-                            .Where(c => c.Ssmd == detailStoreOrWarehouseId || c.Id == detailStoreOrWarehouseId)
-                            .Select(c => c.Id)
-                            .ToListAsync();
-                        if (warehouseIds == null || warehouseIds.Count == 0)
-                        {
-                            warehouseIds = new List<string> { detailStoreOrWarehouseId };
-                        }
+                        var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(detailStoreOrWarehouseId);
+                        if (warehouseIds.Count == 0) continue;
 
                         var costResult = await _db.Ado.SqlQueryAsync<decimal?>(
                             $"SELECT cbj FROM wt_sp_cost WHERE spbh = @spbh AND ck IN ({string.Join(",", warehouseIds.Select((_, i) => $"@ck{i}"))}) AND cbj > 0 LIMIT 1",
@@ -5511,48 +6246,56 @@ LIMIT {offset}, {pageSize}";
                         }
                         else
                         {
-                            // 无序列号/不入序列号管理：不能仅用「在库序列数」同步 sl，否则出库后数量不减少
                             await DeductWtSpCostNonSerialOutboundAsync(detail.Spbh, warehouseIds, qty);
                         }
                     }
                 }
                 else if (djlx == "销售退货单" || djlx == "预售退货单" || djlx == "委托代销退货单")
                 {
-                    var returnWarehouseId = !string.IsNullOrEmpty(entity.Rkck) ? entity.Rkck : entity.Cjck;
-                    if (string.IsNullOrEmpty(returnWarehouseId)) return;
-                    
+                    // 与 ApplySalesReturnSerialRestoreForEntityAsync 一致：优先明细入库仓，避免主表 cjck/rkck 与成本行 ck 不一致导致「退货已审但 wt_sp_cost 未加回」
+                    if (isDraft || string.Equals(entity.Djzt, "草稿", StringComparison.Ordinal))
+                        return;
+
                     foreach (var detail in mxList)
                     {
                         if (string.IsNullOrEmpty(detail.Spbh)) continue;
                         if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
-                        
-                        var existing = await _db.Ado.SqlQueryAsync<dynamic>(
-                            "SELECT sl FROM wt_sp_cost WHERE spbh = @spbh AND ck = @ck LIMIT 1",
-                            new { spbh = detail.Spbh, ck = returnWarehouseId });
-                        
-                        if (existing != null && existing.Count > 0)
+
+                        var rkRaw = !string.IsNullOrEmpty(detail.Rkck) ? detail.Rkck
+                            : (!string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck
+                                : (!string.IsNullOrEmpty(entity.Rkck) ? entity.Rkck : entity.Cjck));
+                        if (string.IsNullOrWhiteSpace(rkRaw)) continue;
+
+                        var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(rkRaw);
+                        if (warehouseIds.Count == 0) continue;
+
+                        var strictSerial = await IsProductStrictSerialOutboundAsync(detail.Spbh);
+                        if (strictSerial)
                         {
-                            await _db.Ado.ExecuteCommandAsync(
-                                "UPDATE wt_sp_cost SET sl = sl + @qty, update_time = NOW() WHERE spbh = @spbh AND ck = @ck",
-                                new { qty, spbh = detail.Spbh, ck = returnWarehouseId });
+                            foreach (var whId in warehouseIds)
+                            {
+                                var actualCount = await _db.Ado.GetIntAsync(
+                                    "SELECT COUNT(*) FROM wt_serial_number WHERE spbh = @spbh AND in_warehouse = @ck AND (status = 0 OR status = 3)",
+                                    new SugarParameter[] { new SugarParameter("@spbh", detail.Spbh.Trim()), new SugarParameter("@ck", whId) });
+                                await _db.Ado.ExecuteCommandAsync(
+                                    "UPDATE wt_sp_cost SET sl = @sl, update_time = NOW() WHERE spbh = @spbh AND ck = @ck",
+                                    new { sl = actualCount, spbh = detail.Spbh.Trim(), ck = whId });
+                            }
+                        }
+                        else
+                        {
+                            await RestoreWtSpCostNonSerialOutboundAsync(detail.Spbh.Trim(), warehouseIds, qty);
                         }
                     }
                 }
                 else if (djlx == "采购退货单")
                 {
-                    // 采购退货：用退货明细中的单价（即原始采购价）做反向加权平均
                     var outStoreId = entity.Cjck;
                     if (string.IsNullOrEmpty(outStoreId)) return;
-                    
-                    var warehouseIds = await _db.Queryable<WtCkEntity>()
-                        .Where(c => c.Ssmd == outStoreId || c.Id == outStoreId)
-                        .Select(c => c.Id)
-                        .ToListAsync();
-                    if (warehouseIds == null || warehouseIds.Count == 0)
-                    {
-                        warehouseIds = new List<string> { outStoreId };
-                    }
-                    
+
+                    var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(outStoreId);
+                    if (warehouseIds.Count == 0) return;
+
                     foreach (var detail in mxList)
                     {
                         if (string.IsNullOrEmpty(detail.Spbh)) continue;
@@ -5719,12 +6462,8 @@ LIMIT {offset}, {pageSize}";
                     if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
 
                     var detailStoreOrWarehouseId = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : outStoreId;
-                    var warehouseIds = await _db.Queryable<WtCkEntity>()
-                        .Where(c => c.Ssmd == detailStoreOrWarehouseId || c.Id == detailStoreOrWarehouseId)
-                        .Select(c => c.Id)
-                        .ToListAsync();
-                    if (warehouseIds == null || warehouseIds.Count == 0)
-                        warehouseIds = new List<string> { detailStoreOrWarehouseId.Trim() };
+                    var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(detailStoreOrWarehouseId);
+                    if (warehouseIds.Count == 0) continue;
 
                     var strictSerial = await IsProductStrictSerialOutboundAsync(detail.Spbh);
                     if (strictSerial)
@@ -5747,9 +6486,6 @@ LIMIT {offset}, {pageSize}";
             }
             else if (djlx == "销售退货单" || djlx == "预售退货单" || djlx == "委托代销退货单")
             {
-                var returnWarehouseId = !string.IsNullOrEmpty(entity.Rkck) ? entity.Rkck : entity.Cjck;
-                if (string.IsNullOrEmpty(returnWarehouseId)) return;
-
                 var mxList = await _db.Queryable<WtXsckdMxEntity>()
                     .Where(d => d.Djbh == id).ToListAsync();
 
@@ -5758,23 +6494,40 @@ LIMIT {offset}, {pageSize}";
                     if (string.IsNullOrEmpty(detail.Spbh)) continue;
                     if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
 
-                    await _db.Ado.ExecuteCommandAsync(
-                        "UPDATE wt_sp_cost SET sl = sl - @qty, update_time = NOW() WHERE spbh = @spbh AND ck = @ck",
-                        new { qty, spbh = detail.Spbh, ck = returnWarehouseId });
+                    var rkRaw = !string.IsNullOrEmpty(detail.Rkck) ? detail.Rkck
+                        : (!string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck
+                            : (!string.IsNullOrEmpty(entity.Rkck) ? entity.Rkck : entity.Cjck));
+                    if (string.IsNullOrWhiteSpace(rkRaw)) continue;
+
+                    var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(rkRaw);
+                    if (warehouseIds.Count == 0) continue;
+
+                    var strictSerial = await IsProductStrictSerialOutboundAsync(detail.Spbh);
+                    if (strictSerial)
+                    {
+                        foreach (var whId in warehouseIds)
+                        {
+                            var actualCount = await _db.Ado.GetIntAsync(
+                                "SELECT COUNT(*) FROM wt_serial_number WHERE spbh = @spbh AND in_warehouse = @ck AND (status = 0 OR status = 3)",
+                                new SugarParameter[] { new SugarParameter("@spbh", detail.Spbh.Trim()), new SugarParameter("@ck", whId) });
+                            await _db.Ado.ExecuteCommandAsync(
+                                "UPDATE wt_sp_cost SET sl = @sl, update_time = NOW() WHERE spbh = @spbh AND ck = @ck",
+                                new { sl = actualCount, spbh = detail.Spbh.Trim(), ck = whId });
+                        }
+                    }
+                    else
+                    {
+                        await DeductWtSpCostNonSerialOutboundAsync(detail.Spbh.Trim(), warehouseIds, qty);
+                    }
                 }
             }
             else if (djlx == "采购退货单")
             {
-                // 采购退货单删除：恢复成本（反向操作，相当于再入库）
                 var outStoreId = entity.Cjck;
                 if (string.IsNullOrEmpty(outStoreId)) return;
-                
-                var warehouseIds = await _db.Queryable<WtCkEntity>()
-                    .Where(c => c.Ssmd == outStoreId || c.Id == outStoreId)
-                    .Select(c => c.Id)
-                    .ToListAsync();
-                if (warehouseIds == null || warehouseIds.Count == 0)
-                    warehouseIds = new List<string> { outStoreId };
+
+                var warehouseIds = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(outStoreId);
+                if (warehouseIds.Count == 0) return;
                 
                 var mxList = await _db.Queryable<WtXsckdMxEntity>()
                     .Where(d => d.Djbh == id).ToListAsync();
@@ -5850,18 +6603,13 @@ LIMIT {offset}, {pageSize}";
         }
 
         /// <summary>
-        /// 将门店ID或仓库ID解析为仓库ID列表（与同价/销售成本逻辑一致）
+        /// 将门店ID或仓库ID解析为仓库ID列表（委托至统一解析方法，与商品列表展示口径一致）
         /// </summary>
         private async Task<List<string>> ResolveWarehouseIdListAsync(string storeOrWarehouseId)
         {
             if (string.IsNullOrEmpty(storeOrWarehouseId)) return new List<string>();
-            var warehouseIds = await _db.Queryable<WtCkEntity>()
-                .Where(c => c.Ssmd == storeOrWarehouseId || c.Id == storeOrWarehouseId)
-                .Select(c => c.Id)
-                .ToListAsync();
-            if (warehouseIds == null || warehouseIds.Count == 0)
-                warehouseIds = new List<string> { storeOrWarehouseId };
-            return warehouseIds;
+            var ids = await ResolveWarehouseIdsForSpCostFromStoreOrCkAsync(storeOrWarehouseId.Trim());
+            return ids.Count > 0 ? ids : new List<string> { storeOrWarehouseId.Trim() };
         }
 
         /// <summary>
@@ -6035,10 +6783,9 @@ LIMIT {offset}, {pageSize}";
                 return;
             }
 
-            var rowId = $"{spbh}_{ck}";
             await _db.Ado.ExecuteCommandAsync(
                 "INSERT INTO wt_sp_cost (F_Id, spbh, ck, cbj, sl, update_time) VALUES (@id, @spbh, @ck, @cbj, @sl, NOW())",
-                new { id = rowId, spbh, ck, cbj = 0m, sl = qty });
+                new { id = YitIdHelper.NextId().ToString(), spbh, ck, cbj = 0m, sl = qty });
         }
 
         /// <summary>
@@ -6120,10 +6867,9 @@ LIMIT {offset}, {pageSize}";
             }
             else
             {
-                var rowId = $"{spbh}_{ck}";
                 await _db.Ado.ExecuteCommandAsync(
                     "INSERT INTO wt_sp_cost (F_Id, spbh, ck, cbj, sl, update_time) VALUES (@id, @spbh, @ck, @cbj, @sl, NOW())",
-                    new { id = rowId, spbh, ck, cbj = unitPrice, sl = qty });
+                    new { id = YitIdHelper.NextId().ToString(), spbh, ck, cbj = unitPrice, sl = qty });
             }
         }
 
diff --git a/Antis.Erp.Plat/sy/home.html b/Antis.Erp.Plat/sy/home.html
index 1c6e326..cfe1c30 100755
--- a/Antis.Erp.Plat/sy/home.html
+++ b/Antis.Erp.Plat/sy/home.html
@@ -1457,7 +1457,20 @@
 
 						const existingItem = this.addgoodlist.find((listItem) => listItem.id === item.id);
 						if (existingItem) {
+							if (item.mdkc !== undefined && item.mdkc !== null) {
+								existingItem.mdkc = item.mdkc;
+							}
 							existingItem.quantity += 1;
+							const idx = this.addgoodlist.indexOf(existingItem);
+							if (!(existingItem.isPackageItem && existingItem.packageId)) {
+								if (!existingItem.isPresale && this.parseMdkcNumber(existingItem.mdkc) > 0 &&
+									existingItem.quantity > this.parseMdkcNumber(existingItem.mdkc)) {
+									if (!this.splitLineIfStockInsufficient(existingItem, idx)) {
+										existingItem.quantity -= 1;
+										return;
+									}
+								}
+							}
 							// 如果之前不是预售，这次又判定为预售，则补上标记
 							if (isPresale) {
 								existingItem.isPresale = true;
@@ -2053,6 +2066,41 @@
 						this.ontype = type;
 						this.getGoodsList()
 					},
+					/** 解析商品列表上的门店可售库存（与 WtSp mdkc 一致，向下取整） */
+					parseMdkcNumber(mdkc) {
+						const n = parseFloat(mdkc);
+						if (isNaN(n) || n < 0) return 0;
+						return Math.floor(n);
+					},
+					/**
+					 * 同一行 quantity 超过门店库存时拆成两行：现货 + 预售（仅单品，不含套餐子行）。
+					 * @returns {boolean} true 已拆分或无需拆分；false 用户取消确认
+					 */
+					splitLineIfStockInsufficient(item, index) {
+						if (!item || (item.isPackageItem && item.packageId)) return true;
+						if (item.isPresale) return true;
+						const cap = this.parseMdkcNumber(item.mdkc);
+						const q = parseInt(item.quantity, 10) || 0;
+						if (cap <= 0 || q <= cap) return true;
+						const over = q - cap;
+						if (!window.confirm(
+							`该商品门店现货仅 ${cap} 件，您要了 ${q} 件；多出的 ${over} 件将生成「预售出库单」（到货后再出库）。\n\n是否按此拆分继续？`
+						)) {
+							return false;
+						}
+						item.quantity = cap;
+						if (item.selectedSerialNumbers && item.selectedSerialNumbers.length > cap) {
+							item.selectedSerialNumbers = item.selectedSerialNumbers.slice(0, cap);
+						}
+						const presaleLine = Object.assign({}, item, {
+							quantity: over,
+							isPresale: true,
+							selectedSerialNumbers: []
+						});
+						this.addgoodlist.splice(index + 1, 0, presaleLine);
+						this.showPosToast(`已拆分：现货 ${cap} 件 + 预售 ${over} 件`);
+						return true;
+					},
 					decreaseQuantity(item, index) {
 						if (this.addgoodlist[index].quantity > 1) {
 							this.addgoodlist[index].quantity--;
@@ -2060,6 +2108,14 @@
 					},
 					increaseQuantity(item, index) {
 						this.addgoodlist[index].quantity++;
+						const row = this.addgoodlist[index];
+						if (!row.isPackageItem || !row.packageId) {
+							if (!row.isPresale && this.parseMdkcNumber(row.mdkc) > 0 && row.quantity > this.parseMdkcNumber(row.mdkc)) {
+								if (!this.splitLineIfStockInsufficient(row, index)) {
+									this.addgoodlist[index].quantity--;
+								}
+							}
+						}
 					},
 					deleteProduct(index) {
 						var item = this.addgoodlist[index];
diff --git a/Antis.Erp.Plat/sy/login.html b/Antis.Erp.Plat/sy/login.html
index 4ce442d..396574a 100755
--- a/Antis.Erp.Plat/sy/login.html
+++ b/Antis.Erp.Plat/sy/login.html
@@ -186,13 +186,26 @@
           axios({
             url: that.baseUrl + "/api/Extend/WtMd",
             method: 'GET',
+            // 列表接口分页：不传 pageSize 时后端默认 50，门店多于 50 时登录页显示不全
+            params: {
+              currentPage: 1,
+              pageSize: 2000,
+              sort: 'asc',
+              sidx: 'mdmc'
+            },
             headers: {
               'accept': 'text/plain',
               'Content-Type': 'application/json',
             }
           }).then((res) => {
             if (res.data.code === 200) {
-              that.storeList = res.data.data.list || [];
+              var raw = res.data.data.list || [];
+              // 门店主键必须当字符串用，避免 JSON 数字精度丢失导致与后台 wt_skzhb.ssmd 对不上
+              that.storeList = raw.map(function (s) {
+                var o = Object.assign({}, s);
+                if (o.id != null && o.id !== '') o.id = String(o.id);
+                return o;
+              });
               console.log('门店列表加载成功:', that.storeList);
             } else {
               console.error('获取门店列表失败:', res.data);
@@ -284,8 +297,10 @@
                     return that.storeIdStr(store.id) === that.storeIdStr(that.selectedStore);
                   });
                   if (selectedStoreInfo) {
-                    localStorage.setItem('selectedStore', JSON.stringify(selectedStoreInfo));
-                    console.log('门店信息已存储:', selectedStoreInfo);
+                    var toSave = Object.assign({}, selectedStoreInfo);
+                    if (toSave.id != null && toSave.id !== '') toSave.id = String(toSave.id);
+                    localStorage.setItem('selectedStore', JSON.stringify(toSave));
+                    console.log('门店信息已存储:', toSave);
                   }
                   // window.alert('登录成功')
                   axios({
@@ -299,7 +314,7 @@
                     if (res2.data.code === 200) {
                       // 使用用户选择的门店ID，而不是用户信息中的默认门店
                       // 这样收银员可以选择任意门店进行收银
-                      const storeIdToUse = that.selectedStore || res2.data.data.mdxx;
+                      const storeIdToUse = String(that.selectedStore || res2.data.data.mdxx || '').trim();
                       localStorage.setItem('mdId', storeIdToUse); 
                       axios({
                         url: this.baseUrl + "/api/Extend/WtCk?pageSize=1&ssmd=" + storeIdToUse,
diff --git a/Antis.Erp.Plat/sy/orders.html b/Antis.Erp.Plat/sy/orders.html
index b10740e..d0bd013 100644
--- a/Antis.Erp.Plat/sy/orders.html
+++ b/Antis.Erp.Plat/sy/orders.html
@@ -1056,8 +1056,8 @@
                                     {{order.djlx}}
                                 </div>
                             </div>
-                            <div class="order-status" :class="getStatusClass(order.djzt)">
-                                {{order.djzt || '待审核'}}
+                            <div class="order-status" :class="getPresaleListStatusClass(order)">
+                                {{ getPresaleListStatusText(order) }}
                             </div>
                         </div>
 
@@ -1240,7 +1240,7 @@
                             </div>
                             <div class="detail-info-item">
                                 <span class="detail-info-label">单据状态：</span>
-                                <span class="detail-info-value" :style="{color: orderDetail.djzt === '已过账' ? '#52c41a' : (orderDetail.djzt === '草稿' ? '#ff9800' : '#666')}">{{orderDetail.djzt || '待审核'}}</span>
+                                <span class="detail-info-value" :style="detailOrderStatusStyle">{{ detailOrderStatusText }}</span>
                             </div>
                             <div class="detail-info-item">
                                 <span class="detail-info-label">出库仓库：</span>
@@ -2647,6 +2647,16 @@
                     if (status === '草稿') return 'status-draft';
                     return '';
                 },
+                /** 预售列表：已转销售的单据库内 djzt 可能仍为待审核，与 ERP「无需审核」语义对齐展示 */
+                getPresaleListStatusText(order) {
+                    if (!order) return '待审核';
+                    if (this.parsePresaleConvertedChdId(order.bz)) return '已转销售';
+                    return order.djzt || '待审核';
+                },
+                getPresaleListStatusClass(order) {
+                    if (this.parsePresaleConvertedChdId(order && order.bz)) return 'status-completed';
+                    return this.getStatusClass(order && order.djzt);
+                },
                 // ✅ 查看订单详情
                 async viewDetails(order) {
                     this.detailModalVisible = true;
@@ -3304,6 +3314,24 @@
                     if (lx !== '预售出库单' && lx !== '预售单') return '';
                     return this.parsePresaleConvertedChdId(this.orderDetail.bz);
                 },
+                /** 详情弹窗「单据状态」：已转销售预售单展示业务态，与列表一致 */
+                detailOrderStatusText() {
+                    if (!this.orderDetail) return '待审核';
+                    const lx = String(this.orderDetail.djlx || '').trim();
+                    if ((lx === '预售出库单' || lx === '预售单') && this.parsePresaleConvertedChdId(this.orderDetail.bz))
+                        return '已转销售';
+                    return this.orderDetail.djzt || '待审核';
+                },
+                detailOrderStatusStyle() {
+                    if (!this.orderDetail) return { color: '#666' };
+                    const z = this.orderDetail.djzt;
+                    if (z === '已过账') return { color: '#52c41a' };
+                    if (z === '草稿') return { color: '#ff9800' };
+                    const lx = String(this.orderDetail.djlx || '').trim();
+                    if ((lx === '预售出库单' || lx === '预售单') && this.parsePresaleConvertedChdId(this.orderDetail.bz))
+                        return { color: '#52c41a' };
+                    return { color: '#666' };
+                },
                 /** 详情底部：当前单可直接发起退货（未转销售的预售/销售出库单） */
                 detailCanInitiateReturn() {
                     if (!this.orderDetail || this.loadingDetail) return false;
diff --git a/Antis.Erp.Plat/sy/settlement.html b/Antis.Erp.Plat/sy/settlement.html
index 4de4496..67128f5 100755
--- a/Antis.Erp.Plat/sy/settlement.html
+++ b/Antis.Erp.Plat/sy/settlement.html
@@ -4058,8 +4058,8 @@
                         :class="{ 'is-selected': String(payment.skzh || '') === String(accountDictId(acc)) }"
                         @click.stop="selectComboPaymentAccount(index, acc)"
                       >
-                        <img :src="getAccountIcon(acc.zhmc)" class="combo-account-chip-icon" alt="" />
-                        <span>{{ acc.zhmc }}</span>
+                        <img :src="getAccountIcon(accountRowCaption(acc))" class="combo-account-chip-icon" alt="" />
+                        <span>{{ accountRowCaption(acc) }}</span>
                       </button>
                     </div>
                   </div>
@@ -4646,14 +4646,17 @@
           },
           /** 左侧摘要：入账账户展示名 */
           directReceiptCaption() {
-            if (this.lastDirectAccount && this.lastDirectAccount.zhmc) return this.lastDirectAccount.zhmc;
+            if (this.lastDirectAccount) {
+              var c = this.accountRowCaption(this.lastDirectAccount);
+              if (c !== '无') return c;
+            }
             if (this.info.skzh === '余额') return '余额';
             const sk = this.info.skzh;
             if (!sk) return '无';
             const acc = (this.accountList || []).find(a =>
               String(this.accountDictId(a)) === String(sk) || String(a.id) === String(sk)
             );
-            if (acc) return acc.zhmc;
+            if (acc) return this.accountRowCaption(acc);
             return sk;
           }
         },
@@ -4759,7 +4762,7 @@
             if (!row || !row.skzh) return '无';
             var id = String(row.skzh);
             var acc = (this.accountList || []).find(a => String(this.accountDictId(a)) === id || String(a.id) === id);
-            if (acc) return acc.zhmc;
+            if (acc) return this.accountRowCaption(acc);
             return id;
           },
           /** skmx 预览行：入账账户展示名 */
@@ -4767,7 +4770,7 @@
             if (!row || !row.skzh) return '无';
             var id = String(row.skzh);
             var acc = (this.accountList || []).find(a => String(this.accountDictId(a)) === id || String(a.id) === id);
-            if (acc) return acc.zhmc;
+            if (acc) return this.accountRowCaption(acc);
             return id;
           },
           fillLineRemaining(index) {
@@ -4890,7 +4893,9 @@
             if (!sk || sk === '组合支付' || sk === '余额') return '';
             const s = String(sk).trim();
             if (/^\d{10,}$/.test(s)) return s;
-            const acc = (this.accountList || []).find(a => a.zhmc === sk);
+            const acc = (this.accountList || []).find(a =>
+              a.zhmc === sk || this.accountRowCaption(a) === sk || String(this.accountDictId(a)) === s
+            );
             return acc ? this.accountDictId(acc) : '';
           },
           /**
@@ -5023,22 +5028,25 @@
             });
             return cents / 100;
           },
-          // ✅ 获取当前选择的门店ID（登录时选择的门店）
+          // ✅ 获取当前选择的门店ID（登录时选择的门店；统一为字符串，避免大整数精度丢失）
           getSelectedStoreId() {
             try {
               const selectedStore = localStorage.getItem('selectedStore');
               if (selectedStore) {
                 const store = JSON.parse(selectedStore);
-                return store.id;
+                if (store && store.id != null && String(store.id).trim() !== '') return String(store.id).trim();
+                if (store && store.Id != null && String(store.Id).trim() !== '') return String(store.Id).trim();
               }
             } catch (e) {
               console.warn('无法获取 selectedStore:', e);
             }
-            // 降级方案：使用导购员的门店
+            var mdId = localStorage.getItem('mdId');
+            if (mdId != null && String(mdId).trim() !== '') return String(mdId).trim();
             try {
               const ckinfo = localStorage.getItem('ckinfo');
               if (ckinfo) {
-                return JSON.parse(ckinfo).id;
+                const ck = JSON.parse(ckinfo);
+                if (ck && ck.id != null) return String(ck.id).trim();
               }
             } catch (e) {
               console.warn('无法获取 ckinfo:', e);
@@ -5081,15 +5089,9 @@
           // ✅ 加载账户列表（根据门店过滤）
           async loadAccountList() {
             try {
-              // 获取登录时选择的门店ID
               const storeId = this.getSelectedStoreId();
-              
-              // 调用账户核销表API，根据门店过滤
-              const params = {};
-              if (storeId) {
-                params.ssmd = storeId;
-              }
-              
+              const params = { currentPage: 1, pageSize: 500, sort: 'desc', sidx: 'id' };
+              if (storeId) params.ssmd = storeId;
               const response = await axios({
                 url: this.baseUrl + "/api/Extend/WtSkzhb",
                 method: 'GET',
@@ -5098,11 +5100,11 @@
                   Authorization: localStorage.getItem('token')
                 }
               });
-              
               if (response.data.code === 200) {
-                // 从分页结果中获取列表
-                this.accountList = response.data.data.list || [];
-                console.log('✅ 加载账户列表成功（门店过滤）:', this.accountList);
+                var inner = response.data.data;
+                var list = (inner && inner.list) || response.data.list || [];
+                this.accountList = list;
+                console.log('✅ 加载账户列表 门店=' + (storeId || '未传') + ' 条数=' + list.length, list);
               } else {
                 console.error('❌ 加载账户列表失败:', response.data.msg);
                 this.accountList = [];
@@ -5112,6 +5114,15 @@
               this.accountList = [];
             }
           },
+          /** 入账账户卡片展示名（接口 zhmc 可能为空时兜底） */
+          accountRowCaption(acc) {
+            if (!acc) return '无';
+            var z = acc.zhmc != null ? String(acc.zhmc).trim() : '';
+            if (z) return z;
+            var sid = acc.skzhDictId != null ? String(acc.skzhDictId).trim() : '';
+            if (sid) return '账户 ' + sid;
+            return '无';
+          },
           
           // ✅ 根据账户名称获取图标路径
           getAccountIcon(accountName) {
@@ -5141,17 +5152,18 @@
             return 'images/member16.png';
           },
           
-          // ✅ 处理账户点击事件
+          // ✅ 处理账户点击事件（允许接口未解析出 zhmc，只要有 skzhDictId 即可）
           selectAccount(account) {
-            if (!account || !account.zhmc) {
-              return;
-            }
+            if (!account) return;
+            var zhid = this.accountDictId(account);
+            if (!zhid) return;
+            var cap = this.accountRowCaption(account);
             this.lastDirectAccount = {
               id: account.id,
-              zhmc: account.zhmc,
+              zhmc: cap !== '无' ? cap : zhid,
               skzhDictId: account.skzhDictId
             };
-            this.info.skzh = account.zhmc;
+            this.info.skzh = cap !== '无' ? cap : zhid;
           },
           
           // 新增方法
@@ -5743,6 +5755,21 @@
               return orders;
             };
             
+            // ✅ 拆单前提示：仅「同一笔收款里既有现货又有预售」时确认（纯预售在收银首页加购时已提示过）
+            if (presaleItems.length > 0 && inStockItems.length > 0) {
+              const presaleNames = presaleItems.map(function (i) { return i.spmc || i.spbm || '商品'; });
+              var uniqNames = [];
+              presaleNames.forEach(function (n) {
+                if (uniqNames.indexOf(n) < 0) uniqNames.push(n);
+              });
+              var nameStr = uniqNames.slice(0, 5).join('、') + (uniqNames.length > 5 ? '…' : '');
+              if (!window.confirm(
+                '部分商品超过门店现货数量，本笔将同时生成「销售出库单」与「预售出库单」。\n\n预售涉及：' + nameStr + '\n\n确认按此拆单并继续收款？'
+              )) {
+                return;
+              }
+            }
+
             // ✅ 执行创建订单
             createOrders().then(async (orders) => {
               if (orders.length > 0) {
@@ -5822,6 +5849,7 @@
             this.activePaymentLineIndex = this.paymentCombinations.length - 1;
             this.selectedPaymentMethod = method;
             this.selectedPaymentAmount = '';
+            if (method === '入账账户') this.loadAccountList();
           },
           removePaymentMethod(index) {
             this.paymentCombinations.splice(index, 1);
--
libgit2 0.21.4