From dd4d0ecaaef7e2f560d4aea117237e11f3c2b9b1 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Fri, 7 Aug 2026 18:16:06 +0800 Subject: [PATCH] 周五了,冲 --- Antis.Erp.Plat/.cursor/mcp.json | 2 +- Antis.Erp.Plat/antis-ncc-admin/src/api/douyinLogistics.js | 8 ++++++-- Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtBillRecycle.js | 29 +++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/api/wtHy.js | 13 +++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/router/modules/base.js | 12 ++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js | 5 +++++ Antis.Erp.Plat/antis-ncc-admin/src/utils/wtDjztDisplay.js | 24 ++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRecycleRequestContext.js | 14 ++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/index.vue | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-detail-host.vue | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-pd-detail.vue | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/wtBillRecycleDetailMap.js | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/cgrkd-export-xlsx.js | 3 +++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/detail-view.vue | 20 +++++++++++++++++++- Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue | 18 +++++++++++++++++- Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/edit-bz-dialog.vue | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/index.vue | 24 ++++++++++++++++++++++-- Antis.Erp.Plat/antis-ncc-admin/src/views/wtPd/DetailView.vue | 685 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue | 447 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- Antis.Erp.Plat/antis-ncc-admin/src/views/wtYsckd/Form.vue | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- Antis.Erp.Plat/netcore/src/Application/NCC.API/appsettings.Development.json | 2 +- Antis.Erp.Plat/netcore/src/Application/NCC.API/appsettings.json | 6 +++--- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Controllers/OrdersController.cs | 20 +++++++++++++++----- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/DouyinService.cs | 32 ++++++++++++++++++++++++++++++-- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.DouyinLogistics/Services/OrderService.cs | 35 +++++++++++++++++++++++------------ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtBillRecycle/WtBillRecycleListOutput.cs | 20 ++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtBillRecycle/WtBillRecycleListQueryInput.cs | 28 ++++++++++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtHy/WtHyUpdateBzInput.cs | 14 ++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtPdDtos.cs | 27 +++++++++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtCwdjEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtCwdjmxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtCzdEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtCzdmx2Entity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtCzdmxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtFpsqEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtFysrdEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtFysrdMxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtHydqtkEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtKfbfbEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPdEntity.cs | 10 +++++++++- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtPdMxEntity.cs | 10 +++++++++- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtSfkEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtTjdEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtTjdMxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdEntity.cs | 18 ++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtXsckdMxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtYskzjjsEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtYskzjjsMxEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/WtZkdEntity.cs | 12 ++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtBillRecycleOperations.cs | 19 +++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/WtBillRecycleBillSource.cs | 21 +++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtBillRecycle/WtBillRecycleService.cs | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtBillSoftDelete/WtBillSoftDeleteHelper.cs | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCwdjService.cs | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtCzdService.cs | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFpsqService.cs | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtFysrdService.cs | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHyService.cs | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtHydqtkService.cs | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtKfbfbService.cs | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtPdService.cs | 381 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSfkService.cs | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtTjdService.cs | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs | 629 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtYskzjjsService.cs | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtZkdService.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- Antis.Erp.Plat/项目文档相关/docs/数据库说明.md | 17 ++++++++++++++++- Antis.Erp.Plat/项目文档相关/sql/add_btn_editBz_permissions.sql | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/项目文档相关/sql/init_wt_modulebutton_permissions.sql | 3 +++ 73 files changed, 5289 insertions(+), 1048 deletions(-) create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtBillRecycle.js create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRecycleRequestContext.js create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/index.vue create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-detail-host.vue create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-pd-detail.vue create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/wtBillRecycleDetailMap.js create mode 100644 Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/edit-bz-dialog.vue create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtBillRecycle/WtBillRecycleListOutput.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtBillRecycle/WtBillRecycleListQueryInput.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtHy/WtHyUpdateBzInput.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/IWtBillRecycleOperations.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/WtBillRecycleBillSource.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtBillRecycle/WtBillRecycleService.cs create mode 100644 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtBillSoftDelete/WtBillSoftDeleteHelper.cs create mode 100644 Antis.Erp.Plat/项目文档相关/sql/add_btn_editBz_permissions.sql diff --git a/Antis.Erp.Plat/.cursor/mcp.json b/Antis.Erp.Plat/.cursor/mcp.json index ffac515..f7064c7 100644 --- a/Antis.Erp.Plat/.cursor/mcp.json +++ b/Antis.Erp.Plat/.cursor/mcp.json @@ -6,7 +6,7 @@ "args": [ "--yes", "@davewind/mysql-mcp-server", - "mysql://netteam:netteam@rm-bp19ohrgc6111ynzh1o.mysql.rds.aliyuncs.com:3306/ncc_wutong" + "mysql://ponggame_db:Ponggame_db_mm@mysql-3e725c5c7aad-public.rds.volces.com:3306/ponggame_test_db" ] }, "my-api-spec": { diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/api/douyinLogistics.js b/Antis.Erp.Plat/antis-ncc-admin/src/api/douyinLogistics.js index 7c944a5..6ad4456 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/api/douyinLogistics.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/api/douyinLogistics.js @@ -53,8 +53,12 @@ export function getShops() { return douyinLogisticsClient.get('/shops') } -export function createWaybill(id) { - return douyinLogisticsClient.post(`/orders/${id}/waybill`) +export function createWaybill(id, productType) { + const params = {} + if (productType != null && String(productType).trim() !== '') { + params.productType = String(productType).trim() + } + return douyinLogisticsClient.post(`/orders/${id}/waybill`, null, { params }) } export function getWaybillPreview(id) { diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtBillRecycle.js b/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtBillRecycle.js new file mode 100644 index 0000000..c821d98 --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/api/extend/wtBillRecycle.js @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +const base = '/api/Extend/WtBillRecycle' + +/** 回收站列表(分页);GET 的 data 在拦截器中会作为 axios params 发出 */ +export function getWtBillRecycleList(query) { + return request({ + url: base, + method: 'GET', + data: query + }) +} + +/** 恢复已删除单据 */ +export function restoreWtBillRecycle(billSource, id) { + return request({ + url: `${base}/${billSource}/${id}/Actions/Restore`, + method: 'POST', + data: {} + }) +} + +/** 彻底删除(物理清除,仅开发环境前端开放入口) */ +export function purgeWtBillRecycle(billSource, id) { + return request({ + url: `${base}/${billSource}/${id}/Actions/Purge`, + method: 'DELETE' + }) +} diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/api/wtHy.js b/Antis.Erp.Plat/antis-ncc-admin/src/api/wtHy.js index 036dff2..4789dd2 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/api/wtHy.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/api/wtHy.js @@ -58,3 +58,16 @@ export function WtHyAdjustKkjlExpireHistory(data) { data }) } + +/** + * 仅修改客户档案备注 + * @param {{ id: string, bz?: string }} data + */ +export function WtHyUpdateBz(data) { + return request({ + url: '/api/Extend/WtHy/Actions/UpdateBz', + method: 'post', + data + }) +} + diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/router/modules/base.js b/Antis.Erp.Plat/antis-ncc-admin/src/router/modules/base.js index 87b44a3..d271fec 100755 --- a/Antis.Erp.Plat/antis-ncc-admin/src/router/modules/base.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/router/modules/base.js @@ -185,6 +185,18 @@ const baseRouter = [{ affix: false, zhTitle: '收银折扣权限' } + }, + // 统一单据回收站:菜单可在后台 system_menu 挂链 /wtBillRecycle/index + { + path: '/wtBillRecycle/index', + component: (resolve) => require(['@/views/wtBillRecycle/index'], resolve), + name: 'wtBillRecycle', + hidden: true, + meta: { + title: 'wtBillRecycle', + affix: false, + zhTitle: '单据回收站' + } } ] export default baseRouter \ No newline at end of file diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js index ba2bc23..018cc38 100755 --- a/Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js @@ -3,6 +3,7 @@ import { message } from '@/utils/message' import store from '@/store' import { getToken } from '@/utils/auth' import define from '@/utils/define' +import { isRecycleDeletedContext } from '@/utils/wtRecycleRequestContext' // create an axios instance @@ -31,6 +32,10 @@ service.interceptors.request.use( config.headers['Authorization'] = getToken() } if (config.method == 'get') { + config.data = config.data || {} + if (isRecycleDeletedContext()) { + config.data.includeDeleted = true + } config.params = config.data } let timestamp = Date.parse(new Date()) / 1000 diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtDjztDisplay.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtDjztDisplay.js index ea3863f..47809ef 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtDjztDisplay.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtDjztDisplay.js @@ -55,6 +55,30 @@ export function getWtDjztDisplayLabel(djzt, spbz) { return '待审核' } +/** + * 当前审核节点(按库内真实 djzt,不被「待审核」折叠口径影响)。 + * 用于列表「当前节点」列,区分待一级 / 待二级 / 已完成。 + */ +export function getWtAuditNodeLabel(djzt, spbz) { + const ctx = resolveWtBillAuditRow(djzt, spbz) + const z = ctx.djzt + if (isWtDjztRejected(z, ctx.spbz) || z === WT_REJECT_SPBZ_TAG) return '已驳回' + if (!z || z === '待审核') return '待一级审核' + if (z === '一级已审' || z === '待二级' || z === '一级已审/待二级') return '待二级审核' + if (z === '已审核' || z === '无需审核') return '审核完成' + if (z === '草稿') return '未提交' + return '待一级审核' +} + +export function getWtAuditNodeTagType(djzt, spbz) { + const label = getWtAuditNodeLabel(djzt, spbz) + if (label === '审核完成') return 'success' + if (label === '待二级审核') return 'warning' + if (label === '已驳回') return 'danger' + if (label === '未提交') return 'info' + return 'warning' +} + export function getWtDjztTagType(djzt, spbz) { const label = getWtDjztDisplayLabel(djzt, spbz) if (label === '已审核') return 'success' diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRecycleRequestContext.js b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRecycleRequestContext.js new file mode 100644 index 0000000..1ecca30 --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRecycleRequestContext.js @@ -0,0 +1,14 @@ +/** 回收站打开详情时,请求拦截器自动附加 includeDeleted=true */ +let depth = 0 + +export function enterRecycleDeletedContext() { + depth += 1 +} + +export function leaveRecycleDeletedContext() { + if (depth > 0) depth -= 1 +} + +export function isRecycleDeletedContext() { + return depth > 0 +} diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue index bf202db..39065fd 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue @@ -6,6 +6,16 @@ {{ isMergedMode ? '合并发货单' : '编辑发货单' }}
+ 创建运单 + + 非赠品行合计 ¥{{ productListPaidSubtotalYuan.toFixed(2) }},与商家实际收入一致
+ + + + + {{ scope.row.selectedSerialNumbers && scope.row.selectedSerialNumbers.length > 0 ? '修改序列号' : '选择序列号' }} @@ -572,7 +597,7 @@ - + - + @@ -647,7 +672,7 @@ import { ref, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue' import router from '@/router' import { Message as ElMessage, MessageBox as ElMessageBox } from 'element-ui' -import { getOrderDetail, getMergedOrderDetail, searchProducts as searchProductsAPI, manualCreateWaybill, getProductInfo as getProductInfoAPI, getWarehouses, getProductCategories, updateSellerRemark, getDefaults, getCustomers, getPaymentAccounts, getUsers, getUsersByOrganize, getShopSettings, checkStock, getStockCostBreakdown, printWaybill } from '@/api/douyinLogistics' +import { getOrderDetail, getMergedOrderDetail, searchProducts as searchProductsAPI, manualCreateWaybill, getProductInfo as getProductInfoAPI, getWarehouses, getProductCategories, updateSellerRemark, getDefaults, getCustomers, getPaymentAccounts, getUsers, getUsersByOrganize, getShopSettings, checkStock, getStockCostBreakdown, printWaybill, createWaybill, shipToDouyin } from '@/api/douyinLogistics' import { getDouyinLogisticsBaseOrigin } from '@/utils/douyinLogisticsAxios' import { directPrintWaybillFaceSheet } from '@/utils/waybillDirectPrint' import { getErpAssetBaseUrl, resolveProductPicUrl } from '@/utils/douyinErpBase' @@ -675,6 +700,14 @@ onBeforeUnmount(() => { const loading = ref(false) const submitting = ref(false) const printing = ref(false) +const creatingWaybill = ref(false) + +/** 顺丰抖店 product_type 选项 */ +const sfProductTypeOptions = [ + { value: '247', label: '电商标快' }, + { value: '2', label: '顺丰标快' }, + { value: '1', label: '顺丰特快' } +] const isMergedMode = computed(() => route.value.name === 'create-waybill-merged' && route.value.params.ids) const orderId = ref(Number(route.value.params.id || 0)) const mergedInternalIds = ref([]) @@ -766,6 +799,8 @@ const form = ref({ senderPhone: '18014801756', senderAddress: '江苏省南京市浦口区浦洲路39号沿海创中心A301', logisticsCompany: '顺丰', + /** 顺丰快递产品:247电商标快(默认)、2标快、1特快 */ + sfProductType: '247', cjck: '', kh: '', skzh: '', @@ -1616,11 +1651,15 @@ const searchProducts = async () => { // 添加商品 const addProduct = async (product) => { const spbm = String(product.spbm || '').trim() - if (!spbm) { - ElMessage.warning('商品编码为空,无法添加') + const erpSpbh = String(product.id || product.F_Id || '').trim() + if (!spbm && !erpSpbh) { + ElMessage.warning('无法识别商品,缺少编码与主键') return } - const exists = form.value.productItems.find((item) => String(item.spbm || '').trim() === spbm) + const exists = form.value.productItems.find((item) => { + if (spbm) return String(item.spbm || '').trim() === spbm + return String(item.erpSpbh || '').trim() === erpSpbh + }) if (exists) { ElMessage.warning('该商品已存在') return @@ -1661,15 +1700,14 @@ const addProduct = async (product) => { isFromErp: true, selectedSerialNumbers: [], spxlhLoaded: false, - spxlhType: '', - erpSpbh: String(product.id || product.F_Id || '').trim() + spxlhType: product.spxlhType != null && product.spxlhType !== '' ? String(product.spxlhType) : '', + erpSpbh } // 弹窗选中的 spbm/spmc 为唯一来源,仅补序列号类型 - if (newProduct.spbm) { - productCache.delete(String(newProduct.spbm).trim()) - await loadSpxlhTypeOnlyForErpRow(newProduct) - } + if (newProduct.spbm) productCache.delete(String(newProduct.spbm).trim()) + if (newProduct.erpSpbh) productCache.delete(String(newProduct.erpSpbh).trim()) + await loadSpxlhTypeOnlyForErpRow(newProduct) // 先隐藏表格(通过设置tableKey为-1) tableKey.value = -1 @@ -1737,12 +1775,15 @@ const getProductInfo = async (productCode, skuId, { skipCache = false } = {}) => const response = await getProductInfoAPI(code || undefined, sku || undefined) if (response.data && response.data.code === 200 && response.data.data) { const product = response.data.data - if (code && product.spbm && String(product.spbm).trim() !== code) { + const retSpbm = product.spbm != null ? String(product.spbm).trim() : '' + const retId = String(product.id || product.F_Id || '').trim() + if (code && retSpbm && retSpbm !== code && retId !== code) { return null } product.spxlhType = product.spxlhType != null && product.spxlhType !== '' ? String(product.spxlhType) : '' productCache.set(cacheKey, product) - if (product.spbm) productCache.set(String(product.spbm).trim(), product) + if (retSpbm) productCache.set(retSpbm, product) + if (retId) productCache.set(retId, product) return product } return null @@ -1756,9 +1797,18 @@ const loadSpxlhTypeOnlyForErpRow = async (item) => { item.spxlhLoaded = false try { const spbm = String(item.spbm || '').trim() - if (!spbm) return - const product = await getProductInfo(spbm, undefined, { skipCache: true }) - if (!product || String(product.spbm || '').trim() !== spbm) return + const erpSpbh = String(item.erpSpbh || '').trim() + const lookupCode = spbm || erpSpbh + if (!lookupCode) return + const product = await getProductInfo(lookupCode, undefined, { skipCache: true }) + if (!product) return + if (spbm) { + const retSpbm = String(product.spbm || '').trim() + if (retSpbm && retSpbm !== spbm) return + } else { + const retId = String(product.id || product.F_Id || '').trim() + if (retId && retId !== erpSpbh) return + } if (product.id || product.F_Id) item.erpSpbh = String(product.id || product.F_Id).trim() if (product.spxlhType !== undefined && product.spxlhType !== null && String(product.spxlhType) !== '') { item.spxlhType = String(product.spxlhType) @@ -1838,6 +1888,19 @@ const loadSerialNumberType = async (item) => { } else { applyProductDetailToItem(item, product, expectedSpbm) } + } else if (item.erpSpbh) { + const product = await getProductInfo(String(item.erpSpbh).trim(), undefined, { skipCache: item.isFromErp }) + if (product) { + const retId = String(product.id || product.F_Id || '').trim() + if (!retId || retId === String(item.erpSpbh).trim()) { + if (product.spxlhType !== undefined && product.spxlhType !== null && String(product.spxlhType) !== '') { + item.spxlhType = String(product.spxlhType) + } + if (product.imageUrl && !item.erp_pic) { + item.erp_pic = resolveProductPicUrl(product.imageUrl) + } + } + } } } catch { /* ignore */ } finally { item.spxlhLoaded = true @@ -1846,8 +1909,7 @@ const loadSerialNumberType = async (item) => { // 获取序列号类型显示文本 const getSerialNumberTypeText = (row) => { - // 如果没有商品编码和sku_id,显示未选择 - if (!row.spbm && !getSkuCode(row)) return '未选择' + if (!row.spbm && !getSkuCode(row) && !String(row.erpSpbh || '').trim()) return '未选择' if (!row.spxlhLoaded) return '加载中...' const spxlhType = row.spxlhType if (spxlhType === '1') return '入1出1' @@ -1858,7 +1920,7 @@ const getSerialNumberTypeText = (row) => { // 获取序列号类型标签颜色 const getSerialNumberTypeTagType = (row) => { - if (!row.spbm && !getSkuCode(row)) return 'info' + if (!row.spbm && !getSkuCode(row) && !String(row.erpSpbh || '').trim()) return 'info' if (!row.spxlhLoaded) return 'info' const spxlhType = row.spxlhType if (spxlhType === '1' || spxlhType === '2') return 'warning' // 需要序列号 - 橙色警告 @@ -1868,7 +1930,7 @@ const getSerialNumberTypeTagType = (row) => { // 获取序列号类型描述 const getSerialNumberTypeDescription = (row) => { - if (!row.spbm && !getSkuCode(row)) return '请先选择商品' + if (!row.spbm && !getSkuCode(row) && !String(row.erpSpbh || '').trim()) return '请先选择商品' if (!row.spxlhLoaded) return '加载中...' const spxlhType = row.spxlhType if (spxlhType === '1') return '入库和出库都需要序列号' @@ -1879,20 +1941,21 @@ const getSerialNumberTypeDescription = (row) => { // 刷新序列号类型信息 const refreshSerialNumberType = async (row) => { - if (!row.spbm && !getSkuCode(row)) { + if (!row.spbm && !getSkuCode(row) && !String(row.erpSpbh || '').trim()) { ElMessage.warning('请先选择商品') return } try { - if (!row.spbm) { + if (!row.spbm && !String(row.erpSpbh || '').trim()) { const productCode = await getProductCodeForSerialNumber(row) if (!productCode) { - ElMessage.warning('无法获取商品编码') + ElMessage.warning('无法获取商品标识') return } } if (row.spbm) productCache.delete(String(row.spbm)) + if (row.erpSpbh) productCache.delete(String(row.erpSpbh)) const sku = getSkuCode(row) if (sku) productCache.delete(`sku:${sku}`) await loadSerialNumberType(row) @@ -1902,36 +1965,15 @@ const refreshSerialNumberType = async (row) => { } } -// 获取用于序列号选择的商品编码(spbm) -// 注意:序列号表中存储的是商品编码(spbm),不是抖音SKU编码(dyspid) -// 如果商品只有抖音SKU编码,需要先通过它查找对应的商品编码 +// 获取用于序列号选择的商品标识(spbm 或 ERP 商品主键 Id) const getProductCodeForSerialNumber = async (row) => { const skuId = getSkuCode(row) if (skuId) return skuId if (row.spbm) return row.spbm + const erpSpbh = String(row.erpSpbh || '').trim() + if (erpSpbh) return erpSpbh - const productId = row.id || row.F_Id || row.spbh - if (productId && productId.length > 10) { - try { - const response = await searchProductsAPI(productId, 1, 10) - if (response.data && response.data.data && response.data.data.length > 0) { - let product = response.data.data.find((p) => - p.id === productId || p.F_Id === productId || p.id === String(productId) - ) || response.data.data[0] - - if (product.spbm) { - row.spbm = product.spbm - if (!row.product_name && product.spmc) row.product_name = product.spmc - if (!row.spxlhType) await loadSerialNumberType(row) - return product.spbm - } else { - ElMessage.warning(`商品"${row.product_name || productId}"未关联ERP商品编码,无法查询序列号`) - } - } - } catch { /* ignore */ } - } - - ElMessage.warning('商品缺少商品编码或抖音SKU编码,无法查询序列号') + ElMessage.warning('商品缺少商品编码、抖音SKU或主键,无法查询序列号') return null } @@ -1941,7 +1983,7 @@ const openSerialNumberSelect = async (row) => { const productCode = await getProductCodeForSerialNumber(row) if (!productCode) { - ElMessage.warning('无法获取商品编码,请确保商品已关联ERP系统') + ElMessage.warning('无法获取商品标识,请确保商品已关联ERP系统') return } @@ -1971,7 +2013,9 @@ const handleSerialNumberSelect = (selectedSerialNumbers) => { const currentProductCode = serialNumberSelectRef.value && serialNumberSelectRef.value.currentProductCode if (currentProductCode) { currentRow = form.value.productItems.find((item) => - item.spbm === currentProductCode || getSkuCode(item) === currentProductCode + item.spbm === currentProductCode || + getSkuCode(item) === currentProductCode || + String(item.erpSpbh || '').trim() === currentProductCode ) || null } } @@ -2183,20 +2227,22 @@ const handleSubmit = async () => { return } - const invalidItems = shippableItems.filter((item) => !item.product_name && !item.spbm) + const invalidItems = shippableItems.filter((item) => + !item.product_name && !item.spbm && !String(item.erpSpbh || '').trim() + ) if (invalidItems.length > 0) { - ElMessage.warning('存在无效商品,请检查商品名称或商品编码') + ElMessage.warning('存在无效商品,请检查商品名称、编码或主键') return } // 序列号校验(入0出1 可无在库序列号,须在弹窗内手动录入,与收银台 UpdateSerialNumberStatus 一致) for (const item of shippableItems) { - if ((item.spbm || getSkuCode(item)) && !item.spxlhLoaded) await loadSerialNumberType(item) + if ((item.spbm || getSkuCode(item) || item.erpSpbh) && !item.spxlhLoaded) await loadSerialNumberType(item) } let serialValidationFailed = false for (let i = 0; i < shippableItems.length; i++) { const item = shippableItems[i] - if (!item.spbm && !getSkuCode(item)) continue + if (!item.spbm && !getSkuCode(item) && !String(item.erpSpbh || '').trim()) continue const spxlhType = item.spxlhType const itemNum = Number(item.item_num) || 0 // 入1出1、入0出1:出库都需要序列号(与 ERP 商品档案口径一致) @@ -2235,24 +2281,63 @@ const handleSubmit = async () => { if (form.value.cjck && shippableItems.length > 0) { try { const stockItems = shippableItems - .filter((item) => item.spbm) - .map((item) => ({ spbm: item.spbm, quantity: Number(item.item_num) || 1 })) + .filter((item) => item.spbm || item.erpSpbh) + .map((item) => { + const spbm = String(item.spbm || '').trim() + const erpSpbh = String(item.erpSpbh || '').trim() + const quantity = Number(item.item_num) || 1 + if (spbm) return { spbm, quantity } + return { spId: erpSpbh, quantity } + }) if (stockItems.length > 0) { const stockRes = await checkStock(form.value.cjck, stockItems) - const stockData = stockRes.data + const stockData = stockRes && stockRes.data + const stockList = Array.isArray(stockData) + ? stockData + : (stockData && Array.isArray(stockData.data) ? stockData.data : []) - const insufficientItems = (stockData && stockData.data && stockData.data.filter) - ? stockData.data.filter((item) => !item.sufficient) - : [] + const insufficientItems = stockList.filter((item) => item && item.sufficient === false) if (insufficientItems.length > 0) { - const itemNames = insufficientItems.map((item) => - `${item.spmc || item.spbm}(库存: ${(item.stock !== undefined && item.stock !== null) ? item.stock : 0},需要: ${item.quantity})` - ).join('\n') + // 用发货明细里的商品名称兜底(很多商品无编码,BatchCheckStock 的 productName 可能为空) + const localNameByKey = {} + shippableItems.forEach((row) => { + const name = String(row.erp_spmc || row.product_name || row.spmc || '').trim() + const spbm = String(row.spbm || '').trim() + const spId = String(row.erpSpbh || '').trim() + if (spbm && name) localNameByKey[`bm:${spbm}`] = name + if (spId && name) localNameByKey[`id:${spId}`] = name + }) + + const formatStockNum = (v) => { + if (v === null || v === undefined || v === '') return '0' + const n = Number(v) + return Number.isNaN(n) ? String(v) : String(n) + } + + const itemLines = insufficientItems.map((item, idx) => { + const spbm = String(item.spbm || '').trim() + const spId = String(item.spId || '').trim() + const name = String( + item.productName || + item.spmc || + localNameByKey[`bm:${spbm}`] || + localNameByKey[`id:${spId}`] || + '' + ).trim() || '未命名商品' + const available = formatStockNum( + item.available !== undefined && item.available !== null ? item.available : item.stock + ) + const required = formatStockNum( + item.required !== undefined && item.required !== null ? item.required : item.quantity + ) + const codeHint = spbm ? `,编码 ${spbm}` : '' + return `${idx + 1}. ${name}${codeHint}(账面库存 ${available},需要 ${required})` + }).join('\n') await ElMessageBox.alert( - `以下商品库存不足,无法发货:\n\n${itemNames}\n\n请先到 ERP 补充库存后再提交发货单。`, + `以下商品库存不足,无法发货:\n\n${itemLines}\n\n请先到 ERP 补充库存后再提交发货单。`, '库存不足', { confirmButtonText: '我知道了', type: 'error' } ) @@ -2266,7 +2351,10 @@ const handleSubmit = async () => { submitting.value = true try { - const productItemsForSubmit = shippableItems.map((item) => ({ + const productItemsForSubmit = shippableItems.map((item) => { + const erpSpbh = String(item.erpSpbh || '').trim() + const spbm = String(item.spbm || '').trim() + return { product_name: item.product_name || '', // product_pic 保留以兼容老后端;同时新增 douyin_pic/erp_pic 分别存抖音图和 ERP 图 product_pic: item.erp_pic || item.product_pic || item.douyin_pic || '', @@ -2277,12 +2365,14 @@ const handleSubmit = async () => { spec: item.spec || '', sku_id: item.sku_id || '', out_sku_id: item.out_sku_id || '', - spbm: item.spbm || '', + spbm: spbm || erpSpbh, + spId: erpSpbh, + erpSpbh: erpSpbh, dw: item.dw || '', isGift: Boolean(item.isGift), isFromErp: Boolean(item.isFromErp), selectedSerialNumbers: item.selectedSerialNumbers || [] - })) + }}) syncMerchantIncomeFromOrder() allocateProductPricesByMerchantIncome() @@ -2360,6 +2450,56 @@ const handleCancel = () => { } /** + * 创建运单:按所选快递产品调用抖店取号,并尝试同步抖音发货。 + */ +const handleCreateSfWaybill = async () => { + const id = form.value.orderId + if (!id) { + ElMessage.warning('订单信息未加载完成') + return + } + if (waybillTrackingNumber.value) { + ElMessage.warning('已存在运单号,无需重复创建') + return + } + if (form.value.status === 2 || form.value.status === 3 || form.value.status === 4) { + ElMessage.warning('当前订单状态不允许创建运单') + return + } + const productType = String(form.value.sfProductType || '247').trim() || '247' + const productLabel = (sfProductTypeOptions.find(o => o.value === productType) || {}).label || '电商标快' + try { + await ElMessageBox.confirm( + `确定以「${productLabel}」为该订单创建顺丰运单吗?\n创建成功后将尝试同步到抖音发货。`, + '创建运单', + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + ) + } catch { + return + } + creatingWaybill.value = true + try { + const res = await createWaybill(id, productType) + const data = (res && res.data) || {} + waybillTrackingNumber.value = data.trackingNumber || waybillTrackingNumber.value || '' + if (data.productType) form.value.sfProductType = String(data.productType) + try { + await shipToDouyin(id) + } catch (shipError) { + const shipMsg = (shipError.response && shipError.response.data && shipError.response.data.message) || shipError.message || '未知错误' + ElMessage.warning('运单已创建,但同步抖音发货失败:' + shipMsg) + } + await loadOrderDetail() + ElMessage.success(data.message || `运单创建成功(${productLabel})`) + } catch (error) { + const msg = (error.response && error.response.data && error.response.data.message) || error.message || '未知错误' + ElMessage.error('创建运单失败:' + msg) + } finally { + creatingWaybill.value = false + } +} + +/** * 打印 / 补打电子面单:隐藏 iframe 直连打印机,不打开预览页。 */ const handleWaybillPrintOrReprint = async () => { @@ -2412,8 +2552,11 @@ onMounted(() => { loading, submitting, printing, + creatingWaybill, handleWaybillPrintOrReprint, + handleCreateSfWaybill, form, + sfProductTypeOptions, waybillStatus, waybillSalesOrderId, waybillSubmitBlocked, @@ -3173,6 +3316,9 @@ onMounted(() => { margin-right: 0 !important; vertical-align: middle; } +.inline-select--product :deep(.el-select) { + width: 120px; +} .inline-select { margin-bottom: 0 !important; diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue index f55c1fc..ea5a520 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue @@ -750,6 +750,37 @@
+ + + + + + + +

+ {{ createWaybillDialogMode === 'batch' + ? `将为 ${createWaybillBatchTargets.length} 个订单创建顺丰运单,并同步到抖音发货。默认电商标快。` + : '将创建顺丰运单并同步到抖音发货。完成后需手动创建发货单。默认电商标快。' }} +

+
+
+ 取消 + 确定创建 +
+
+ @@ -787,6 +818,18 @@ const resyncClearAll = ref(false) const syncStatus = ref(null) let syncStatusTimer = null +const sfProductTypeOptions = [ + { value: '247', label: '电商标快' }, + { value: '2', label: '顺丰标快' }, + { value: '1', label: '顺丰特快' } +] +const createWaybillDialogVisible = ref(false) +const createWaybillDialogLoading = ref(false) +const createWaybillProductType = ref('247') +const createWaybillDialogMode = ref('single') // single | batch +const createWaybillSingleOrder = ref(null) +const createWaybillBatchTargets = ref([]) + const filterForm = ref({ shopId: undefined, status: 'pending_waybill', @@ -1604,61 +1647,68 @@ const handleBatchCreateWaybill = async () => { return } + createWaybillDialogMode.value = 'batch' + createWaybillBatchTargets.value = batchTargets + createWaybillSingleOrder.value = null + createWaybillProductType.value = '247' + createWaybillDialogVisible.value = true +} + +const onCreateWaybillDialogClosed = () => { + createWaybillDialogLoading.value = false + createWaybillSingleOrder.value = null + createWaybillBatchTargets.value = [] + createWaybillProductType.value = '247' +} + +const confirmCreateWaybillDialog = async () => { + const productType = String(createWaybillProductType.value || '247').trim() || '247' + if (createWaybillDialogMode.value === 'batch') { + await runBatchCreateWaybill(createWaybillBatchTargets.value, productType) + } else if (createWaybillSingleOrder.value) { + await runSingleCreateWaybill(createWaybillSingleOrder.value, productType) + } +} + +const runBatchCreateWaybill = async (batchTargets, productType) => { + createWaybillDialogLoading.value = true + batchLoading.value = true try { - await ElMessageBox.confirm( - `确定要为 ${batchTargets.length} 个订单批量创建运单吗?\n\n此操作将依次执行:\n1. 创建运单\n2. 同步到抖音发货\n\n完成后状态为「已发货-未提交发货单」,需手动创建发货单。`, - '批量创建运单', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - } - ) - - batchLoading.value = true - let successCount = 0 let failCount = 0 const errors = [] const successOrderIds = [] - + const concurrency = 3 const queue = batchTargets.slice() const workers = Array.from({ length: Math.min(concurrency, queue.length) }).map(async () => { while (queue.length > 0) { const order = queue.shift() if (!order) continue - try { - // 1. 创建运单 - await createWaybill(order.id) - - // 2. 同步到抖音发货 try { - await shipToDouyin(order.id) - } catch (shipError) { - const errorMsg = (shipError.response && shipError.response.data && shipError.response.data.message) || shipError.message || '未知错误' - errors.push(`订单 ${order.orderId} 同步抖音失败: ${errorMsg}`) + await createWaybill(order.id, productType) + try { + await shipToDouyin(order.id) + } catch (shipError) { + const errorMsg = (shipError.response && shipError.response.data && shipError.response.data.message) || shipError.message || '未知错误' + errors.push(`订单 ${order.orderId} 同步抖音失败: ${errorMsg}`) + } + successCount++ + successOrderIds.push(order.id) + } catch (error) { + failCount++ + const errorMsg = (error.response && error.response.data && error.response.data.message) || error.message || '未知错误' + errors.push(`订单 ${order.orderId} 创建运单失败: ${errorMsg}`) } - - successCount++ - successOrderIds.push(order.id) - } catch (error) { - failCount++ - const errorMsg = (error.response && error.response.data && error.response.data.message) || error.message || '未知错误' - errors.push(`订单 ${order.orderId} 创建运单失败: ${errorMsg}`) - } } }) await Promise.all(workers) - - // 先本地即时迁移,再立即回源刷新列表 + applyWaybillTransitionLocal(successOrderIds) await refreshListAndStats() - - // 清空选择 selectedOrders.value = [] - - // 显示结果 + createWaybillDialogVisible.value = false + if (errors.length > 0 && errors.length <= 5) { ElMessage.warning(`批量创建完成:成功 ${successCount} 个,失败 ${failCount} 个。失败详情:${errors.join('; ')}`) } else if (errors.length > 5) { @@ -1667,12 +1717,11 @@ const handleBatchCreateWaybill = async () => { ElMessage.success(`批量创建运单成功,共 ${successCount} 个订单`) } } catch (error) { - if (error !== 'cancel' && error !== 'close') { - const errorMsg = error.message || '未知错误' - ElMessage.error('批量创建运单失败:' + errorMsg) - } + const errorMsg = error.message || '未知错误' + ElMessage.error('批量创建运单失败:' + errorMsg) } finally { batchLoading.value = false + createWaybillDialogLoading.value = false } } @@ -1731,28 +1780,24 @@ const handleCreateWaybill = async (order) => { handleManualCreateWaybill(order) return } + createWaybillDialogMode.value = 'single' + createWaybillSingleOrder.value = order + createWaybillBatchTargets.value = [] + createWaybillProductType.value = '247' + createWaybillDialogVisible.value = true +} + +const runSingleCreateWaybill = async (order, productType) => { + createWaybillDialogLoading.value = true + loading.value = true try { - await ElMessageBox.confirm( - '确定要为该订单创建运单吗?\n\n此操作将依次执行:\n1. 创建运单\n2. 同步到抖音发货\n\n完成后状态将变为「已发货-未提交发货单」,需手动创建发货单。', - '创建运单', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - } - ) - - loading.value = true - - // 1. 创建运单 try { - await createWaybill(order.id) + await createWaybill(order.id, productType) } catch (error) { const errorMsg = (error.response && error.response.data && error.response.data.message) || error.message || '未知错误' throw new Error('创建运单失败:' + errorMsg) } - - // 2. 同步到抖音发货 + try { await shipToDouyin(order.id) } catch (error) { @@ -1760,20 +1805,18 @@ const handleCreateWaybill = async (order) => { ElMessage.warning('同步抖音发货失败:' + errorMsg) } - // 本地即时迁移 + 立即刷新列表 applyWaybillTransitionLocal([order.id]) await refreshListAndStats() + createWaybillDialogVisible.value = false - // 创建运单后直接唤起打印机(隐藏 iframe,不打开面单预览页) await autoPrintWaybillFaceSheet(order) ElMessage.success('运单已创建,正在发送到打印机') } catch (error) { - if (error !== 'cancel' && error !== 'close') { - const errorMsg = error.message || '未知错误' - ElMessage.error(errorMsg) - } + const errorMsg = error.message || '未知错误' + ElMessage.error(errorMsg) } finally { loading.value = false + createWaybillDialogLoading.value = false } } @@ -2408,6 +2451,14 @@ onUnmounted(() => { handleSplitMerged, handleUnsplit, handleCreateWaybill, + createWaybillDialogVisible, + createWaybillDialogLoading, + createWaybillProductType, + createWaybillDialogMode, + createWaybillBatchTargets, + sfProductTypeOptions, + onCreateWaybillDialogClosed, + confirmCreateWaybillDialog, viewWaybillOnline, openWaybillFaceSheetPreview, handleManualCreateWaybill, @@ -2536,6 +2587,12 @@ onUnmounted(() => { justify-content: flex-end; gap: 8px; } +.create-waybill-dialog-tip { + margin: 0; + color: #909399; + font-size: 12px; + line-height: 1.5; +} .order-list-container { padding: 20px; diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/index.vue new file mode 100644 index 0000000..1629e44 --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/index.vue @@ -0,0 +1,386 @@ + + + + + diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-detail-host.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-detail-host.vue new file mode 100644 index 0000000..e6ef343 --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-detail-host.vue @@ -0,0 +1,83 @@ + + + diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-pd-detail.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-pd-detail.vue new file mode 100644 index 0000000..0ddfff2 --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/recycle-pd-detail.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/wtBillRecycleDetailMap.js b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/wtBillRecycleDetailMap.js new file mode 100644 index 0000000..461bd4e --- /dev/null +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBillRecycle/wtBillRecycleDetailMap.js @@ -0,0 +1,91 @@ +/** WtXsckd 子类型(djlx)→ detail-view 动态加载器 */ +const WT_XSCKD_DJLX_LOADERS = { + 销售出库单: () => import('@/views/wtXsckd/detail-view.vue'), + 零售单: () => import('@/views/wtXsckd/detail-view.vue'), + 预售出库单: () => import('@/views/wtYsckd/detail-view.vue'), + 销售退货单: () => import('@/views/wtXsthd/detail-view.vue'), + 预售退货单: () => import('@/views/wtYsthd/detail-view.vue'), + 同价调拨单: () => import('@/views/wtTjdbd/detail-view.vue'), + 变价调拨单: () => import('@/views/wtBjdbd/detail-view.vue'), + 报损单: () => import('@/views/wtBsd/detail-view.vue'), + 报溢单: () => import('@/views/wtByd/detail-view.vue'), + 采购入库单: () => import('@/views/wtCgrkd/detail-view.vue'), + 采购退货单: () => import('@/views/wtCgthd/detail-view.vue'), + 赠送单: () => import('@/views/wtZsd/detail-view.vue'), + 委托代销发货单: () => import('@/views/wtXswtdxfhd/detail-view.vue'), + 委托代销退货单: () => import('@/views/wtXswtdxthd/detail-view.vue'), + 委托代销结算单: () => import('@/views/wtXswtdxjsd/detail-view.vue'), + 获赠单: () => import('@/views/wtHzd/detail-view.vue') +} + +/** WtCwdj 子类型(djlx)→ detail-view */ +const WT_CWDJ_DJLX_LOADERS = { + 收款单: () => import('@/views/wtCwdj_skd/detail-view.vue'), + 付款单: () => import('@/views/wtCwdj_fkd/detail-view.vue'), + 费用单: () => import('@/views/wtCwdj_fyd/detail-view.vue'), + 固定资产购买: () => import('@/views/wtCwdj_gdzcgm/detail-view.vue'), + 固定资产变卖: () => import('@/views/wtCwdj_gdzcbm/detail-view.vue'), + 固定资产折旧: () => import('@/views/wtCwdj_gdzczj/detail-view.vue'), + 待摊费用摊销: () => import('@/views/wtCwdj_dtfytx/detail-view.vue') +} + +/** WtYskzjjs 子类型(djlx)→ detail-view */ +const WT_YSKZJJS_DJLX_LOADERS = { + 应收款增加: () => import('@/views/wtYskzjjs/detail-view.vue'), + 应收款减少: () => import('@/views/wtYskzjjs_js/detail-view.vue'), + 应付款增加: () => import('@/views/wtYfkzjjs/detail-view.vue'), + 应付款减少: () => import('@/views/wtYfkzjjs_js/detail-view.vue'), + 现金费用单: () => import('@/views/wtYskzjjs_xj/detail-view.vue'), + 转款单: () => import('@/views/wtYskzjjs_zk/detail-view.vue'), + 会员到期退款: () => import('@/views/wtYskzjjs_hy/detail-view.vue'), + 其他收入单: () => import('@/views/wtYskzjjs_qt/detail-view.vue') +} + +/** billSource 级默认加载器(无 djlx 或未命中子映射时使用) */ +const BILL_SOURCE_LOADERS = { + WtXsckd: null, + WtCwdj: null, + WtYskzjjs: null, + WtFysrd: () => import('@/views/wtFysrd_qtsr/detail-view.vue'), + WtTjd: () => import('@/views/wtPriceAdjust/detail-view.vue'), + WtCzd: () => import('@/views/wtCzd/detail-view.vue'), + WtFpsq: () => import('@/views/wtFpsq/detail-view.vue'), + WtKfbfb: () => import('@/views/wtKfbfb/detail-view.vue'), + WtZkd: () => import('@/views/wtYskzjjs_zk/detail-view.vue'), + WtPd: () => import('@/views/wtBillRecycle/recycle-pd-detail.vue'), + WtHydqtk: () => import('@/views/wtYskzjjs_hy/detail-view.vue'), + WtSfk: null +} + +const BILL_SOURCE_DJLX_LOADERS = { + WtXsckd: WT_XSCKD_DJLX_LOADERS, + WtCwdj: WT_CWDJ_DJLX_LOADERS, + WtYskzjjs: WT_YSKZJJS_DJLX_LOADERS, + WtTjd: { + 商品调价单: () => import('@/views/wtPriceAdjust/detail-view.vue') + } +} + +function normalizeDjlx(djlx) { + if (djlx === null || djlx === undefined) return '' + return String(djlx).trim() +} + +/** + * 按 billSource + djlx 解析 detail-view 动态加载器。 + * @returns {(() => Promise) | null} + */ +export function resolveRecycleDetailLoader(billSource, djlx) { + const source = billSource ? String(billSource).trim() : '' + const type = normalizeDjlx(djlx) + const byDjlx = BILL_SOURCE_DJLX_LOADERS[source] + if (byDjlx && type && byDjlx[type]) { + return byDjlx[type] + } + return BILL_SOURCE_LOADERS[source] || null +} + +/** 是否支持在回收站打开详情 */ +export function isRecycleDetailSupported(billSource, djlx) { + return !!resolveRecycleDetailLoader(billSource, djlx) +} diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/cgrkd-export-xlsx.js b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/cgrkd-export-xlsx.js index f2da03d..a3849e8 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/cgrkd-export-xlsx.js +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/cgrkd-export-xlsx.js @@ -1,5 +1,6 @@ import * as XLSX from 'xlsx' import { CGRKD_DETAIL_EXPORT_COLUMNS } from '@/utils/wtExportDialog' +import { getWtDjztDisplayLabel, getWtAuditNodeLabel } from '@/utils/wtDjztDisplay' export { CGRKD_DETAIL_EXPORT_COLUMNS } @@ -87,6 +88,8 @@ export function downloadCgrkdSummaryXlsx(rows, columnList, filename) { const body = (rows || []).map(row => cols.map(c => { const prop = c.prop if (prop === 'djrq') return formatDjrq(row.djrq) + if (prop === 'djzt') return getWtDjztDisplayLabel(row.djzt || row.shzt, row.spbz) || '无' + if (prop === 'auditNode') return getWtAuditNodeLabel(row.djzt || row.shzt, row.spbz) || '无' if (prop === 'rkck') return labelFromOptions(row.rkck, row._rkckOptions) || cellText(row.rkck) if (prop === 'skzh' && row._skzhOptions) { const hit = row._skzhOptions.find(o => String(o.id) === String(row.skzh)) 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 7bc366b..2fa6955 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 @@ -18,7 +18,10 @@ {{ cellText(detail.id) }} - +
+ + {{ auditNodeLabel }} +
@@ -213,6 +216,7 @@ import PurchaseInboundSerialViewDialog from './purchase-inbound-serial-view-dial import { previewDataInterface } from '@/api/systemData/dataInterface' import { dynamicText } from '@/filters' import { getAccountSelector } from '@/api/extend/wtAccount' +import { getWtAuditNodeLabel, getWtAuditNodeTagType } from '@/utils/wtDjztDisplay' export default { name: 'WtCgrkdDetailView', @@ -249,6 +253,14 @@ export default { if (z === '待审核' || !z) return 'warning' return 'info' }, + auditNodeLabel() { + if (!this.detail) return '无' + return getWtAuditNodeLabel(this.detail.djzt || this.detail.shzt, this.detail.spbz) || '无' + }, + auditNodeTagType() { + if (!this.detail) return 'info' + return getWtAuditNodeTagType(this.detail.djzt || this.detail.shzt, this.detail.spbz) + }, }, methods: { labelFromOptions(value, options) { @@ -564,6 +576,12 @@ export default { .detail-top__icon--primary { color: #409eff; } +.detail-top__tags { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 8px; +} .collect-stat-card { height: 100px; 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 37b7a98..f1c5b54 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 @@ -133,6 +133,13 @@ + + +