1
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
parent
7f9ed5eb67
commit
53c0321e0d
@ -1,20 +1,29 @@
|
||||
<template>
|
||||
<el-dialog v-model="visible" :title="dialogTitle" width="1135px" custom-class="print-dialog">
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
:title="dialogTitle"
|
||||
width="1135px"
|
||||
class="print-dialog"
|
||||
custom-class="print-dialog"
|
||||
:body-style="printDialogBodyStyle"
|
||||
>
|
||||
<div class="print-dialog-layout">
|
||||
<div class="print-batch-list">
|
||||
<div class="list-title">打印队列 ({{ selectionRows.length }})</div>
|
||||
<div
|
||||
v-for="(row, index) in selectionRows"
|
||||
:key="row.id"
|
||||
class="batch-item"
|
||||
:class="{ active: currentPrintIndex === index }"
|
||||
@click="switchPrintItem(index)"
|
||||
>
|
||||
<span class="item-index">{{ index + 1 }}</span>
|
||||
<span class="item-number">{{ getQueueNumber(row) }}</span>
|
||||
<el-tag size="small" :type="getStatusTagType(row.id)">
|
||||
{{ getStatusLabel(row.id) }}
|
||||
</el-tag>
|
||||
<div class="print-batch-list__content">
|
||||
<div
|
||||
v-for="(row, index) in selectionRows"
|
||||
:key="row.id"
|
||||
class="batch-item"
|
||||
:class="{ active: currentPrintIndex === index }"
|
||||
@click="switchPrintItem(index)"
|
||||
>
|
||||
<span class="item-index">{{ index + 1 }}</span>
|
||||
<span class="item-number">{{ getQueueNumber(row) }}</span>
|
||||
<el-tag size="small" :type="getStatusTagType(row.id)">
|
||||
{{ getStatusLabel(row.id) }}
|
||||
</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -40,65 +49,67 @@
|
||||
</el-select>
|
||||
</div>
|
||||
|
||||
<div class="print-canvas-area">
|
||||
<div
|
||||
v-if="previewInfo.width && previewInfo.height"
|
||||
class="preview-page"
|
||||
:style="{ width: previewInfo.width + 'mm', height: previewInfo.height + 'mm', position: 'relative' }"
|
||||
>
|
||||
<div v-for="(item, idx) in previewObjects" :key="item.id" :style="computePreviewItemStyle(item, idx)">
|
||||
<template v-if="item.type === 'text'">
|
||||
<span>{{ getPreviewValue(item) }}</span>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'barcode'">
|
||||
<barcode-img :text="getPreviewValue(item) || '0123456789'" />
|
||||
</template>
|
||||
<template v-else-if="item.type === 'qrcode'">
|
||||
<img
|
||||
:src="'https://ye4s.wms.gztbyc.com/qrcode/build?text=' + encodeURIComponent(getPreviewValue(item) || '')"
|
||||
alt=""
|
||||
style="width: 100%; height: 100%; object-fit: contain;"
|
||||
/>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'image'">
|
||||
<img :src="item.content" alt="" style="width: 100%; height: 100%; object-fit: fill;" />
|
||||
</template>
|
||||
<template v-else-if="item.type === 'table'">
|
||||
<table style="border: 1px solid #000; border-collapse: collapse;" border="1" cellspacing="0" cellpadding="0" width="100%" height="auto">
|
||||
<thead>
|
||||
<tr>
|
||||
<td
|
||||
v-for="c in item.rows"
|
||||
:key="c.id"
|
||||
:style="{ width: c.width + 'mm', fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.headerHeight || 4) + 'mm' }"
|
||||
<div class="print-preview-main__content">
|
||||
<div class="print-canvas-area">
|
||||
<div
|
||||
v-if="previewInfo.width && previewInfo.height"
|
||||
class="preview-page"
|
||||
:style="{ width: previewInfo.width + 'mm', height: previewInfo.height + 'mm', position: 'relative' }"
|
||||
>
|
||||
<div v-for="(item, idx) in previewObjects" :key="item.id" :style="computePreviewItemStyle(item, idx)">
|
||||
<template v-if="item.type === 'text'">
|
||||
<span>{{ getPreviewValue(item) }}</span>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'barcode'">
|
||||
<barcode-img :text="getPreviewValue(item) || '0123456789'" />
|
||||
</template>
|
||||
<template v-else-if="item.type === 'qrcode'">
|
||||
<img
|
||||
:src="'https://ye4s.wms.gztbyc.com/qrcode/build?text=' + encodeURIComponent(getPreviewValue(item) || '')"
|
||||
alt=""
|
||||
style="width: 100%; height: 100%; object-fit: contain;"
|
||||
/>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'image'">
|
||||
<img :src="item.content" alt="" style="width: 100%; height: 100%; object-fit: fill;" />
|
||||
</template>
|
||||
<template v-else-if="item.type === 'table'">
|
||||
<table style="border: 1px solid #000; border-collapse: collapse;" border="1" cellspacing="0" cellpadding="0" width="100%" height="auto">
|
||||
<thead>
|
||||
<tr>
|
||||
<td
|
||||
v-for="c in item.rows"
|
||||
:key="c.id"
|
||||
:style="{ width: c.width + 'mm', fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.headerHeight || 4) + 'mm' }"
|
||||
>
|
||||
{{ c.title }}
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
v-for="(detailItem, dIdx) in (printForm.details && printForm.details.length ? printForm.details : [printForm])"
|
||||
:key="dIdx"
|
||||
>
|
||||
{{ c.title }}
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
v-for="(detailItem, dIdx) in (printForm.details && printForm.details.length ? printForm.details : [printForm])"
|
||||
:key="dIdx"
|
||||
>
|
||||
<td
|
||||
v-for="c in item.rows"
|
||||
:key="c.id + '_v'"
|
||||
:style="{ fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.rowHeight || 4) + 'mm' }"
|
||||
>
|
||||
{{ detailItem[c.field_code] || '' }}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'shape'">
|
||||
<div style="width: 100%; height: 100%;" />
|
||||
</template>
|
||||
<td
|
||||
v-for="c in item.rows"
|
||||
:key="c.id + '_v'"
|
||||
:style="{ fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.rowHeight || 4) + 'mm' }"
|
||||
>
|
||||
{{ detailItem[c.field_code] || '' }}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</template>
|
||||
<template v-else-if="item.type === 'shape'">
|
||||
<div style="width: 100%; height: 100%;" />
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="preview-empty">
|
||||
<el-empty description="请在上方选择打印模板" :image-size="60" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="preview-empty">
|
||||
<el-empty description="请在上方选择打印模板" :image-size="60" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -160,6 +171,11 @@ const visible = computed({
|
||||
set: (value: boolean) => emit('update:modelValue', value)
|
||||
})
|
||||
const dialogTitle = computed(() => props.dialogTitle || '批量打印收货单')
|
||||
const printDialogBodyStyle = {
|
||||
overflow: 'hidden',
|
||||
height: 'calc(80vh - 88px)',
|
||||
boxSizing: 'border-box'
|
||||
} as const
|
||||
|
||||
const printing = ref(false)
|
||||
const currentPrintIndex = ref(0)
|
||||
@ -566,8 +582,9 @@ async function doPrint() {
|
||||
<style scoped lang="scss">
|
||||
.print-dialog-layout {
|
||||
display: flex;
|
||||
height: 1150px;
|
||||
height: 100%;
|
||||
border: 1px solid #ebeef5;
|
||||
min-height: 0;
|
||||
|
||||
.print-batch-list {
|
||||
width: 250px;
|
||||
@ -575,16 +592,23 @@ async function doPrint() {
|
||||
background-color: #fafafa;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
max-height: 100%;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.list-title {
|
||||
flex-shrink: 0;
|
||||
padding: 10px;
|
||||
font-weight: bold;
|
||||
border-bottom: 1px solid #ebeef5;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.print-batch-list__content {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.batch-item {
|
||||
padding: 12px 15px;
|
||||
cursor: pointer;
|
||||
@ -620,10 +644,12 @@ async function doPrint() {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
background-color: #fff;
|
||||
|
||||
.print-settings-bar {
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
@ -638,9 +664,14 @@ async function doPrint() {
|
||||
}
|
||||
}
|
||||
|
||||
.print-canvas-area {
|
||||
.print-preview-main__content {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.print-canvas-area {
|
||||
min-height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
@ -678,8 +709,18 @@ async function doPrint() {
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.print-dialog .el-dialog) {
|
||||
:deep(.el-dialog.print-dialog) {
|
||||
height: 80vh;
|
||||
max-height: 80vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
top: 50% !important;
|
||||
transform: translateY(-50%) !important;
|
||||
}
|
||||
|
||||
:deep(.el-dialog.print-dialog .el-dialog__body) {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -79,6 +79,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="履约记录" name="fulfillment" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
@ -87,13 +88,16 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<div v-if="activeTab === 'items'">
|
||||
<workbench-order-detail :row="selectedRow" mode="items" :detail-request="orderArchiveOrder.detail" />
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" :detail-request="orderArchiveOrder.detail" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'">
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'" class="detail-page">
|
||||
<p>履约历程加载中...</p>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
</KeepAlive>
|
||||
@ -128,7 +132,8 @@ import {
|
||||
getTagType,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import log from './component/log.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
@ -141,7 +146,7 @@ const upperTable = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields)))
|
||||
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
|
||||
@ -85,6 +85,7 @@ import { getTagType, translateOrderField } from '../config/order-common-config'
|
||||
|
||||
const props = defineProps<{
|
||||
row: Record<string, any> | null
|
||||
detailRequest?: (data: Record<string, any>) => Promise<any>
|
||||
}>()
|
||||
|
||||
const loading = ref(false)
|
||||
@ -116,7 +117,8 @@ async function loadDetail() {
|
||||
const requestId = ++latestRequestId
|
||||
loading.value = true
|
||||
try {
|
||||
const res: any = await orderPendingOrder.detail({
|
||||
const requestFn = props.detailRequest || orderPendingOrder.detail
|
||||
const res: any = await requestFn({
|
||||
id: props.row.id,
|
||||
ids: [props.row.id],
|
||||
tableType: 'order'
|
||||
|
||||
@ -79,6 +79,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="履约记录" name="fulfillment" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
@ -87,13 +88,16 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<div v-if="activeTab === 'items'">
|
||||
<workbench-order-detail :row="selectedRow" mode="items" :detail-request="orderDeliveryExpectionOrder.detail" />
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" :detail-request="orderDeliveryOrder.detail" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'">
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'" class="detail-page">
|
||||
<p>履约历程加载中...</p>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
</KeepAlive>
|
||||
@ -117,6 +121,7 @@ import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder'
|
||||
import { orderDeliveryExpectionOrder } from '@/api/order.deliveryexpectionorder/orderdeliveryexpectionorder'
|
||||
|
||||
import {
|
||||
@ -128,7 +133,8 @@ import {
|
||||
getTagType,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import log from './component/log.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
@ -141,7 +147,7 @@ const upperTable = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields)))
|
||||
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
|
||||
@ -131,6 +131,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
</el-tabs>
|
||||
@ -138,13 +139,13 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<workbench-order-detail
|
||||
v-if="activeTab === 'items'"
|
||||
:row="selectedRow"
|
||||
mode="items"
|
||||
:detail-request="orderDeliveryOrder.detail"
|
||||
/>
|
||||
<div v-else>
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" :detail-request="orderDeliveryOrder.detail" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
</KeepAlive>
|
||||
@ -178,7 +179,8 @@ import {
|
||||
getTagType,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import log from './component/log.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
@ -189,7 +191,7 @@ const scanBox = ref<any>(null)
|
||||
const upperTable = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(deliveryAvailableFields)))
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
const exportLoading = ref(false)
|
||||
|
||||
@ -79,6 +79,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="履约记录" name="fulfillment" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
@ -87,13 +88,16 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<div v-if="activeTab === 'items'">
|
||||
<workbench-order-detail :row="selectedRow" mode="items" :detail-request="orderEntrustOrder.detail" />
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" :detail-request="orderEntrustOrder.detail" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'">
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'fulfillment'" class="detail-page">
|
||||
<p>履约历程加载中...</p>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
</KeepAlive>
|
||||
@ -128,7 +132,8 @@ import {
|
||||
getTagType,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import log from './component/log.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
@ -141,7 +146,7 @@ const upperTable = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields)))
|
||||
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
|
||||
@ -215,31 +215,23 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="配货信息" name="picking" />
|
||||
<el-tab-pane label="归档订单" name="archive" />
|
||||
<el-tab-pane label="异常记录" name="exceptions" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
</el-tabs>
|
||||
</div>
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<div v-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<workbench-order-detail :row="selectedRow" mode="items" :detail-request="orderExpectionOrder.detail" />
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'picking'" class="detail-page order-picking-wrapper">
|
||||
<p>配货明细加载中...</p>
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'archive'" class="detail-page order-archive-wrapper">
|
||||
<archive-order-panel
|
||||
:order-id="selectedRow?.id || null"
|
||||
:delivery-order-code="selectedRow?.delivery_order_code || ''"
|
||||
/>
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'exceptions'" class="detail-page">
|
||||
<el-alert title="系统异常" type="error" :closable="false" description="库存不足或物流接口调用失败。" />
|
||||
</div>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
@ -363,8 +355,8 @@ const EXPORT_TIME_PROPS = new Set([
|
||||
'operate_time',
|
||||
'delivery_time'
|
||||
])
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import ArchiveOrderPanel from './component/ArchiveOrderPanel.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import log from './component/log.vue'
|
||||
import ManualCreatePendingOrderDialog from './component/ManualCreatePendingOrderDialog.vue'
|
||||
import ExcelImportPendingOrderDialog from './component/ExcelImportPendingOrderDialog.vue'
|
||||
@ -384,7 +376,7 @@ const upperTable = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(expectionOrderAvailableFields)))
|
||||
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
<el-tab-pane label="手动出库" name="manualOutbound" />
|
||||
@ -130,12 +131,12 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<workbench-order-detail
|
||||
v-if="activeTab === 'items'"
|
||||
:row="selectedRow"
|
||||
mode="items"
|
||||
:detail-request="orderOutboundOrder.detail"
|
||||
/>
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<log v-else-if="activeTab === 'logs'" :data="selectedRow" />
|
||||
<outbound-manual-outbound-form
|
||||
v-else
|
||||
@ -183,7 +184,8 @@ import {
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import log from './component/log.vue'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import OutboundManualOutboundForm from './component/OutboundManualOutboundForm.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
@ -194,7 +196,7 @@ const scanBox = ref<any>(null)
|
||||
const upperTable = ref<any>(null)
|
||||
const manualOutboundRef = ref<any>(null)
|
||||
const presetTree = ref<any[]>([])
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
const manualLoading = ref(false)
|
||||
|
||||
@ -95,6 +95,7 @@
|
||||
<div class="lower-level" v-if="selectedOrderId" :class="tableSize" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<el-tabs v-model="activeTab" class="detail-tab">
|
||||
<el-tab-pane label="订单明细" name="detail" />
|
||||
<el-tab-pane label="商品明细" name="items" />
|
||||
<el-tab-pane label="收货信息" name="receiver" />
|
||||
<el-tab-pane label="操作日志" name="logs" />
|
||||
@ -104,8 +105,11 @@
|
||||
|
||||
<div class="detail-container">
|
||||
<KeepAlive>
|
||||
<div v-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<workbench-order-detail :row="selectedRow" mode="items" :detail-request="orderReviewOrder.detail" />
|
||||
<div v-if="activeTab === 'detail'" class="detail-page order-detail-wrapper">
|
||||
<pending-order-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'items'" class="detail-page order-detail-wrapper">
|
||||
<order-items-detail-panel :row="selectedRow" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'receiver'" class="detail-page order-receiver-wrapper">
|
||||
<el-descriptions :column="2" border>
|
||||
@ -119,7 +123,7 @@
|
||||
<el-button size="small" type="primary" :loading="reviewSubmitting" @click="handleSingleReview">审核当前订单</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="detail-page order-log-wrapper">
|
||||
<div v-else-if="activeTab === 'logs'" class="detail-page order-log-wrapper">
|
||||
<log :data="selectedRow" />
|
||||
</div>
|
||||
</KeepAlive>
|
||||
@ -157,7 +161,8 @@ import {
|
||||
getTagType,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from './config/order-common-config'
|
||||
import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue'
|
||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||
import ManualCreatePendingOrderDialog from './component/ManualCreatePendingOrderDialog.vue'
|
||||
import log from './component/log.vue'
|
||||
import { exportUpperTableRows } from './utils/export'
|
||||
@ -183,7 +188,7 @@ const upperPaneFullStyle = computed(() => ({
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(reviewAvailableFields)))
|
||||
|
||||
const activeTab = ref('items')
|
||||
const activeTab = ref('detail')
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
|
||||
@ -268,7 +268,7 @@
|
||||
v-model="pendingOrderDialogVisible"
|
||||
:title="pendingOrderDialogTitle"
|
||||
width="92vw"
|
||||
top="4vh"
|
||||
class="wave-fixed-height-dialog"
|
||||
destroy-on-close
|
||||
append-to-body
|
||||
align-center
|
||||
@ -281,6 +281,7 @@
|
||||
v-model="groupOrderDialogVisible"
|
||||
title="抓取团购单"
|
||||
width="1280px"
|
||||
class="wave-fixed-height-dialog"
|
||||
align-center
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
@ -684,6 +685,7 @@
|
||||
v-model="waveStrategyFormDialogVisible"
|
||||
:title="waveStrategyFormMode === 'create' ? '新建波次策略' : '编辑波次策略'"
|
||||
width="720px"
|
||||
class="wave-fixed-height-dialog"
|
||||
align-center
|
||||
destroy-on-close
|
||||
append-to-body
|
||||
@ -850,7 +852,7 @@
|
||||
v-model="wavePrintDialogVisible"
|
||||
:selection-rows="wavePrintRows"
|
||||
business-type="PICKING"
|
||||
dialog-title="批量打印货单"
|
||||
dialog-title="批量打印拣货单"
|
||||
queue-no-field="wave_no"
|
||||
document-label="波次"
|
||||
:fetch-print-data="loadWavePrintFormData"
|
||||
@ -1187,12 +1189,14 @@ const buttonLoadingMap = computed(() => ({
|
||||
}))
|
||||
|
||||
const buttonDisabledMap = computed(() => ({
|
||||
batchPickingPrintDisabled: batchPrintDisabled.value,
|
||||
batchPrintDisabled: batchPrintDisabled.value,
|
||||
noSelection: !hasSelection.value
|
||||
}))
|
||||
|
||||
const buttonLabelMap = computed(() => ({
|
||||
batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`,
|
||||
batchPickingPrintTotal: `批量打印拣货单(${selectionRows.value.length})`,
|
||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||
}))
|
||||
|
||||
@ -1218,6 +1222,7 @@ const toolbarActionMap: Record<string, () => void> = {
|
||||
openColumnConfigPanel: () => openColumnConfigPanel(),
|
||||
toggleDetailVisible: () => toggleDetailVisible(),
|
||||
handleBatchPrint: () => handleBatchPrint(),
|
||||
handleBatchPrintPickingList: () => handleBatchPrintPickingList(),
|
||||
handleBatchAutoGrouping: () => {
|
||||
void handleBatchAutoGrouping()
|
||||
},
|
||||
@ -1798,45 +1803,7 @@ async function loadWavePrintFormData(row: any) {
|
||||
return wavePrintDataMap.value[key] || toWavePrintForm(row || {})
|
||||
}
|
||||
|
||||
async function handleBatchPrint() {
|
||||
if (!isGroupWaveTab.value) {
|
||||
ElMessage.warning('批量打印仅在「团购波次」页签可用')
|
||||
return
|
||||
}
|
||||
|
||||
if (!selectionRows.value.length) {
|
||||
ElMessage.warning('请先勾选要打印的波次')
|
||||
return
|
||||
}
|
||||
|
||||
const autoGroupingRows = [...autoGroupingSelectionRows.value]
|
||||
const removedCount = autoGroupingRows.length
|
||||
|
||||
if (removedCount) {
|
||||
autoGroupingRows.forEach((row: any) => {
|
||||
upperTable.value?.toggleRowSelection?.(row, false)
|
||||
})
|
||||
}
|
||||
|
||||
if (!printableSelectionRows.value.length) {
|
||||
ElMessage.warning('自动加团中的波次不参与批量打印,已从当前勾选中移除')
|
||||
return
|
||||
}
|
||||
|
||||
if (waveMaxOrderLimit.value !== null && selectedWaveOrderTotal.value > waveMaxOrderLimit.value) {
|
||||
ElMessage.warning(`选中波次总订单数为 ${selectedWaveOrderTotal.value},超过仓库配置上限 ${waveMaxOrderLimit.value} 单,暂不允许批量打印`)
|
||||
return
|
||||
}
|
||||
if (waveMaxOrderLimit.value === null) {
|
||||
ElMessage.warning('未获取到仓库波次最大订单数量配置,暂无法执行批量打印')
|
||||
return
|
||||
}
|
||||
|
||||
if (removedCount) {
|
||||
ElMessage.warning(`已自动移除 ${removedCount} 个“自动加团中”波次,不计入批量打印`)
|
||||
}
|
||||
|
||||
const rows = printableSelectionRows.value
|
||||
async function openBatchPrintDialog(rows: any[]) {
|
||||
const first = rows[0] as Record<string, unknown>
|
||||
const warehouseId = Number(first?.warehouse_id ?? userStore.user?.warehouse_id ?? userStore.user?.store_id)
|
||||
if (!Number.isFinite(warehouseId) || warehouseId <= 0) {
|
||||
@ -1881,6 +1848,58 @@ async function handleBatchPrint() {
|
||||
}
|
||||
}
|
||||
|
||||
async function handleBatchPrint() {
|
||||
if (!isGroupWaveTab.value) {
|
||||
ElMessage.warning('批量打印仅在「团购波次」页签可用')
|
||||
return
|
||||
}
|
||||
|
||||
if (!selectionRows.value.length) {
|
||||
ElMessage.warning('请先勾选要打印的波次')
|
||||
return
|
||||
}
|
||||
|
||||
const autoGroupingRows = [...autoGroupingSelectionRows.value]
|
||||
const removedCount = autoGroupingRows.length
|
||||
|
||||
if (removedCount) {
|
||||
autoGroupingRows.forEach((row: any) => {
|
||||
upperTable.value?.toggleRowSelection?.(row, false)
|
||||
})
|
||||
}
|
||||
|
||||
if (!printableSelectionRows.value.length) {
|
||||
ElMessage.warning('自动加团中的波次不参与批量打印,已从当前勾选中移除')
|
||||
return
|
||||
}
|
||||
|
||||
if (waveMaxOrderLimit.value !== null && selectedWaveOrderTotal.value > waveMaxOrderLimit.value) {
|
||||
ElMessage.warning(`选中波次总订单数为 ${selectedWaveOrderTotal.value},超过仓库配置上限 ${waveMaxOrderLimit.value} 单,暂不允许批量打印`)
|
||||
return
|
||||
}
|
||||
if (waveMaxOrderLimit.value === null) {
|
||||
ElMessage.warning('未获取到仓库波次最大订单数量配置,暂无法执行批量打印')
|
||||
return
|
||||
}
|
||||
|
||||
if (removedCount) {
|
||||
ElMessage.warning(`已自动移除 ${removedCount} 个“自动加团中”波次,不计入批量打印`)
|
||||
}
|
||||
|
||||
const rows = printableSelectionRows.value
|
||||
await openBatchPrintDialog(rows)
|
||||
}
|
||||
|
||||
async function handleBatchPrintPickingList() {
|
||||
if (!selectionRows.value.length) {
|
||||
ElMessage.warning('请先勾选要打印拣货单的波次')
|
||||
return
|
||||
}
|
||||
|
||||
const rows = [...selectionRows.value]
|
||||
await openBatchPrintDialog(rows)
|
||||
}
|
||||
|
||||
function stopFetchTaskPolling() {
|
||||
if (fetchTaskPollTimer.value) {
|
||||
clearTimeout(fetchTaskPollTimer.value)
|
||||
@ -3698,6 +3717,32 @@ async function submitFallbackOrderFetchByIds() {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
:deep(.el-overlay-dialog > .el-dialog) {
|
||||
height: 80vh;
|
||||
max-height: 80vh;
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-sizing: border-box;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
:deep(.el-overlay-dialog:has(> .el-dialog.wave-fixed-height-dialog)) {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
:deep(.el-overlay-dialog > .el-dialog .el-dialog__body) {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
:deep(.single-fetch-dialog .el-dialog__body) {
|
||||
height: calc(100vh - 240px);
|
||||
max-height: calc(100vh - 240px);
|
||||
|
||||
@ -176,6 +176,18 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
|
||||
action: 'handleBatchPrint',
|
||||
onlyForWaveType: 1
|
||||
},
|
||||
{
|
||||
key: 'batchPrintPickingList',
|
||||
label: '批量打印拣货单(0)',
|
||||
dynamicLabelKey: 'batchPickingPrintTotal',
|
||||
type: 'info',
|
||||
plain: true,
|
||||
size: 'small',
|
||||
disabledKey: 'noSelection',
|
||||
loadingKey: 'batchPrintLoading',
|
||||
action: 'handleBatchPrintPickingList',
|
||||
onlyForWaveType: 1
|
||||
},
|
||||
{
|
||||
key: 'batchAutoGrouping',
|
||||
label: '批量改为自动加团',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user