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} 个订单创建顺丰运单,并同步到抖音发货。默认电商标快。`
+ : '将创建顺丰运单并同步到抖音发货。完成后需手动创建发货单。默认电商标快。' }}
+
+
+
+ 取消
+ 确定创建
+
+
+
@@ -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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 展开
+ 收起
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据回收站
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ cellText(scope.row.djlx) }}
+
+
+
+
+
+ {{ cellText(scope.row.billNo || scope.row.id) }}
+
+
+
+
+ {{ formatDate(scope.row.djrq) }}
+
+
+
+
+
+
+
+
+
+
+ {{ formatDateTime(scope.row.deleteTime) }}
+
+
+
+
+
+ {{ cellText(scope.row.deleteUser || scope.row.deleteBy) }}
+
+
+
+
+ 恢复
+ 彻底删除
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+ {{ cellText(detail.pdbh || detail.id) }}
+
+
进行中
+
已完成
+
已取消
+
{{ cellText(detail.status) }}
+
+
+
+
+ {{ cellText(detail.ckmc || detail.ckId) }}
+
+
+ {{ formatDate(detail.djrq) }}
+
+
+ {{ formatMoney(detail.ykje) }}
+
+
+ {{ formatMoney(detail.zmzje) }}
+
+
+ {{ formatMoney(detail.sjzje) }}
+
+
+ {{ cellText(detail.bsdId) }}
+
+
+ {{ cellText(detail.bydId) }}
+
+
+ {{ cellText(detail.bz) }}
+
+
+
+ 盘点明细
+
+
+
+
+
+ {{ displayNum(scope.row.ckc) }}
+
+
+ {{ displayNum(scope.row.sjsl) }}
+
+
+ {{ displayNum(scope.row.yksl) }}
+
+
+ {{ formatMoney(scope.row.ykje) }}
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ {{ auditNodeLabel(scope.row) }}
+
+
+
@@ -248,7 +255,7 @@ import {
} from './cgrkd-export-xlsx'
import { previewDataInterface } from '@/api/systemData/dataInterface'
import { getAccountSelector } from '@/api/extend/wtAccount'
- import { getWtDjztDisplayLabel, getWtDjztTagType, canWtBillEdit, canWtBillDelete } from '@/utils/wtDjztDisplay'
+ import { getWtDjztDisplayLabel, getWtDjztTagType, getWtAuditNodeLabel, getWtAuditNodeTagType, canWtBillEdit, canWtBillDelete } from '@/utils/wtDjztDisplay'
import editDjrqListMixin from '@/mixins/editDjrqListMixin'
export default {
components: { NCCForm, DetailView },
@@ -299,6 +306,7 @@ import {
{ prop: 'bz', label: '备注' },
{ prop: 'djlx', label: '单据类型' },
{ prop: 'djzt', label: '审核状态' },
+ { prop: 'auditNode', label: '当前节点' },
],
detailExportColumnList: CGRKD_DETAIL_EXPORT_COLUMNS,
cjckOptions : [],
@@ -342,6 +350,14 @@ import {
djztTagType(djzt) {
return getWtDjztTagType(djzt)
},
+ auditNodeLabel(row) {
+ if (!row) return '无'
+ return getWtAuditNodeLabel(row.djzt || row.shzt, row.spbz) || '无'
+ },
+ auditNodeTagType(row) {
+ if (!row) return 'info'
+ return getWtAuditNodeTagType(row.djzt || row.shzt, row.spbz)
+ },
/** 草稿/待审核/审核不通过可编辑(统一走 canWtBillEdit) */
canEditRow(row) {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/edit-bz-dialog.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/edit-bz-dialog.vue
new file mode 100644
index 0000000..eafa5f5
--- /dev/null
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/edit-bz-dialog.vue
@@ -0,0 +1,93 @@
+
+
+
+
+ {{ memberLabel || '无' }}
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/index.vue
index c8fdb68..e603b36 100755
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtHy/index.vue
@@ -244,7 +244,7 @@
-
+
详情
购卡记录
@@ -252,6 +252,12 @@
>编辑
修改备注
+
+