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