69
This commit is contained in:
parent
45923ec6cb
commit
48718b521e
BIN
dist.tar.gz
BIN
dist.tar.gz
Binary file not shown.
@ -1,8 +1,12 @@
|
|||||||
import request from "@/utils/request";
|
import request from "@/utils/request";
|
||||||
|
import { orderModulePendingOrderDownloadCreateTemplate } from "@/api/order/order";
|
||||||
|
|
||||||
const v = "1.0";
|
const v = "1.0";
|
||||||
|
|
||||||
export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex'
|
export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex'
|
||||||
|
export type { PendingOrderDownloadCreateTemplateResponse } from '@/api/order/order'
|
||||||
|
|
||||||
|
export const orderPendingOrderDownloadCreateTemplate = orderModulePendingOrderDownloadCreateTemplate;
|
||||||
|
|
||||||
// 啊大王大大
|
// 啊大王大大
|
||||||
|
|
||||||
@ -69,12 +73,19 @@ export type PendingOrderUpdateAddressParams = {
|
|||||||
area?: string;
|
area?: string;
|
||||||
town?: string;
|
town?: string;
|
||||||
detail_address?: string;
|
detail_address?: string;
|
||||||
|
/** 订单留言/备注,对应列表字段 remark */
|
||||||
|
remark?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PendingOrderCloneOrderParams = {
|
export type PendingOrderCloneOrderParams = {
|
||||||
order_id: number;
|
order_id: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type PendingOrderManualWaybillParams = {
|
||||||
|
order_id: number;
|
||||||
|
waybill_code: string;
|
||||||
|
};
|
||||||
|
|
||||||
export type PendingOrderCreateOrderItem = {
|
export type PendingOrderCreateOrderItem = {
|
||||||
item_id: number;
|
item_id: number;
|
||||||
plan_qty: number;
|
plan_qty: number;
|
||||||
@ -100,6 +111,7 @@ export type PendingOrderCreateOrderParams = {
|
|||||||
logistics_name?: string;
|
logistics_name?: string;
|
||||||
sys_platform_code?: string;
|
sys_platform_code?: string;
|
||||||
shop_nick?: string;
|
shop_nick?: string;
|
||||||
|
remark?: string;
|
||||||
source_platform_code?: string;
|
source_platform_code?: string;
|
||||||
source_order_codes?: string;
|
source_order_codes?: string;
|
||||||
order_type?: string;
|
order_type?: string;
|
||||||
@ -449,6 +461,23 @@ export function orderPendingOrderCloneOrder(data: PendingOrderCloneOrderParams):
|
|||||||
} as any);
|
} as any);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** order.pendingOrder.manualWaybill:手工录入运单号 */
|
||||||
|
export function orderPendingOrderManualWaybill(
|
||||||
|
data: PendingOrderManualWaybillParams,
|
||||||
|
): Promise<any> {
|
||||||
|
return request({
|
||||||
|
url: "/system",
|
||||||
|
method: "post",
|
||||||
|
params: {
|
||||||
|
method: "order.pendingOrder.manualWaybill",
|
||||||
|
v,
|
||||||
|
timestamp: Date.now(),
|
||||||
|
},
|
||||||
|
data,
|
||||||
|
isSystemApi: true,
|
||||||
|
} as any);
|
||||||
|
}
|
||||||
|
|
||||||
export function orderPendingOrderCreateOrder(data: PendingOrderCreateOrderParams): Promise<any> {
|
export function orderPendingOrderCreateOrder(data: PendingOrderCreateOrderParams): Promise<any> {
|
||||||
return request({
|
return request({
|
||||||
url: "/system",
|
url: "/system",
|
||||||
@ -630,8 +659,10 @@ export type OrderPendingOrderApi = {
|
|||||||
updateOrderExpress: typeof orderPendingOrderUpdateOrderExpress;
|
updateOrderExpress: typeof orderPendingOrderUpdateOrderExpress;
|
||||||
updateAddress: typeof orderPendingOrderUpdateAddress;
|
updateAddress: typeof orderPendingOrderUpdateAddress;
|
||||||
cloneOrder: typeof orderPendingOrderCloneOrder;
|
cloneOrder: typeof orderPendingOrderCloneOrder;
|
||||||
|
manualWaybill: typeof orderPendingOrderManualWaybill;
|
||||||
createOrder: typeof orderPendingOrderCreateOrder;
|
createOrder: typeof orderPendingOrderCreateOrder;
|
||||||
importOrdersFromExcel: typeof orderPendingOrderImportOrdersFromExcel;
|
importOrdersFromExcel: typeof orderPendingOrderImportOrdersFromExcel;
|
||||||
|
downloadCreateTemplate: typeof orderPendingOrderDownloadCreateTemplate;
|
||||||
parseAddress: typeof orderPendingOrderParseAddress;
|
parseAddress: typeof orderPendingOrderParseAddress;
|
||||||
batchIntercept: typeof orderPendingOrderBatchIntercept;
|
batchIntercept: typeof orderPendingOrderBatchIntercept;
|
||||||
batchInterceptTaskProgress: typeof orderPendingOrderBatchInterceptTaskProgress;
|
batchInterceptTaskProgress: typeof orderPendingOrderBatchInterceptTaskProgress;
|
||||||
@ -658,8 +689,10 @@ export const orderPendingOrder: OrderPendingOrderApi = {
|
|||||||
updateOrderExpress: orderPendingOrderUpdateOrderExpress,
|
updateOrderExpress: orderPendingOrderUpdateOrderExpress,
|
||||||
updateAddress: orderPendingOrderUpdateAddress,
|
updateAddress: orderPendingOrderUpdateAddress,
|
||||||
cloneOrder: orderPendingOrderCloneOrder,
|
cloneOrder: orderPendingOrderCloneOrder,
|
||||||
|
manualWaybill: orderPendingOrderManualWaybill,
|
||||||
createOrder: orderPendingOrderCreateOrder,
|
createOrder: orderPendingOrderCreateOrder,
|
||||||
importOrdersFromExcel: orderPendingOrderImportOrdersFromExcel,
|
importOrdersFromExcel: orderPendingOrderImportOrdersFromExcel,
|
||||||
|
downloadCreateTemplate: orderPendingOrderDownloadCreateTemplate,
|
||||||
parseAddress: orderPendingOrderParseAddress,
|
parseAddress: orderPendingOrderParseAddress,
|
||||||
batchIntercept: orderPendingOrderBatchIntercept,
|
batchIntercept: orderPendingOrderBatchIntercept,
|
||||||
batchInterceptTaskProgress: orderPendingOrderBatchInterceptTaskProgress,
|
batchInterceptTaskProgress: orderPendingOrderBatchInterceptTaskProgress,
|
||||||
|
|||||||
15
src/layout/component/CreateOrderSessionHost.vue
Normal file
15
src/layout/component/CreateOrderSessionHost.vue
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<template>
|
||||||
|
<create-pending-order-dialog
|
||||||
|
v-if="sessionActive"
|
||||||
|
v-model="dialogVisible"
|
||||||
|
/>
|
||||||
|
<create-order-float-widget />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import CreatePendingOrderDialog from '@/views/order/orderManagement/component/CreatePendingOrderDialog.vue'
|
||||||
|
import CreateOrderFloatWidget from '@/views/order/orderManagement/component/CreateOrderFloatWidget.vue'
|
||||||
|
import { useCreateOrderSession } from '@/views/order/orderManagement/composables/useCreateOrderSession'
|
||||||
|
|
||||||
|
const { dialogVisible, sessionActive } = useCreateOrderSession()
|
||||||
|
</script>
|
||||||
@ -12,6 +12,7 @@
|
|||||||
<div v-if="fixedHeader" :style="{ height: shortcutExpanded ? '134px' : '84px', minHeight: shortcutExpanded ? '134px' : '84px' }"></div>
|
<div v-if="fixedHeader" :style="{ height: shortcutExpanded ? '134px' : '84px', minHeight: shortcutExpanded ? '134px' : '84px' }"></div>
|
||||||
<div class="main-box">
|
<div class="main-box">
|
||||||
<app-main />
|
<app-main />
|
||||||
|
<create-order-session-host />
|
||||||
<transition name="ai-slide">
|
<transition name="ai-slide">
|
||||||
<div class="ai-container" v-show="aiStore.isVisible" :style="{ top: shortcutExpanded ? '134px' : '97px', height: `calc(100vh - ${shortcutExpanded ? 134 : 97}px)` }">
|
<div class="ai-container" v-show="aiStore.isVisible" :style="{ top: shortcutExpanded ? '134px' : '97px', height: `calc(100vh - ${shortcutExpanded ? 134 : 97}px)` }">
|
||||||
<ai-chat />
|
<ai-chat />
|
||||||
@ -30,6 +31,7 @@ import { useAiStore } from '@/stores/modules/ai'
|
|||||||
import Sidebar from './component/Sidebar/index.vue'
|
import Sidebar from './component/Sidebar/index.vue'
|
||||||
import TaskView from './component/TaskView/index.vue'
|
import TaskView from './component/TaskView/index.vue'
|
||||||
import AppMain from './component/AppMain.vue'
|
import AppMain from './component/AppMain.vue'
|
||||||
|
import CreateOrderSessionHost from './component/CreateOrderSessionHost.vue'
|
||||||
import AiChat from './component/AiChat/index.vue'
|
import AiChat from './component/AiChat/index.vue'
|
||||||
import { useWindowSize } from '@vueuse/core'
|
import { useWindowSize } from '@vueuse/core'
|
||||||
|
|
||||||
|
|||||||
@ -16,18 +16,14 @@
|
|||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left">
|
<div class="toolbar-left">
|
||||||
<el-button
|
<order-toolbar-button-group
|
||||||
v-for="button in toolbarButtons"
|
:buttons="toolbarButtons"
|
||||||
:key="button.key"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
:size="button.size || 'small'"
|
:resolve-loading="resolveButtonLoading"
|
||||||
:type="button.type"
|
:resolve-label="resolveButtonLabel"
|
||||||
:plain="button.plain"
|
:layout-key="toolbarLayoutKey"
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
@action="handleToolbarButtonClick"
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
/>
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -152,6 +148,7 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse } from './utils/order-index-helpers'
|
import { parseOrderListResponse } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
@ -396,6 +393,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
||||||
loadData,
|
loadData,
|
||||||
handleExport,
|
handleExport,
|
||||||
|
|||||||
@ -0,0 +1,117 @@
|
|||||||
|
<template>
|
||||||
|
<div
|
||||||
|
v-if="minimized && sessionActive"
|
||||||
|
class="create-order-float"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
@click="restoreCreateOrderDialog"
|
||||||
|
@keydown.enter="restoreCreateOrderDialog"
|
||||||
|
>
|
||||||
|
<div class="create-order-float__header">
|
||||||
|
<span class="create-order-float__title">建单</span>
|
||||||
|
<el-button
|
||||||
|
class="create-order-float__close"
|
||||||
|
link
|
||||||
|
type="info"
|
||||||
|
:icon="Close"
|
||||||
|
@click.stop="handleClose"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="create-order-float__body">
|
||||||
|
<p v-if="floatSummary.loading" class="create-order-float__status">正在创建订单…</p>
|
||||||
|
<p v-else-if="floatSummary.parsing" class="create-order-float__status">正在解析 Excel…</p>
|
||||||
|
<p v-else-if="floatSummary.rowCount > 0" class="create-order-float__status">
|
||||||
|
{{ floatSummary.rowCount }} 行明细 · {{ floatSummary.orderCount }} 个订单
|
||||||
|
</p>
|
||||||
|
<p v-else class="create-order-float__status">后台运行中,切换页面不中断,点击还原窗口</p>
|
||||||
|
</div>
|
||||||
|
<el-button type="primary" size="small" class="create-order-float__restore" @click.stop="restoreCreateOrderDialog">
|
||||||
|
还原窗口
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { Close } from '@element-plus/icons-vue'
|
||||||
|
import { ElMessageBox } from 'element-plus'
|
||||||
|
import { useCreateOrderSession } from '../composables/useCreateOrderSession'
|
||||||
|
|
||||||
|
const {
|
||||||
|
minimized,
|
||||||
|
sessionActive,
|
||||||
|
floatSummary,
|
||||||
|
restoreCreateOrderDialog,
|
||||||
|
closeCreateOrderSession
|
||||||
|
} = useCreateOrderSession()
|
||||||
|
|
||||||
|
async function handleClose() {
|
||||||
|
const hasData = floatSummary.value.rowCount > 0 || floatSummary.value.loading || floatSummary.value.parsing
|
||||||
|
if (hasData) {
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm('关闭后将清空当前建单数据,是否继续?', '关闭建单', {
|
||||||
|
type: 'warning',
|
||||||
|
confirmButtonText: '关闭并清空',
|
||||||
|
cancelButtonText: '取消'
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
closeCreateOrderSession()
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.create-order-float {
|
||||||
|
position: fixed;
|
||||||
|
right: 24px;
|
||||||
|
bottom: 24px;
|
||||||
|
z-index: 3000;
|
||||||
|
width: 220px;
|
||||||
|
padding: 12px 14px;
|
||||||
|
border-radius: 10px;
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid #d9ecff;
|
||||||
|
box-shadow: 0 8px 24px rgba(64, 158, 255, 0.18);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: 0 12px 28px rgba(64, 158, 255, 0.24);
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__title {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #303133;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__close {
|
||||||
|
padding: 0;
|
||||||
|
min-height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__body {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__status {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
color: #606266;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-float__restore {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@ -1,13 +1,22 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="visible"
|
v-model="visible"
|
||||||
title="建单"
|
|
||||||
width="92%"
|
width="92%"
|
||||||
align-center
|
align-center
|
||||||
append-to-body
|
append-to-body
|
||||||
destroy-on-close
|
:close-on-click-modal="false"
|
||||||
@closed="resetImportOrderDialog"
|
:before-close="handleBeforeClose"
|
||||||
>
|
>
|
||||||
|
<template #header>
|
||||||
|
<div class="create-order-dialog-header">
|
||||||
|
<span class="create-order-dialog-title">建单</span>
|
||||||
|
<div class="create-order-dialog-actions">
|
||||||
|
<el-button link type="primary" @click="handleMinimize">
|
||||||
|
收起后台
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
<!-- <el-alert
|
<!-- <el-alert
|
||||||
type="info"
|
type="info"
|
||||||
:closable="false"
|
:closable="false"
|
||||||
@ -108,6 +117,30 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
<template #column-shop_nick="{ row }">
|
||||||
|
<div :class="{ 'cell-required-empty': isRequiredFieldEmpty(row, 'shop_nick') }">
|
||||||
|
<el-input
|
||||||
|
v-model="row.shop_nick"
|
||||||
|
size="small"
|
||||||
|
clearable
|
||||||
|
maxlength="200"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="必填"
|
||||||
|
:disabled="isPreviewRowLocked(row)"
|
||||||
|
@change="markPreviewRowDirty(row)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template #column-remark="{ row }">
|
||||||
|
<el-input
|
||||||
|
v-model="row.remark"
|
||||||
|
size="small"
|
||||||
|
clearable
|
||||||
|
placeholder="选填"
|
||||||
|
:disabled="isPreviewRowLocked(row)"
|
||||||
|
@change="markPreviewRowDirty(row)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
<template #column-name="{ row }">
|
<template #column-name="{ row }">
|
||||||
<div :class="{ 'cell-required-empty': isRequiredFieldEmpty(row, 'name') }">
|
<div :class="{ 'cell-required-empty': isRequiredFieldEmpty(row, 'name') }">
|
||||||
<el-input
|
<el-input
|
||||||
@ -345,14 +378,17 @@
|
|||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="visible = false">关闭</el-button>
|
<el-button @click="handleMinimize">收起后台</el-button>
|
||||||
|
<el-button @click="handleCloseSession">关闭并清空</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, nextTick, ref, watch } from 'vue'
|
import { computed, nextTick, ref, watch } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
|
import type { DialogBeforeCloseFn } from 'element-plus'
|
||||||
|
import { useCreateOrderSession } from '../composables/useCreateOrderSession'
|
||||||
import * as XLSX from 'xlsx'
|
import * as XLSX from 'xlsx'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
import SelectProductDialog from './SelectProductDialog.vue'
|
import SelectProductDialog from './SelectProductDialog.vue'
|
||||||
@ -384,6 +420,14 @@ const emit = defineEmits<{
|
|||||||
success: []
|
success: []
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
const {
|
||||||
|
resetToken,
|
||||||
|
minimizeCreateOrderDialog,
|
||||||
|
closeCreateOrderSession,
|
||||||
|
updateFloatSummary,
|
||||||
|
notifyCreateOrderSuccess
|
||||||
|
} = useCreateOrderSession()
|
||||||
|
|
||||||
type ImportOrderResult = {
|
type ImportOrderResult = {
|
||||||
total: number
|
total: number
|
||||||
success_count: number
|
success_count: number
|
||||||
@ -420,6 +464,8 @@ type ImportPreviewRow = {
|
|||||||
area_code: string
|
area_code: string
|
||||||
selected_items: PreviewSelectedItem[]
|
selected_items: PreviewSelectedItem[]
|
||||||
plan_qty: string
|
plan_qty: string
|
||||||
|
shop_nick: string
|
||||||
|
remark: string
|
||||||
logistics_code: string
|
logistics_code: string
|
||||||
sys_platform_code: string
|
sys_platform_code: string
|
||||||
import_status: string
|
import_status: string
|
||||||
@ -431,6 +477,8 @@ const importPreviewColumns = [
|
|||||||
{ prop: '_issue', label: '异常', width: '60', fixed: 'left' },
|
{ prop: '_issue', label: '异常', width: '60', fixed: 'left' },
|
||||||
{ prop: 'delivery_order_code', label: '订单号', minWidth: '140', fixed: 'left' },
|
{ prop: 'delivery_order_code', label: '订单号', minWidth: '140', fixed: 'left' },
|
||||||
{ prop: 'store_id', label: '货主', minWidth: '160' },
|
{ prop: 'store_id', label: '货主', minWidth: '160' },
|
||||||
|
{ prop: 'shop_nick', label: '自定义店铺*', minWidth: '140' },
|
||||||
|
{ prop: 'remark', label: '留言', minWidth: '140' },
|
||||||
{ prop: 'name', label: '收件人', minWidth: '100' },
|
{ prop: 'name', label: '收件人', minWidth: '100' },
|
||||||
{ prop: 'mobile', label: '手机号', minWidth: '120' },
|
{ prop: 'mobile', label: '手机号', minWidth: '120' },
|
||||||
{ prop: 'tel', label: '电话', minWidth: '120' },
|
{ prop: 'tel', label: '电话', minWidth: '120' },
|
||||||
@ -495,6 +543,23 @@ watch(visible, (opened) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
[importPreviewRows, importPreviewOrderCount, importOrderLoading, parseImportFileLoading],
|
||||||
|
() => {
|
||||||
|
updateFloatSummary({
|
||||||
|
rowCount: importPreviewRows.value.length,
|
||||||
|
orderCount: importPreviewOrderCount.value,
|
||||||
|
loading: importOrderLoading.value,
|
||||||
|
parsing: parseImportFileLoading.value
|
||||||
|
})
|
||||||
|
},
|
||||||
|
{ deep: true, immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(resetToken, () => {
|
||||||
|
resetImportOrderDialog()
|
||||||
|
})
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
importPreviewRows,
|
importPreviewRows,
|
||||||
() => {
|
() => {
|
||||||
@ -503,6 +568,37 @@ watch(
|
|||||||
{ deep: true }
|
{ deep: true }
|
||||||
)
|
)
|
||||||
|
|
||||||
|
function handleMinimize() {
|
||||||
|
minimizeCreateOrderDialog()
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmDiscardSession() {
|
||||||
|
const hasData =
|
||||||
|
importPreviewRows.value.length > 0 || importOrderLoading.value || parseImportFileLoading.value
|
||||||
|
if (!hasData) return true
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm('关闭后将清空当前建单数据,是否继续?', '关闭建单', {
|
||||||
|
type: 'warning',
|
||||||
|
confirmButtonText: '关闭并清空',
|
||||||
|
cancelButtonText: '取消'
|
||||||
|
})
|
||||||
|
return true
|
||||||
|
} catch {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleCloseSession() {
|
||||||
|
const confirmed = await confirmDiscardSession()
|
||||||
|
if (!confirmed) return
|
||||||
|
closeCreateOrderSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleBeforeClose: DialogBeforeCloseFn = (done) => {
|
||||||
|
handleMinimize()
|
||||||
|
done()
|
||||||
|
}
|
||||||
|
|
||||||
function createPreviewRowKey() {
|
function createPreviewRowKey() {
|
||||||
previewRowKeySeed += 1
|
previewRowKeySeed += 1
|
||||||
return `import-row-${previewRowKeySeed}`
|
return `import-row-${previewRowKeySeed}`
|
||||||
@ -514,6 +610,8 @@ function createEmptyPreviewRowForm(): ImportPreviewRow {
|
|||||||
row_no: 0,
|
row_no: 0,
|
||||||
delivery_order_code: '',
|
delivery_order_code: '',
|
||||||
store_id: defaultStoreId.value,
|
store_id: defaultStoreId.value,
|
||||||
|
shop_nick: '',
|
||||||
|
remark: '',
|
||||||
name: '',
|
name: '',
|
||||||
mobile: '',
|
mobile: '',
|
||||||
tel: '',
|
tel: '',
|
||||||
@ -662,6 +760,7 @@ function getRowIssues(row: ImportPreviewRow): string[] {
|
|||||||
const issues: string[] = []
|
const issues: string[] = []
|
||||||
if (row._orderExists) issues.push('订单号已存在')
|
if (row._orderExists) issues.push('订单号已存在')
|
||||||
if (isRequiredFieldEmpty(row, 'store_id')) issues.push('货主未选择')
|
if (isRequiredFieldEmpty(row, 'store_id')) issues.push('货主未选择')
|
||||||
|
if (isRequiredFieldEmpty(row, 'shop_nick')) issues.push('自定义店铺未填写')
|
||||||
if (isRequiredFieldEmpty(row, 'name')) issues.push('收件人未填写')
|
if (isRequiredFieldEmpty(row, 'name')) issues.push('收件人未填写')
|
||||||
if (isRequiredFieldEmpty(row, 'mobile') && isRequiredFieldEmpty(row, 'tel')) issues.push('手机号/电话未填写')
|
if (isRequiredFieldEmpty(row, 'mobile') && isRequiredFieldEmpty(row, 'tel')) issues.push('手机号/电话未填写')
|
||||||
if (isRequiredFieldEmpty(row, 'province')) issues.push('省份未选择')
|
if (isRequiredFieldEmpty(row, 'province')) issues.push('省份未选择')
|
||||||
@ -676,6 +775,7 @@ function isRequiredFieldEmpty(row: ImportPreviewRow, field: string): boolean {
|
|||||||
if (isPreviewRowLocked(row)) return false
|
if (isPreviewRowLocked(row)) return false
|
||||||
switch (field) {
|
switch (field) {
|
||||||
case 'store_id': return !row.store_id || !Number.isFinite(Number(row.store_id)) || Number(row.store_id) <= 0
|
case 'store_id': return !row.store_id || !Number.isFinite(Number(row.store_id)) || Number(row.store_id) <= 0
|
||||||
|
case 'shop_nick': return !String(row.shop_nick || '').trim()
|
||||||
case 'name': return !String(row.name || '').trim()
|
case 'name': return !String(row.name || '').trim()
|
||||||
case 'mobile': return !String(row.mobile || '').trim()
|
case 'mobile': return !String(row.mobile || '').trim()
|
||||||
case 'tel': return !String(row.tel || '').trim()
|
case 'tel': return !String(row.tel || '').trim()
|
||||||
@ -764,6 +864,8 @@ function mergeDuplicateOrderRows(rows: ImportPreviewRow[]): ImportPreviewRow[] {
|
|||||||
if (!existing.province_code && row.province_code) existing.province_code = row.province_code
|
if (!existing.province_code && row.province_code) existing.province_code = row.province_code
|
||||||
if (!existing.city_code && row.city_code) existing.city_code = row.city_code
|
if (!existing.city_code && row.city_code) existing.city_code = row.city_code
|
||||||
if (!existing.area_code && row.area_code) existing.area_code = row.area_code
|
if (!existing.area_code && row.area_code) existing.area_code = row.area_code
|
||||||
|
if (!existing.shop_nick && row.shop_nick) existing.shop_nick = row.shop_nick
|
||||||
|
if (!existing.remark && row.remark) existing.remark = row.remark
|
||||||
if (!existing.logistics_code && row.logistics_code) existing.logistics_code = row.logistics_code
|
if (!existing.logistics_code && row.logistics_code) existing.logistics_code = row.logistics_code
|
||||||
if (!existing.sys_platform_code && row.sys_platform_code) existing.sys_platform_code = row.sys_platform_code
|
if (!existing.sys_platform_code && row.sys_platform_code) existing.sys_platform_code = row.sys_platform_code
|
||||||
}
|
}
|
||||||
@ -873,6 +975,8 @@ function getNextPreviewRowTemplate(copyFrom?: ImportPreviewRow): ImportPreviewRo
|
|||||||
...base,
|
...base,
|
||||||
delivery_order_code: lastRow.delivery_order_code,
|
delivery_order_code: lastRow.delivery_order_code,
|
||||||
store_id: lastRow.store_id ?? defaultStoreId.value,
|
store_id: lastRow.store_id ?? defaultStoreId.value,
|
||||||
|
shop_nick: lastRow.shop_nick,
|
||||||
|
remark: lastRow.remark,
|
||||||
logistics_code: lastRow.logistics_code,
|
logistics_code: lastRow.logistics_code,
|
||||||
sys_platform_code: lastRow.sys_platform_code,
|
sys_platform_code: lastRow.sys_platform_code,
|
||||||
selected_items: [],
|
selected_items: [],
|
||||||
@ -999,6 +1103,17 @@ function buildPreviewRow(row: Record<string, any>, rowNo: number): ImportPreview
|
|||||||
row_no: rowNo,
|
row_no: rowNo,
|
||||||
delivery_order_code: deliveryOrderCode,
|
delivery_order_code: deliveryOrderCode,
|
||||||
store_id: storeId,
|
store_id: storeId,
|
||||||
|
shop_nick: toImportString(pickImportValue(row, [
|
||||||
|
'*自定义店铺',
|
||||||
|
'自定义店铺*',
|
||||||
|
'自定义店铺',
|
||||||
|
'店铺名称',
|
||||||
|
'*店铺名称',
|
||||||
|
'店铺名称*',
|
||||||
|
'shop_nick',
|
||||||
|
'店铺'
|
||||||
|
])),
|
||||||
|
remark: toImportString(pickImportValue(row, ['留言', '*留言', '留言*', 'remark', '备注', '订单备注'])),
|
||||||
name,
|
name,
|
||||||
mobile: toImportString(pickImportValue(row, ['手机号', '手机', '手机号码', '*手机号', '*手机号(mobile/tel至少填一项)', '联系电话', '联系方式', 'mobile'])),
|
mobile: toImportString(pickImportValue(row, ['手机号', '手机', '手机号码', '*手机号', '*手机号(mobile/tel至少填一项)', '联系电话', '联系方式', 'mobile'])),
|
||||||
tel: toImportString(pickImportValue(row, ['电话', 'tel'])),
|
tel: toImportString(pickImportValue(row, ['电话', 'tel'])),
|
||||||
@ -1197,6 +1312,8 @@ function buildCreateOrderPayload(rows: ImportPreviewRow[]): PendingOrderCreateOr
|
|||||||
area: String(header.area || '').trim(),
|
area: String(header.area || '').trim(),
|
||||||
items,
|
items,
|
||||||
delivery_order_code: String(header.delivery_order_code || '').trim() || undefined,
|
delivery_order_code: String(header.delivery_order_code || '').trim() || undefined,
|
||||||
|
shop_nick: String(header.shop_nick || '').trim(),
|
||||||
|
remark: String(header.remark || '').trim() || undefined,
|
||||||
logistics_code: String(header.logistics_code || '').trim() || undefined,
|
logistics_code: String(header.logistics_code || '').trim() || undefined,
|
||||||
sys_platform_code: String(header.sys_platform_code || '').trim() || undefined
|
sys_platform_code: String(header.sys_platform_code || '').trim() || undefined
|
||||||
}
|
}
|
||||||
@ -1235,6 +1352,14 @@ function validatePreviewRowsBeforeSubmit(options?: { requireItemId?: boolean })
|
|||||||
ElMessage.warning(`订单「${orderLabel}」:货主无效,请重新选择`)
|
ElMessage.warning(`订单「${orderLabel}」:货主无效,请重新选择`)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if (!String(header.shop_nick || '').trim()) {
|
||||||
|
ElMessage.warning(`订单「${orderLabel}」:请填写自定义店铺`)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if (String(header.shop_nick || '').trim().length > 200) {
|
||||||
|
ElMessage.warning(`订单「${orderLabel}」:自定义店铺最多 200 个字符`)
|
||||||
|
return false
|
||||||
|
}
|
||||||
if (!String(header.name || '').trim()) {
|
if (!String(header.name || '').trim()) {
|
||||||
ElMessage.warning(`订单「${orderLabel}」:请填写收件人`)
|
ElMessage.warning(`订单「${orderLabel}」:请填写收件人`)
|
||||||
return false
|
return false
|
||||||
@ -1463,6 +1588,7 @@ async function submitImportOrders() {
|
|||||||
ElMessage.success(`批量创建完成:成功 ${result.success_count} 个,失败 ${result.fail_count} 个`)
|
ElMessage.success(`批量创建完成:成功 ${result.success_count} 个,失败 ${result.fail_count} 个`)
|
||||||
if (result.success_count > 0) {
|
if (result.success_count > 0) {
|
||||||
emit('success')
|
emit('success')
|
||||||
|
void notifyCreateOrderSuccess()
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
importOrderLoading.value = false
|
importOrderLoading.value = false
|
||||||
@ -1580,6 +1706,25 @@ function getStockItemCode(row: any) {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.create-order-dialog-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding-right: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-dialog-title {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #303133;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-order-dialog-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.import-order-tip {
|
.import-order-tip {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,203 @@
|
|||||||
|
<template>
|
||||||
|
<div ref="containerRef" class="order-toolbar-button-group">
|
||||||
|
<div ref="mainRef" class="order-toolbar-button-group__main">
|
||||||
|
<el-button
|
||||||
|
v-for="button in visibleButtons"
|
||||||
|
:key="button.key"
|
||||||
|
:size="button.size || 'small'"
|
||||||
|
:type="button.type"
|
||||||
|
:plain="button.plain"
|
||||||
|
:disabled="resolveDisabled(button.disabledKey)"
|
||||||
|
:loading="resolveLoading(button.loadingKey)"
|
||||||
|
@click="emitAction(button.action)"
|
||||||
|
>
|
||||||
|
{{ resolveLabel(button.label, button.dynamicLabelKey) }}
|
||||||
|
</el-button>
|
||||||
|
|
||||||
|
<el-popover
|
||||||
|
v-if="overflowButtons.length"
|
||||||
|
v-model:visible="expandVisible"
|
||||||
|
placement="bottom-start"
|
||||||
|
:width="172"
|
||||||
|
trigger="click"
|
||||||
|
popper-class="order-toolbar-button-group__popover"
|
||||||
|
>
|
||||||
|
<template #reference>
|
||||||
|
<el-button size="small" :type="expandVisible ? 'primary' : 'default'" plain>
|
||||||
|
展开{{ overflowButtons.length ? `(${overflowButtons.length})` : '' }}
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
<div class="order-toolbar-button-group__overflow-list">
|
||||||
|
<el-button
|
||||||
|
v-for="button in overflowButtons"
|
||||||
|
:key="`overflow-${button.key}`"
|
||||||
|
:size="button.size || 'small'"
|
||||||
|
:type="button.type"
|
||||||
|
:plain="button.plain"
|
||||||
|
:disabled="resolveDisabled(button.disabledKey)"
|
||||||
|
:loading="resolveLoading(button.loadingKey)"
|
||||||
|
class="order-toolbar-button-group__overflow-item"
|
||||||
|
@click="handleOverflowClick(button.action)"
|
||||||
|
>
|
||||||
|
{{ resolveLabel(button.label, button.dynamicLabelKey) }}
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||||
|
import type { ToolbarButtonConfig } from '../config/order-common-config'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
buttons: ToolbarButtonConfig[]
|
||||||
|
resolveDisabled: (disabledKey?: string) => boolean
|
||||||
|
resolveLoading: (loadingKey?: string) => boolean
|
||||||
|
resolveLabel: (defaultLabel: string, dynamicLabelKey?: string) => string
|
||||||
|
layoutKey?: string | number
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'action', action: ToolbarButtonConfig['action']): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const containerRef = ref<HTMLElement | null>(null)
|
||||||
|
const mainRef = ref<HTMLElement | null>(null)
|
||||||
|
const visibleButtons = ref<ToolbarButtonConfig[]>([])
|
||||||
|
const overflowButtons = ref<ToolbarButtonConfig[]>([])
|
||||||
|
const expandVisible = ref(false)
|
||||||
|
|
||||||
|
let resizeObserver: ResizeObserver | null = null
|
||||||
|
let layoutFrame = 0
|
||||||
|
|
||||||
|
function emitAction(action: ToolbarButtonConfig['action']) {
|
||||||
|
emit('action', action)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleOverflowClick(action: ToolbarButtonConfig['action']) {
|
||||||
|
expandVisible.value = false
|
||||||
|
emitAction(action)
|
||||||
|
}
|
||||||
|
|
||||||
|
function isMainOverflowing() {
|
||||||
|
const mainEl = mainRef.value
|
||||||
|
if (!mainEl) return false
|
||||||
|
return mainEl.scrollWidth > mainEl.clientWidth + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
async function trimVisibleUntilFits() {
|
||||||
|
const buttons = props.buttons
|
||||||
|
if (!buttons.length) {
|
||||||
|
visibleButtons.value = []
|
||||||
|
overflowButtons.value = []
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
visibleButtons.value = [...buttons]
|
||||||
|
overflowButtons.value = []
|
||||||
|
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
let guard = 0
|
||||||
|
while (isMainOverflowing() && visibleButtons.value.length > 0 && guard < buttons.length + 1) {
|
||||||
|
guard += 1
|
||||||
|
const removed = visibleButtons.value.pop()
|
||||||
|
if (!removed) break
|
||||||
|
overflowButtons.value.unshift(removed)
|
||||||
|
await nextTick()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!visibleButtons.value.length && overflowButtons.value.length) {
|
||||||
|
visibleButtons.value = [overflowButtons.value[0]]
|
||||||
|
overflowButtons.value = overflowButtons.value.slice(1)
|
||||||
|
await nextTick()
|
||||||
|
while (isMainOverflowing() && visibleButtons.value.length > 0 && overflowButtons.value.length > 0 && guard < buttons.length + 2) {
|
||||||
|
guard += 1
|
||||||
|
const removed = visibleButtons.value.pop()
|
||||||
|
if (!removed) break
|
||||||
|
overflowButtons.value.unshift(removed)
|
||||||
|
await nextTick()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function scheduleLayout() {
|
||||||
|
const frame = ++layoutFrame
|
||||||
|
await nextTick()
|
||||||
|
if (frame !== layoutFrame) return
|
||||||
|
await trimVisibleUntilFits()
|
||||||
|
}
|
||||||
|
|
||||||
|
function setupResizeObserver() {
|
||||||
|
resizeObserver?.disconnect()
|
||||||
|
resizeObserver = new ResizeObserver(() => {
|
||||||
|
void scheduleLayout()
|
||||||
|
})
|
||||||
|
|
||||||
|
const parent = containerRef.value?.parentElement
|
||||||
|
if (parent) resizeObserver.observe(parent)
|
||||||
|
if (containerRef.value) resizeObserver.observe(containerRef.value)
|
||||||
|
if (mainRef.value) resizeObserver.observe(mainRef.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
visibleButtons.value = [...props.buttons]
|
||||||
|
setupResizeObserver()
|
||||||
|
void scheduleLayout()
|
||||||
|
})
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
resizeObserver?.disconnect()
|
||||||
|
resizeObserver = null
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => [props.buttons, props.layoutKey],
|
||||||
|
() => {
|
||||||
|
void scheduleLayout()
|
||||||
|
},
|
||||||
|
{ deep: true }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.order-toolbar-button-group {
|
||||||
|
position: relative;
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.order-toolbar-button-group__main {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.order-toolbar-button-group__overflow-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.order-toolbar-button-group__overflow-item {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.order-toolbar-button-group__popover {
|
||||||
|
padding: 10px !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@ -0,0 +1,90 @@
|
|||||||
|
import { ref, shallowRef } from 'vue'
|
||||||
|
|
||||||
|
export type CreateOrderFloatSummary = {
|
||||||
|
rowCount: number
|
||||||
|
orderCount: number
|
||||||
|
loading: boolean
|
||||||
|
parsing: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const dialogVisible = ref(false)
|
||||||
|
const minimized = ref(false)
|
||||||
|
const sessionActive = ref(false)
|
||||||
|
const resetToken = ref(0)
|
||||||
|
const floatSummary = ref<CreateOrderFloatSummary>({
|
||||||
|
rowCount: 0,
|
||||||
|
orderCount: 0,
|
||||||
|
loading: false,
|
||||||
|
parsing: false
|
||||||
|
})
|
||||||
|
|
||||||
|
const successCallbacks = shallowRef(new Set<() => void | Promise<void>>())
|
||||||
|
|
||||||
|
export function useCreateOrderSession() {
|
||||||
|
function openCreateOrderDialog() {
|
||||||
|
sessionActive.value = true
|
||||||
|
dialogVisible.value = true
|
||||||
|
minimized.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
function minimizeCreateOrderDialog() {
|
||||||
|
dialogVisible.value = false
|
||||||
|
minimized.value = true
|
||||||
|
sessionActive.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function restoreCreateOrderDialog() {
|
||||||
|
if (!sessionActive.value) {
|
||||||
|
openCreateOrderDialog()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
dialogVisible.value = true
|
||||||
|
minimized.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeCreateOrderSession() {
|
||||||
|
dialogVisible.value = false
|
||||||
|
minimized.value = false
|
||||||
|
sessionActive.value = false
|
||||||
|
resetToken.value += 1
|
||||||
|
floatSummary.value = {
|
||||||
|
rowCount: 0,
|
||||||
|
orderCount: 0,
|
||||||
|
loading: false,
|
||||||
|
parsing: false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateFloatSummary(patch: Partial<CreateOrderFloatSummary>) {
|
||||||
|
floatSummary.value = { ...floatSummary.value, ...patch }
|
||||||
|
}
|
||||||
|
|
||||||
|
function registerCreateOrderSuccess(callback: () => void | Promise<void>) {
|
||||||
|
successCallbacks.value.add(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function unregisterCreateOrderSuccess(callback: () => void | Promise<void>) {
|
||||||
|
successCallbacks.value.delete(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function notifyCreateOrderSuccess() {
|
||||||
|
const tasks = Array.from(successCallbacks.value).map((cb) => cb())
|
||||||
|
await Promise.allSettled(tasks)
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
dialogVisible,
|
||||||
|
minimized,
|
||||||
|
sessionActive,
|
||||||
|
resetToken,
|
||||||
|
floatSummary,
|
||||||
|
openCreateOrderDialog,
|
||||||
|
minimizeCreateOrderDialog,
|
||||||
|
restoreCreateOrderDialog,
|
||||||
|
closeCreateOrderSession,
|
||||||
|
updateFloatSummary,
|
||||||
|
registerCreateOrderSuccess,
|
||||||
|
unregisterCreateOrderSuccess,
|
||||||
|
notifyCreateOrderSuccess
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -259,6 +259,7 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
|||||||
action: 'handleWaveSingleFetchByIds'
|
action: 'handleWaveSingleFetchByIds'
|
||||||
},
|
},
|
||||||
allocateExpress: { key: 'allocateExpress', label: '分配快递号', size: 'small', type: 'success', loadingKey: 'allocateLoading', disabledKey: 'hasNoSelection', action: 'openAllocateExpressDialog' },
|
allocateExpress: { key: 'allocateExpress', label: '分配快递号', size: 'small', type: 'success', loadingKey: 'allocateLoading', disabledKey: 'hasNoSelection', action: 'openAllocateExpressDialog' },
|
||||||
|
manualWaybill: { key: 'manualWaybill', label: '录入运单号', size: 'small', type: 'primary', plain: true, loadingKey: 'manualWaybillLoading', disabledKey: 'notSingleSelection', action: 'openManualWaybillDialog' },
|
||||||
updateExpress: { key: 'updateExpress', label: '修改快递', size: 'small', type: 'warning', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderExpressDialog' },
|
updateExpress: { key: 'updateExpress', label: '修改快递', size: 'small', type: 'warning', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderExpressDialog' },
|
||||||
updatePlatform: { key: 'updatePlatform', label: '修改平台', size: 'small', type: 'info', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderPlatformDialog' },
|
updatePlatform: { key: 'updatePlatform', label: '修改平台', size: 'small', type: 'info', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderPlatformDialog' },
|
||||||
updateAddress: { key: 'updateAddress', label: '修改地址', size: 'small', type: 'warning', plain: true, loadingKey: 'updateAddressLoading', disabledKey: 'hasNoSelection', action: 'openUpdateAddressDialog' },
|
updateAddress: { key: 'updateAddress', label: '修改地址', size: 'small', type: 'warning', plain: true, loadingKey: 'updateAddressLoading', disabledKey: 'hasNoSelection', action: 'openUpdateAddressDialog' },
|
||||||
@ -1273,6 +1274,7 @@ export const pendingToolbarButtonKeys = [
|
|||||||
'allocateStorage',
|
'allocateStorage',
|
||||||
'cancelAllocateStorage',
|
'cancelAllocateStorage',
|
||||||
'allocateExpress',
|
'allocateExpress',
|
||||||
|
'manualWaybill',
|
||||||
'updateExpress',
|
'updateExpress',
|
||||||
'updatePlatform',
|
'updatePlatform',
|
||||||
'updateAddress',
|
'updateAddress',
|
||||||
|
|||||||
@ -16,18 +16,14 @@
|
|||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left">
|
<div class="toolbar-left">
|
||||||
<el-button
|
<order-toolbar-button-group
|
||||||
v-for="button in toolbarButtons"
|
:buttons="toolbarButtons"
|
||||||
:key="button.key"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
:size="button.size || 'small'"
|
:resolve-loading="resolveButtonLoading"
|
||||||
:type="button.type"
|
:resolve-label="resolveButtonLabel"
|
||||||
:plain="button.plain"
|
:layout-key="toolbarLayoutKey"
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
@action="handleToolbarButtonClick"
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
/>
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -152,6 +148,7 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse } from './utils/order-index-helpers'
|
import { parseOrderListResponse } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
@ -396,6 +393,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
||||||
loadData,
|
loadData,
|
||||||
handleExport,
|
handleExport,
|
||||||
|
|||||||
@ -15,28 +15,15 @@
|
|||||||
|
|
||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left" @wheel="handleToolbarWheel">
|
<div class="toolbar-left">
|
||||||
<div
|
<order-toolbar-button-group
|
||||||
class="toolbar-scroll-container"
|
:buttons="toolbarButtons"
|
||||||
ref="scrollContainerRef"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
@mousedown="handleMouseDown"
|
:resolve-loading="resolveButtonLoading"
|
||||||
@mousemove="handleMouseMove"
|
:resolve-label="resolveButtonLabel"
|
||||||
@mouseup="handleMouseUp"
|
:layout-key="toolbarLayoutKey"
|
||||||
@mouseleave="handleMouseUp"
|
@action="handleToolbarButtonClick"
|
||||||
>
|
/>
|
||||||
<el-button
|
|
||||||
v-for="button in toolbarButtons"
|
|
||||||
:key="button.key"
|
|
||||||
:size="button.size || 'small'"
|
|
||||||
:type="button.type"
|
|
||||||
:plain="button.plain"
|
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -227,12 +214,12 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
const scanBox = ref<any>(null)
|
const scanBox = ref<any>(null)
|
||||||
const upperTable = ref<any>(null)
|
const upperTable = ref<any>(null)
|
||||||
const scrollContainerRef = ref<HTMLElement | null>(null)
|
|
||||||
const presetTree = ref<any[]>([])
|
const presetTree = ref<any[]>([])
|
||||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(deliveryAvailableFields)))
|
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(deliveryAvailableFields)))
|
||||||
const activeTab = ref('detail')
|
const activeTab = ref('detail')
|
||||||
@ -270,36 +257,6 @@ function fetchDeliveryOrderDetail(data: Record<string, any>) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const isDragging = ref(false)
|
|
||||||
const startX = ref(0)
|
|
||||||
const scrollLeft = ref(0)
|
|
||||||
|
|
||||||
const handleToolbarWheel = (e: WheelEvent) => {
|
|
||||||
if (scrollContainerRef.value) {
|
|
||||||
e.preventDefault()
|
|
||||||
scrollContainerRef.value.scrollLeft += e.deltaY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseDown = (e: MouseEvent) => {
|
|
||||||
if (!scrollContainerRef.value) return
|
|
||||||
isDragging.value = true
|
|
||||||
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
scrollLeft.value = scrollContainerRef.value.scrollLeft
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseMove = (e: MouseEvent) => {
|
|
||||||
if (!isDragging.value || !scrollContainerRef.value) return
|
|
||||||
e.preventDefault()
|
|
||||||
const x = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
const walk = (x - startX.value) * 1.5
|
|
||||||
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseUp = () => {
|
|
||||||
isDragging.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
||||||
defaultLowerPercent: 38
|
defaultLowerPercent: 38
|
||||||
})
|
})
|
||||||
@ -514,6 +471,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
||||||
loadData,
|
loadData,
|
||||||
handleExport,
|
handleExport,
|
||||||
@ -547,29 +512,6 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
|
|||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
@use "./styles/order-sub.scss";
|
@use "./styles/order-sub.scss";
|
||||||
|
|
||||||
.order-sub-container .main-content {
|
|
||||||
.toolbar {
|
|
||||||
.toolbar-left {
|
|
||||||
cursor: grab;
|
|
||||||
|
|
||||||
&:active {
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar-scroll-container {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
overflow-x: auto;
|
|
||||||
scrollbar-width: none;
|
|
||||||
&::-webkit-scrollbar {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-page {
|
.detail-page {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|||||||
@ -16,18 +16,14 @@
|
|||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left">
|
<div class="toolbar-left">
|
||||||
<el-button
|
<order-toolbar-button-group
|
||||||
v-for="button in toolbarButtons"
|
:buttons="toolbarButtons"
|
||||||
:key="button.key"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
:size="button.size || 'small'"
|
:resolve-loading="resolveButtonLoading"
|
||||||
:type="button.type"
|
:resolve-label="resolveButtonLabel"
|
||||||
:plain="button.plain"
|
:layout-key="toolbarLayoutKey"
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
@action="handleToolbarButtonClick"
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
/>
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -152,6 +148,7 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse } from './utils/order-index-helpers'
|
import { parseOrderListResponse } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
@ -396,6 +393,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
|
||||||
loadData,
|
loadData,
|
||||||
handleExport,
|
handleExport,
|
||||||
|
|||||||
@ -15,27 +15,15 @@
|
|||||||
|
|
||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left" @wheel="handleToolbarWheel">
|
<div class="toolbar-left">
|
||||||
<div
|
<order-toolbar-button-group
|
||||||
class="toolbar-scroll-container"
|
:buttons="toolbarButtons"
|
||||||
ref="scrollContainerRef"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
@mousedown="handleMouseDown"
|
:resolve-loading="resolveButtonLoading"
|
||||||
@mousemove="handleMouseMove"
|
:resolve-label="resolveButtonLabel"
|
||||||
@mouseup="handleMouseUp"
|
:layout-key="toolbarLayoutKey"
|
||||||
@mouseleave="handleMouseUp"
|
@action="handleToolbarButtonClick"
|
||||||
>
|
/>
|
||||||
<el-button
|
|
||||||
v-for="button in toolbarButtons"
|
|
||||||
:key="button.key"
|
|
||||||
:size="button.size || 'small'"
|
|
||||||
:type="button.type"
|
|
||||||
:plain="button.plain"
|
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
|
|
||||||
<template v-for="(btn, index) in expectionOrderbuttonList" :key="index">
|
<template v-for="(btn, index) in expectionOrderbuttonList" :key="index">
|
||||||
<el-dropdown
|
<el-dropdown
|
||||||
@ -70,7 +58,6 @@
|
|||||||
{{ btn.label }}
|
{{ btn.label }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -300,6 +287,15 @@
|
|||||||
@closed="resetCloneOrderDialog"
|
@closed="resetCloneOrderDialog"
|
||||||
@submit="submitCloneOrder"
|
@submit="submitCloneOrder"
|
||||||
/>
|
/>
|
||||||
|
<manual-waybill-form
|
||||||
|
v-model="manualWaybillDialogVisible"
|
||||||
|
v-model:waybill-code="manualWaybillForm.waybill_code"
|
||||||
|
:loading="manualWaybillLoading"
|
||||||
|
:order-id="manualWaybillOrderId"
|
||||||
|
:order-code="manualWaybillOrderCode"
|
||||||
|
@closed="resetManualWaybillDialog"
|
||||||
|
@submit="submitManualWaybill"
|
||||||
|
/>
|
||||||
<update-address-form
|
<update-address-form
|
||||||
v-model="updateAddressDialogVisible"
|
v-model="updateAddressDialogVisible"
|
||||||
v-model:form="updateAddressForm"
|
v-model:form="updateAddressForm"
|
||||||
@ -362,7 +358,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<create-pending-order-dialog v-model="createOrderDialogVisible" @success="loadData" />
|
|
||||||
<qrcode-dialog v-model:visible="qrDialogVisible" :code="currentWaybillCode" />
|
<qrcode-dialog v-model:visible="qrDialogVisible" :code="currentWaybillCode" />
|
||||||
|
|
||||||
<wave-platform-print-preview-dialog
|
<wave-platform-print-preview-dialog
|
||||||
@ -389,7 +384,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, onMounted, computed } from 'vue'
|
import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
import { ArrowDown } from '@element-plus/icons-vue'
|
import { ArrowDown } from '@element-plus/icons-vue'
|
||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
@ -415,17 +410,19 @@ import {
|
|||||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||||
import log from './component/log.vue'
|
import log from './component/log.vue'
|
||||||
import CreatePendingOrderDialog from './component/CreatePendingOrderDialog.vue'
|
import { useCreateOrderSession } from './composables/useCreateOrderSession'
|
||||||
import AllocateExpressForm from './form/AllocateExpressForm.vue'
|
import AllocateExpressForm from './form/AllocateExpressForm.vue'
|
||||||
import StorageAllocateForm from './form/StorageAllocateForm.vue'
|
import StorageAllocateForm from './form/StorageAllocateForm.vue'
|
||||||
import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
|
import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
|
||||||
import CloneOrderForm from './form/CloneOrderForm.vue'
|
import CloneOrderForm from './form/CloneOrderForm.vue'
|
||||||
|
import ManualWaybillForm from './form/ManualWaybillForm.vue'
|
||||||
import UpdateAddressForm from './form/UpdateAddressForm.vue'
|
import UpdateAddressForm from './form/UpdateAddressForm.vue'
|
||||||
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
|
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
|
||||||
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
|
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
|
||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse } from './utils/order-index-helpers'
|
import { parseOrderListResponse } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createPendingToolbarController } from './utils/toolbar-actions'
|
import { createPendingToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
import QrcodeDialog from '@/components/QR/qrcode.vue'
|
import QrcodeDialog from '@/components/QR/qrcode.vue'
|
||||||
@ -449,7 +446,8 @@ const loading = ref(false)
|
|||||||
const queryTime = ref(0)
|
const queryTime = ref(0)
|
||||||
|
|
||||||
const actionLoading = ref(false)
|
const actionLoading = ref(false)
|
||||||
const createOrderDialogVisible = ref(false)
|
const { openCreateOrderDialog, registerCreateOrderSuccess, unregisterCreateOrderSuccess } =
|
||||||
|
useCreateOrderSession()
|
||||||
const resolveExceptionDialogVisible = ref(false)
|
const resolveExceptionDialogVisible = ref(false)
|
||||||
const resolveExceptionLoading = ref(false)
|
const resolveExceptionLoading = ref(false)
|
||||||
const resolveExceptionOrderIds = ref<number[]>([])
|
const resolveExceptionOrderIds = ref<number[]>([])
|
||||||
@ -496,37 +494,6 @@ const toolbarButtons = exceptionToolbarButtons
|
|||||||
const qrDialogVisible = ref(false)
|
const qrDialogVisible = ref(false)
|
||||||
const currentWaybillCode = ref('')
|
const currentWaybillCode = ref('')
|
||||||
|
|
||||||
const scrollContainerRef = ref<HTMLElement | null>(null)
|
|
||||||
const isDragging = ref(false)
|
|
||||||
const startX = ref(0)
|
|
||||||
const scrollLeftStart = ref(0)
|
|
||||||
|
|
||||||
const handleToolbarWheel = (e: WheelEvent) => {
|
|
||||||
if (scrollContainerRef.value) {
|
|
||||||
e.preventDefault()
|
|
||||||
scrollContainerRef.value.scrollLeft += e.deltaY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseDown = (e: MouseEvent) => {
|
|
||||||
if (!scrollContainerRef.value) return
|
|
||||||
isDragging.value = true
|
|
||||||
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
scrollLeftStart.value = scrollContainerRef.value.scrollLeft
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseMove = (e: MouseEvent) => {
|
|
||||||
if (!isDragging.value || !scrollContainerRef.value) return
|
|
||||||
e.preventDefault()
|
|
||||||
const x = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
const walk = (x - startX.value) * 1.5
|
|
||||||
scrollContainerRef.value.scrollLeft = scrollLeftStart.value - walk
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseUp = () => {
|
|
||||||
isDragging.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
const selectedRow = computed(() => {
|
const selectedRow = computed(() => {
|
||||||
return list.value.find((i: any) => i.id === selectedOrderId.value) || null
|
return list.value.find((i: any) => i.id === selectedOrderId.value) || null
|
||||||
})
|
})
|
||||||
@ -655,11 +622,16 @@ function getSelectedIds(): number[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
registerCreateOrderSuccess(loadData)
|
||||||
loadData()
|
loadData()
|
||||||
loadFilterData()
|
loadFilterData()
|
||||||
loadOrderMetaOptions()
|
loadOrderMetaOptions()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
unregisterCreateOrderSuccess(loadData)
|
||||||
|
})
|
||||||
|
|
||||||
async function loadData() {
|
async function loadData() {
|
||||||
if (loading.value) return
|
if (loading.value) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
@ -916,10 +888,6 @@ function openColumnConfigPanel() {
|
|||||||
upperTable.value?.openColumnConfig?.()
|
upperTable.value?.openColumnConfig?.()
|
||||||
}
|
}
|
||||||
|
|
||||||
function openCreateOrderDialog() {
|
|
||||||
createOrderDialogVisible.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
const buttonDisabledMap = computed<Record<string, boolean>>(() => ({
|
const buttonDisabledMap = computed<Record<string, boolean>>(() => ({
|
||||||
hasNoSelection: selectionRows.value.length === 0,
|
hasNoSelection: selectionRows.value.length === 0,
|
||||||
notSingleSelection: selectionRows.value.length !== 1
|
notSingleSelection: selectionRows.value.length !== 1
|
||||||
@ -956,6 +924,11 @@ const {
|
|||||||
cloneOrderLoading,
|
cloneOrderLoading,
|
||||||
cloneSourceOrderId,
|
cloneSourceOrderId,
|
||||||
cloneSourceOrderCode,
|
cloneSourceOrderCode,
|
||||||
|
manualWaybillDialogVisible,
|
||||||
|
manualWaybillLoading,
|
||||||
|
manualWaybillOrderId,
|
||||||
|
manualWaybillOrderCode,
|
||||||
|
manualWaybillForm,
|
||||||
updateAddressDialogVisible,
|
updateAddressDialogVisible,
|
||||||
updateAddressLoading,
|
updateAddressLoading,
|
||||||
updateAddressOrderIds,
|
updateAddressOrderIds,
|
||||||
@ -971,6 +944,7 @@ const {
|
|||||||
submitStorageAllocate,
|
submitStorageAllocate,
|
||||||
submitUpdateOrderMeta,
|
submitUpdateOrderMeta,
|
||||||
submitCloneOrder,
|
submitCloneOrder,
|
||||||
|
submitManualWaybill,
|
||||||
submitAllocateExpress,
|
submitAllocateExpress,
|
||||||
submitUpdateAddress,
|
submitUpdateAddress,
|
||||||
submitBatchAsyncTask,
|
submitBatchAsyncTask,
|
||||||
@ -978,6 +952,7 @@ const {
|
|||||||
resetStorageAllocateDialog,
|
resetStorageAllocateDialog,
|
||||||
resetUpdateOrderMetaDialog,
|
resetUpdateOrderMetaDialog,
|
||||||
resetCloneOrderDialog,
|
resetCloneOrderDialog,
|
||||||
|
resetManualWaybillDialog,
|
||||||
resetUpdateAddressDialog,
|
resetUpdateAddressDialog,
|
||||||
resetBatchAsyncTaskDialog
|
resetBatchAsyncTaskDialog
|
||||||
} = createPendingToolbarController({
|
} = createPendingToolbarController({
|
||||||
@ -1014,6 +989,7 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
|
|||||||
allocateLoading: allocateLoading.value,
|
allocateLoading: allocateLoading.value,
|
||||||
updateOrderMetaLoading: updateOrderMetaLoading.value,
|
updateOrderMetaLoading: updateOrderMetaLoading.value,
|
||||||
cloneOrderLoading: cloneOrderLoading.value,
|
cloneOrderLoading: cloneOrderLoading.value,
|
||||||
|
manualWaybillLoading: manualWaybillLoading.value,
|
||||||
updateAddressLoading: updateAddressLoading.value,
|
updateAddressLoading: updateAddressLoading.value,
|
||||||
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
|
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
|
||||||
resolveExceptionLoading: resolveExceptionLoading.value,
|
resolveExceptionLoading: resolveExceptionLoading.value,
|
||||||
@ -1021,6 +997,14 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
|
|||||||
batchPrintLoading: batchPrintLoading.value
|
batchPrintLoading: batchPrintLoading.value
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
function resolveButtonLoading(loadingKey?: string) {
|
function resolveButtonLoading(loadingKey?: string) {
|
||||||
if (!loadingKey) return false
|
if (!loadingKey) return false
|
||||||
return Boolean(buttonLoadingMap.value[loadingKey])
|
return Boolean(buttonLoadingMap.value[loadingKey])
|
||||||
@ -1194,29 +1178,6 @@ function openWaybillQr(code: string) {
|
|||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
|
|
||||||
.order-sub-container .main-content {
|
|
||||||
.toolbar {
|
|
||||||
.toolbar-left {
|
|
||||||
cursor: grab;
|
|
||||||
|
|
||||||
&:active {
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar-scroll-container {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
overflow-x: auto;
|
|
||||||
scrollbar-width: none;
|
|
||||||
&::-webkit-scrollbar {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.waybill-link {
|
.waybill-link {
|
||||||
color: var(--el-color-primary);
|
color: var(--el-color-primary);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|||||||
130
src/views/order/orderManagement/form/ManualWaybillForm.vue
Normal file
130
src/views/order/orderManagement/form/ManualWaybillForm.vue
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
v-model="visible"
|
||||||
|
title="手工录入运单号"
|
||||||
|
width="520px"
|
||||||
|
align-center
|
||||||
|
destroy-on-close
|
||||||
|
@closed="handleClosed"
|
||||||
|
>
|
||||||
|
<el-alert
|
||||||
|
type="info"
|
||||||
|
:closable="false"
|
||||||
|
show-icon
|
||||||
|
title="为指定待处理订单创建运单记录(wms_order_express),仅允许步骤为 1~3 且出库状态非待出库的订单。"
|
||||||
|
class="manual-waybill-alert"
|
||||||
|
/>
|
||||||
|
<el-form
|
||||||
|
ref="formRef"
|
||||||
|
:model="formModel"
|
||||||
|
:rules="rules"
|
||||||
|
label-width="100px"
|
||||||
|
class="manual-waybill-form"
|
||||||
|
@submit.prevent
|
||||||
|
>
|
||||||
|
<el-form-item label="订单 ID">
|
||||||
|
<span class="readonly-value">{{ orderId ?? '-' }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="订单号">
|
||||||
|
<span class="readonly-value">{{ orderCode || '-' }}</span>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="运单号" prop="waybill_code">
|
||||||
|
<el-input
|
||||||
|
v-model="formModel.waybill_code"
|
||||||
|
placeholder="请输入运单号"
|
||||||
|
clearable
|
||||||
|
maxlength="64"
|
||||||
|
show-word-limit
|
||||||
|
@keyup.enter="handleSubmit"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="visible = false">取消</el-button>
|
||||||
|
<el-button type="primary" :loading="loading" @click="handleSubmit">确认录入</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { reactive, ref, watch } from 'vue'
|
||||||
|
import type { FormInstance, FormRules } from 'element-plus'
|
||||||
|
|
||||||
|
const visible = defineModel<boolean>({ default: false })
|
||||||
|
const waybillCode = defineModel<string>('waybillCode', { default: '' })
|
||||||
|
|
||||||
|
defineProps<{
|
||||||
|
loading: boolean
|
||||||
|
orderId: number | null
|
||||||
|
orderCode: string
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'submit'): void
|
||||||
|
(e: 'closed'): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const formRef = ref<FormInstance>()
|
||||||
|
|
||||||
|
const formModel = reactive({
|
||||||
|
waybill_code: ''
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => waybillCode.value,
|
||||||
|
(value) => {
|
||||||
|
formModel.waybill_code = value
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => formModel.waybill_code,
|
||||||
|
(value) => {
|
||||||
|
if (waybillCode.value !== value) {
|
||||||
|
waybillCode.value = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const rules: FormRules = {
|
||||||
|
waybill_code: [
|
||||||
|
{ required: true, message: '请输入运单号', trigger: 'blur' },
|
||||||
|
{
|
||||||
|
validator: (_rule, value, callback) => {
|
||||||
|
if (!String(value ?? '').trim()) {
|
||||||
|
callback(new Error('运单号不能为空'))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
callback()
|
||||||
|
},
|
||||||
|
trigger: 'blur'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleSubmit() {
|
||||||
|
const valid = await formRef.value?.validate().catch(() => false)
|
||||||
|
if (!valid) return
|
||||||
|
emit('submit')
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleClosed() {
|
||||||
|
formRef.value?.resetFields()
|
||||||
|
emit('closed')
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.manual-waybill-alert {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manual-waybill-form {
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.readonly-value {
|
||||||
|
color: #606266;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
show-icon
|
show-icon
|
||||||
class="update-address-alert"
|
class="update-address-alert"
|
||||||
title="修改限制"
|
title="修改限制"
|
||||||
description="仅允许修改 post_status='none'(未分配快递)的订单。至少填写一项地址字段,空白字段不会更新到订单。"
|
description="地址字段仅允许修改 post_status='none'(未分配快递)的订单;留言不受此限制。至少填写一项地址字段或留言,空白字段不会更新到订单。"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<el-form label-width="96px" class="update-address-form">
|
<el-form label-width="96px" class="update-address-form">
|
||||||
@ -98,6 +98,18 @@
|
|||||||
placeholder="留空则不修改"
|
placeholder="留空则不修改"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="留言">
|
||||||
|
<el-input
|
||||||
|
v-model="form.remark"
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
resize="none"
|
||||||
|
clearable
|
||||||
|
maxlength="500"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="留空则不修改;填写后将批量覆盖所选订单的留言"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@ -129,6 +141,7 @@ export type UpdateAddressFormModel = {
|
|||||||
area: string
|
area: string
|
||||||
town: string
|
town: string
|
||||||
detail_address: string
|
detail_address: string
|
||||||
|
remark: string
|
||||||
province_code: string
|
province_code: string
|
||||||
city_code: string
|
city_code: string
|
||||||
area_code: string
|
area_code: string
|
||||||
@ -146,6 +159,7 @@ const form = defineModel<UpdateAddressFormModel>('form', {
|
|||||||
area: '',
|
area: '',
|
||||||
town: '',
|
town: '',
|
||||||
detail_address: '',
|
detail_address: '',
|
||||||
|
remark: '',
|
||||||
province_code: '',
|
province_code: '',
|
||||||
city_code: '',
|
city_code: '',
|
||||||
area_code: ''
|
area_code: ''
|
||||||
|
|||||||
@ -16,18 +16,14 @@
|
|||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left">
|
<div class="toolbar-left">
|
||||||
<el-button
|
<order-toolbar-button-group
|
||||||
v-for="button in toolbarButtons"
|
:buttons="toolbarButtons"
|
||||||
:key="button.key"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
:size="button.size || 'small'"
|
:resolve-loading="resolveButtonLoading"
|
||||||
:type="button.type"
|
:resolve-label="resolveButtonLabel"
|
||||||
:plain="button.plain"
|
:layout-key="toolbarLayoutKey"
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
@action="handleToolbarButtonClick"
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
/>
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
<el-input
|
<el-input
|
||||||
@ -212,6 +208,7 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse } from './utils/order-index-helpers'
|
import { parseOrderListResponse } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
import { createSimpleListToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
@ -493,6 +490,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const { actionMap: baseToolbarActionMap } = createSimpleListToolbarController({
|
const { actionMap: baseToolbarActionMap } = createSimpleListToolbarController({
|
||||||
loadData,
|
loadData,
|
||||||
handleExport,
|
handleExport,
|
||||||
|
|||||||
@ -16,28 +16,15 @@
|
|||||||
|
|
||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left" ref="toolbarLeftRef" @wheel="handleToolbarWheel">
|
<div class="toolbar-left">
|
||||||
<div
|
<order-toolbar-button-group
|
||||||
class="toolbar-scroll-container"
|
:buttons="toolbarButtons"
|
||||||
ref="scrollContainerRef"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
@mousedown="handleMouseDown"
|
:resolve-loading="resolveButtonLoading"
|
||||||
@mousemove="handleMouseMove"
|
:resolve-label="resolveButtonLabel"
|
||||||
@mouseup="handleMouseUp"
|
:layout-key="toolbarLayoutKey"
|
||||||
@mouseleave="handleMouseUp"
|
@action="handleToolbarButtonClick"
|
||||||
>
|
/>
|
||||||
<el-button
|
|
||||||
v-for="button in toolbarButtons"
|
|
||||||
:key="button.key"
|
|
||||||
:size="button.size || 'small'"
|
|
||||||
:type="button.type"
|
|
||||||
:plain="button.plain"
|
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -261,6 +248,15 @@
|
|||||||
@closed="resetCloneOrderDialog"
|
@closed="resetCloneOrderDialog"
|
||||||
@submit="submitCloneOrder"
|
@submit="submitCloneOrder"
|
||||||
/>
|
/>
|
||||||
|
<manual-waybill-form
|
||||||
|
v-model="manualWaybillDialogVisible"
|
||||||
|
v-model:waybill-code="manualWaybillForm.waybill_code"
|
||||||
|
:loading="manualWaybillLoading"
|
||||||
|
:order-id="manualWaybillOrderId"
|
||||||
|
:order-code="manualWaybillOrderCode"
|
||||||
|
@closed="resetManualWaybillDialog"
|
||||||
|
@submit="submitManualWaybill"
|
||||||
|
/>
|
||||||
<sync-order-ids-form
|
<sync-order-ids-form
|
||||||
v-model="syncOrderIdsDialogVisible"
|
v-model="syncOrderIdsDialogVisible"
|
||||||
:order-count="selectionRows.length"
|
:order-count="selectionRows.length"
|
||||||
@ -300,7 +296,6 @@
|
|||||||
@submit="submitBatchAsyncTask"
|
@submit="submitBatchAsyncTask"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<create-pending-order-dialog v-model="createOrderDialogVisible" @success="loadData" />
|
|
||||||
<qrcode-dialog v-model:visible="qrDialogVisible" :code="currentWaybillCode" />
|
<qrcode-dialog v-model:visible="qrDialogVisible" :code="currentWaybillCode" />
|
||||||
|
|
||||||
<wave-platform-print-preview-dialog
|
<wave-platform-print-preview-dialog
|
||||||
@ -327,7 +322,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, onMounted, computed } from 'vue'
|
import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
|
||||||
import { useRoute } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { CopyDocument } from '@element-plus/icons-vue'
|
import { CopyDocument } from '@element-plus/icons-vue'
|
||||||
@ -352,11 +347,12 @@ import ArchiveOrderPanel from './component/ArchiveOrderPanel.vue'
|
|||||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||||
import log from './component/log.vue'
|
import log from './component/log.vue'
|
||||||
import CreatePendingOrderDialog from './component/CreatePendingOrderDialog.vue'
|
import { useCreateOrderSession } from './composables/useCreateOrderSession'
|
||||||
import AllocateExpressForm from './form/AllocateExpressForm.vue'
|
import AllocateExpressForm from './form/AllocateExpressForm.vue'
|
||||||
import StorageAllocateForm from './form/StorageAllocateForm.vue'
|
import StorageAllocateForm from './form/StorageAllocateForm.vue'
|
||||||
import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
|
import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
|
||||||
import CloneOrderForm from './form/CloneOrderForm.vue'
|
import CloneOrderForm from './form/CloneOrderForm.vue'
|
||||||
|
import ManualWaybillForm from './form/ManualWaybillForm.vue'
|
||||||
import SyncOrderIdsForm from './form/SyncOrderIdsForm.vue'
|
import SyncOrderIdsForm from './form/SyncOrderIdsForm.vue'
|
||||||
import UpdateAddressForm from './form/UpdateAddressForm.vue'
|
import UpdateAddressForm from './form/UpdateAddressForm.vue'
|
||||||
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
|
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
|
||||||
@ -365,6 +361,7 @@ import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue
|
|||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createPendingToolbarController } from './utils/toolbar-actions'
|
import { createPendingToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
import QrcodeDialog from '@/components/QR/qrcode.vue'
|
import QrcodeDialog from '@/components/QR/qrcode.vue'
|
||||||
@ -376,7 +373,6 @@ import { useUserStore } from '@/stores/modules/user'
|
|||||||
|
|
||||||
const scanBox = ref<any>(null)
|
const scanBox = ref<any>(null)
|
||||||
const upperTable = ref<any>(null)
|
const upperTable = ref<any>(null)
|
||||||
const scrollContainerRef = ref<HTMLElement | null>(null)
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
|
|
||||||
@ -463,40 +459,10 @@ const initialConditions = computed(() => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Toolbar 滚动与拖拽逻辑
|
|
||||||
const isDragging = ref(false)
|
|
||||||
const startX = ref(0)
|
|
||||||
const scrollLeft = ref(0)
|
|
||||||
|
|
||||||
const handleToolbarWheel = (e: WheelEvent) => {
|
|
||||||
if (scrollContainerRef.value) {
|
|
||||||
e.preventDefault()
|
|
||||||
scrollContainerRef.value.scrollLeft += e.deltaY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseDown = (e: MouseEvent) => {
|
|
||||||
if (!scrollContainerRef.value) return
|
|
||||||
isDragging.value = true
|
|
||||||
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
scrollLeft.value = scrollContainerRef.value.scrollLeft
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseMove = (e: MouseEvent) => {
|
|
||||||
if (!isDragging.value || !scrollContainerRef.value) return
|
|
||||||
e.preventDefault()
|
|
||||||
const x = e.pageX - scrollContainerRef.value.offsetLeft
|
|
||||||
const walk = (x - startX.value) * 1.5 // 滚动速度
|
|
||||||
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleMouseUp = () => {
|
|
||||||
isDragging.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
const expressCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
const expressCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
||||||
const platformCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
const platformCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
||||||
const createOrderDialogVisible = ref(false)
|
const { openCreateOrderDialog, registerCreateOrderSuccess, unregisterCreateOrderSuccess } =
|
||||||
|
useCreateOrderSession()
|
||||||
|
|
||||||
const selectedRow = computed(() => {
|
const selectedRow = computed(() => {
|
||||||
return list.value.find((i: any) => i.id === selectedOrderId.value) || null
|
return list.value.find((i: any) => i.id === selectedOrderId.value) || null
|
||||||
@ -519,11 +485,16 @@ function normalizePositiveIntId(raw: unknown): number | null {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
registerCreateOrderSuccess(loadData)
|
||||||
loadData()
|
loadData()
|
||||||
loadOrderMetaOptions()
|
loadOrderMetaOptions()
|
||||||
loadStoreOptions()
|
loadStoreOptions()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
unregisterCreateOrderSuccess(loadData)
|
||||||
|
})
|
||||||
|
|
||||||
async function loadData() {
|
async function loadData() {
|
||||||
if (loading.value) return
|
if (loading.value) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
@ -673,10 +644,6 @@ function openColumnConfigPanel() {
|
|||||||
upperTable.value?.openColumnConfig?.()
|
upperTable.value?.openColumnConfig?.()
|
||||||
}
|
}
|
||||||
|
|
||||||
function openCreateOrderDialog() {
|
|
||||||
createOrderDialogVisible.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleDetailVisible() {
|
function toggleDetailVisible() {
|
||||||
detailVisible.value = !detailVisible.value
|
detailVisible.value = !detailVisible.value
|
||||||
}
|
}
|
||||||
@ -717,6 +684,11 @@ const {
|
|||||||
cloneOrderLoading,
|
cloneOrderLoading,
|
||||||
cloneSourceOrderId,
|
cloneSourceOrderId,
|
||||||
cloneSourceOrderCode,
|
cloneSourceOrderCode,
|
||||||
|
manualWaybillDialogVisible,
|
||||||
|
manualWaybillLoading,
|
||||||
|
manualWaybillOrderId,
|
||||||
|
manualWaybillOrderCode,
|
||||||
|
manualWaybillForm,
|
||||||
syncOrderIdsDialogVisible,
|
syncOrderIdsDialogVisible,
|
||||||
syncOrderIdsLoading,
|
syncOrderIdsLoading,
|
||||||
updateAddressDialogVisible,
|
updateAddressDialogVisible,
|
||||||
@ -734,6 +706,7 @@ const {
|
|||||||
submitStorageAllocate,
|
submitStorageAllocate,
|
||||||
submitUpdateOrderMeta,
|
submitUpdateOrderMeta,
|
||||||
submitCloneOrder,
|
submitCloneOrder,
|
||||||
|
submitManualWaybill,
|
||||||
submitSyncOrderIds,
|
submitSyncOrderIds,
|
||||||
submitAllocateExpress,
|
submitAllocateExpress,
|
||||||
submitUpdateAddress,
|
submitUpdateAddress,
|
||||||
@ -742,6 +715,7 @@ const {
|
|||||||
resetStorageAllocateDialog,
|
resetStorageAllocateDialog,
|
||||||
resetUpdateOrderMetaDialog,
|
resetUpdateOrderMetaDialog,
|
||||||
resetCloneOrderDialog,
|
resetCloneOrderDialog,
|
||||||
|
resetManualWaybillDialog,
|
||||||
resetSyncOrderIdsDialog,
|
resetSyncOrderIdsDialog,
|
||||||
resetUpdateAddressDialog,
|
resetUpdateAddressDialog,
|
||||||
resetBatchAsyncTaskDialog
|
resetBatchAsyncTaskDialog
|
||||||
@ -846,6 +820,7 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
|
|||||||
allocateLoading: allocateLoading.value,
|
allocateLoading: allocateLoading.value,
|
||||||
updateOrderMetaLoading: updateOrderMetaLoading.value,
|
updateOrderMetaLoading: updateOrderMetaLoading.value,
|
||||||
cloneOrderLoading: cloneOrderLoading.value,
|
cloneOrderLoading: cloneOrderLoading.value,
|
||||||
|
manualWaybillLoading: manualWaybillLoading.value,
|
||||||
syncOrderIdsLoading: syncOrderIdsLoading.value,
|
syncOrderIdsLoading: syncOrderIdsLoading.value,
|
||||||
updateAddressLoading: updateAddressLoading.value,
|
updateAddressLoading: updateAddressLoading.value,
|
||||||
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
|
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
|
||||||
@ -853,6 +828,14 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
|
|||||||
batchPrintLoading: batchPrintLoading.value
|
batchPrintLoading: batchPrintLoading.value
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
function resolveButtonLoading(loadingKey?: string) {
|
function resolveButtonLoading(loadingKey?: string) {
|
||||||
if (!loadingKey) return false
|
if (!loadingKey) return false
|
||||||
return Boolean(buttonLoadingMap.value[loadingKey])
|
return Boolean(buttonLoadingMap.value[loadingKey])
|
||||||
@ -1031,29 +1014,6 @@ function getSelectedIds(): number[] {
|
|||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
@use "./styles/order-sub.scss";
|
@use "./styles/order-sub.scss";
|
||||||
|
|
||||||
.order-sub-container .main-content {
|
|
||||||
.toolbar {
|
|
||||||
.toolbar-left {
|
|
||||||
cursor: grab;
|
|
||||||
|
|
||||||
&:active {
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar-scroll-container {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
overflow-x: auto;
|
|
||||||
scrollbar-width: none; /* Firefox */
|
|
||||||
&::-webkit-scrollbar {
|
|
||||||
display: none; /* Chrome/Safari */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-page {
|
.detail-page {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|||||||
@ -17,18 +17,14 @@
|
|||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="toolbar-left">
|
<div class="toolbar-left">
|
||||||
<el-button
|
<order-toolbar-button-group
|
||||||
v-for="button in toolbarButtons"
|
:buttons="toolbarButtons"
|
||||||
:key="button.key"
|
:resolve-disabled="resolveButtonDisabled"
|
||||||
:size="button.size || 'small'"
|
:resolve-loading="resolveButtonLoading"
|
||||||
:type="button.type"
|
:resolve-label="resolveButtonLabel"
|
||||||
:plain="button.plain"
|
:layout-key="toolbarLayoutKey"
|
||||||
:disabled="resolveButtonDisabled(button.disabledKey)"
|
@action="handleToolbarButtonClick"
|
||||||
:loading="resolveButtonLoading(button.loadingKey)"
|
/>
|
||||||
@click="handleToolbarButtonClick(button.action)"
|
|
||||||
>
|
|
||||||
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
|
|
||||||
</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
@ -144,7 +140,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<create-pending-order-dialog v-model="createOrderDialogVisible" @success="loadData" />
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<order-export-progress-dialog
|
<order-export-progress-dialog
|
||||||
@ -161,7 +156,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, onMounted, computed } from 'vue'
|
import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
import ScanBox from '@/components/ScanBox/index.vue'
|
import ScanBox from '@/components/ScanBox/index.vue'
|
||||||
import UpperTable from '@/components/UpperTable/index.vue'
|
import UpperTable from '@/components/UpperTable/index.vue'
|
||||||
@ -181,18 +176,20 @@ import {
|
|||||||
} from './config/order-common-config'
|
} from './config/order-common-config'
|
||||||
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
|
||||||
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
|
||||||
import CreatePendingOrderDialog from './component/CreatePendingOrderDialog.vue'
|
import { useCreateOrderSession } from './composables/useCreateOrderSession'
|
||||||
import log from './component/log.vue'
|
import log from './component/log.vue'
|
||||||
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
|
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
|
||||||
import { createOrderPageExport } from './utils/order-page-export'
|
import { createOrderPageExport } from './utils/order-page-export'
|
||||||
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
import { parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
|
||||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||||
|
import OrderToolbarButtonGroup from './component/OrderToolbarButtonGroup.vue'
|
||||||
import { createReviewToolbarController } from './utils/toolbar-actions'
|
import { createReviewToolbarController } from './utils/toolbar-actions'
|
||||||
import { safeInvoke } from '@/utils/safe-invoke'
|
import { safeInvoke } from '@/utils/safe-invoke'
|
||||||
|
|
||||||
const scanBox = ref<any>(null)
|
const scanBox = ref<any>(null)
|
||||||
const upperTable = ref<any>(null)
|
const upperTable = ref<any>(null)
|
||||||
const createOrderDialogVisible = ref(false)
|
const { openCreateOrderDialog, registerCreateOrderSuccess, unregisterCreateOrderSuccess } =
|
||||||
|
useCreateOrderSession()
|
||||||
const detailVisible = ref(true)
|
const detailVisible = ref(true)
|
||||||
|
|
||||||
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
||||||
@ -247,10 +244,15 @@ function fetchReviewOrderDetail(data: Record<string, any>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
registerCreateOrderSuccess(loadData)
|
||||||
loadData()
|
loadData()
|
||||||
loadOrderMetaOptions()
|
loadOrderMetaOptions()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
unregisterCreateOrderSuccess(loadData)
|
||||||
|
})
|
||||||
|
|
||||||
function normalizeOptionValue(value: unknown) {
|
function normalizeOptionValue(value: unknown) {
|
||||||
return String(value ?? '').trim()
|
return String(value ?? '').trim()
|
||||||
}
|
}
|
||||||
@ -435,10 +437,6 @@ function openColumnConfigPanel() {
|
|||||||
upperTable.value?.openColumnConfig?.()
|
upperTable.value?.openColumnConfig?.()
|
||||||
}
|
}
|
||||||
|
|
||||||
function openCreateOrderDialog() {
|
|
||||||
createOrderDialogVisible.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleDetailVisible() {
|
function toggleDetailVisible() {
|
||||||
detailVisible.value = !detailVisible.value
|
detailVisible.value = !detailVisible.value
|
||||||
}
|
}
|
||||||
@ -457,6 +455,14 @@ const buttonLabelMap = computed<Record<string, string>>(() => ({
|
|||||||
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const toolbarLayoutKey = computed(() =>
|
||||||
|
JSON.stringify({
|
||||||
|
loading: buttonLoadingMap.value,
|
||||||
|
disabled: buttonDisabledMap.value,
|
||||||
|
labels: buttonLabelMap.value
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
const {
|
const {
|
||||||
actionMap: toolbarActionMap,
|
actionMap: toolbarActionMap,
|
||||||
reviewSubmitting,
|
reviewSubmitting,
|
||||||
|
|||||||
@ -19,9 +19,12 @@
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
.toolbar-left {
|
.toolbar-left {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
|
|||||||
@ -109,6 +109,7 @@ function createEmptyUpdateAddressForm(): UpdateAddressFormModel {
|
|||||||
area: '',
|
area: '',
|
||||||
town: '',
|
town: '',
|
||||||
detail_address: '',
|
detail_address: '',
|
||||||
|
remark: '',
|
||||||
province_code: '',
|
province_code: '',
|
||||||
city_code: '',
|
city_code: '',
|
||||||
area_code: ''
|
area_code: ''
|
||||||
@ -128,17 +129,18 @@ function buildUpdateAddressPayload(ids: OrderId[], form: UpdateAddressFormModel)
|
|||||||
'city',
|
'city',
|
||||||
'area',
|
'area',
|
||||||
'town',
|
'town',
|
||||||
'detail_address'
|
'detail_address',
|
||||||
|
'remark'
|
||||||
]
|
]
|
||||||
let hasAddressField = false
|
let hasUpdateField = false
|
||||||
for (const field of fields) {
|
for (const field of fields) {
|
||||||
const value = String(form[field] ?? '').trim()
|
const value = String(form[field] ?? '').trim()
|
||||||
if (value) {
|
if (value) {
|
||||||
payload[field] = value
|
payload[field] = value
|
||||||
hasAddressField = true
|
hasUpdateField = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return { payload, hasAddressField }
|
return { payload, hasUpdateField }
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeBatchTaskState(value: unknown) {
|
function normalizeBatchTaskState(value: unknown) {
|
||||||
@ -386,6 +388,12 @@ export function createPendingToolbarController(params: {
|
|||||||
const cloneSourceOrderId = ref<number | null>(null)
|
const cloneSourceOrderId = ref<number | null>(null)
|
||||||
const cloneSourceOrderCode = ref('')
|
const cloneSourceOrderCode = ref('')
|
||||||
|
|
||||||
|
const manualWaybillDialogVisible = ref(false)
|
||||||
|
const manualWaybillLoading = ref(false)
|
||||||
|
const manualWaybillOrderId = ref<number | null>(null)
|
||||||
|
const manualWaybillOrderCode = ref('')
|
||||||
|
const manualWaybillForm = reactive({ waybill_code: '' })
|
||||||
|
|
||||||
const syncOrderIdsDialogVisible = ref(false)
|
const syncOrderIdsDialogVisible = ref(false)
|
||||||
const syncOrderIdsLoading = ref(false)
|
const syncOrderIdsLoading = ref(false)
|
||||||
|
|
||||||
@ -488,6 +496,7 @@ export function createPendingToolbarController(params: {
|
|||||||
openStorageAllocateDialog: () => openStorageDialog('allocate'),
|
openStorageAllocateDialog: () => openStorageDialog('allocate'),
|
||||||
openStorageCancelDialog: () => openStorageDialog('cancel'),
|
openStorageCancelDialog: () => openStorageDialog('cancel'),
|
||||||
openAllocateExpressDialog,
|
openAllocateExpressDialog,
|
||||||
|
openManualWaybillDialog,
|
||||||
openUpdateOrderExpressDialog: () => openUpdateOrderMetaDialog('express'),
|
openUpdateOrderExpressDialog: () => openUpdateOrderMetaDialog('express'),
|
||||||
openUpdateOrderPlatformDialog: () => openUpdateOrderMetaDialog('platform'),
|
openUpdateOrderPlatformDialog: () => openUpdateOrderMetaDialog('platform'),
|
||||||
openUpdateAddressDialog,
|
openUpdateAddressDialog,
|
||||||
@ -679,6 +688,62 @@ export function createPendingToolbarController(params: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function openManualWaybillDialog() {
|
||||||
|
const rows = params.getSelectedRows()
|
||||||
|
if (rows.length !== 1) {
|
||||||
|
ElMessage.warning('请选择 1 条订单进行运单录入')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const row = rows[0] || {}
|
||||||
|
const orderId = normalizePositiveIntId(row?.order_id ?? row?.id)
|
||||||
|
if (!orderId) {
|
||||||
|
ElMessage.error('未识别到有效订单ID')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
manualWaybillOrderId.value = orderId
|
||||||
|
manualWaybillOrderCode.value = String(row?.delivery_order_code || '')
|
||||||
|
manualWaybillForm.waybill_code = ''
|
||||||
|
manualWaybillDialogVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitManualWaybill() {
|
||||||
|
if (!manualWaybillOrderId.value || manualWaybillLoading.value) return
|
||||||
|
const waybill_code = normalizeCode(manualWaybillForm.waybill_code)
|
||||||
|
if (!waybill_code) {
|
||||||
|
ElMessage.warning('请输入运单号')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
manualWaybillLoading.value = true
|
||||||
|
try {
|
||||||
|
const res = await params.pendingApi.manualWaybill({
|
||||||
|
order_id: manualWaybillOrderId.value,
|
||||||
|
waybill_code
|
||||||
|
})
|
||||||
|
const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
|
||||||
|
if (!ok) {
|
||||||
|
ElMessage.error(res?.message || '录入运单号失败')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const data = res?.data || {}
|
||||||
|
ElMessage.success(
|
||||||
|
`运单录入成功:${data.waybill_code ?? waybill_code}(记录 ID ${data.id ?? '-'})`
|
||||||
|
)
|
||||||
|
manualWaybillDialogVisible.value = false
|
||||||
|
params.clearSelection()
|
||||||
|
await params.loadData()
|
||||||
|
} catch {
|
||||||
|
ElMessage.error('录入运单号失败')
|
||||||
|
} finally {
|
||||||
|
manualWaybillLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetManualWaybillDialog() {
|
||||||
|
manualWaybillOrderId.value = null
|
||||||
|
manualWaybillOrderCode.value = ''
|
||||||
|
manualWaybillForm.waybill_code = ''
|
||||||
|
}
|
||||||
|
|
||||||
function openCloneOrderDialog() {
|
function openCloneOrderDialog() {
|
||||||
const rows = params.getSelectedRows()
|
const rows = params.getSelectedRows()
|
||||||
if (rows.length !== 1) {
|
if (rows.length !== 1) {
|
||||||
@ -850,9 +915,9 @@ export function createPendingToolbarController(params: {
|
|||||||
ElMessage.error('没有可提交的订单')
|
ElMessage.error('没有可提交的订单')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const { payload, hasAddressField } = buildUpdateAddressPayload(ids, updateAddressForm)
|
const { payload, hasUpdateField } = buildUpdateAddressPayload(ids, updateAddressForm)
|
||||||
if (!hasAddressField) {
|
if (!hasUpdateField) {
|
||||||
ElMessage.warning('请至少填写一项地址字段')
|
ElMessage.warning('请至少填写一项地址字段或留言')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
updateAddressLoading.value = true
|
updateAddressLoading.value = true
|
||||||
@ -1032,6 +1097,11 @@ export function createPendingToolbarController(params: {
|
|||||||
cloneOrderLoading,
|
cloneOrderLoading,
|
||||||
cloneSourceOrderId,
|
cloneSourceOrderId,
|
||||||
cloneSourceOrderCode,
|
cloneSourceOrderCode,
|
||||||
|
manualWaybillDialogVisible,
|
||||||
|
manualWaybillLoading,
|
||||||
|
manualWaybillOrderId,
|
||||||
|
manualWaybillOrderCode,
|
||||||
|
manualWaybillForm,
|
||||||
syncOrderIdsDialogVisible,
|
syncOrderIdsDialogVisible,
|
||||||
syncOrderIdsLoading,
|
syncOrderIdsLoading,
|
||||||
updateAddressDialogVisible,
|
updateAddressDialogVisible,
|
||||||
@ -1049,6 +1119,7 @@ export function createPendingToolbarController(params: {
|
|||||||
submitStorageAllocate,
|
submitStorageAllocate,
|
||||||
submitUpdateOrderMeta,
|
submitUpdateOrderMeta,
|
||||||
submitCloneOrder,
|
submitCloneOrder,
|
||||||
|
submitManualWaybill,
|
||||||
submitSyncOrderIds,
|
submitSyncOrderIds,
|
||||||
submitAllocateExpress,
|
submitAllocateExpress,
|
||||||
submitUpdateAddress,
|
submitUpdateAddress,
|
||||||
@ -1057,6 +1128,7 @@ export function createPendingToolbarController(params: {
|
|||||||
resetStorageAllocateDialog,
|
resetStorageAllocateDialog,
|
||||||
resetUpdateOrderMetaDialog,
|
resetUpdateOrderMetaDialog,
|
||||||
resetCloneOrderDialog,
|
resetCloneOrderDialog,
|
||||||
|
resetManualWaybillDialog,
|
||||||
resetSyncOrderIdsDialog,
|
resetSyncOrderIdsDialog,
|
||||||
resetUpdateAddressDialog,
|
resetUpdateAddressDialog,
|
||||||
resetBatchAsyncTaskDialog
|
resetBatchAsyncTaskDialog
|
||||||
|
|||||||
@ -8,9 +8,9 @@
|
|||||||
"message": "登录成功",
|
"message": "登录成功",
|
||||||
"success": true,
|
"success": true,
|
||||||
"data": {
|
"data": {
|
||||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3ODA5MTA5NzcsImV4cCI6MTc4MDkyNTM3N30.PHAkhtpcP_n4wrXW5vTqRqtcpcrnLnM9JKl_WUxTyVw"
|
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3ODA5ODI5MjksImV4cCI6MTc4MDk5NzMyOX0.w3xvNnGQQ1y5nuybSmnJ4VtY9gC55Wx56adq4J-VsHk"
|
||||||
},
|
},
|
||||||
"timestamp": 1780910977
|
"timestamp": 1780982929
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1543,17 +1543,7 @@
|
|||||||
"hasNext": true
|
"hasNext": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"timestamp": 1780910977
|
"timestamp": 1780982929
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"接口": "order.deliveryOrder.detail",
|
|
||||||
"data": {
|
|
||||||
"flag": "failure",
|
|
||||||
"code": 500,
|
|
||||||
"message": "接口错误: 订单ID不能为空",
|
|
||||||
"data": null,
|
|
||||||
"timestamp": 1780910979
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
# 接口
|
# 接口
|
||||||
|
|
||||||
- 更新时间: 2026-06-07 16:25:23
|
- 更新时间: 2026-06-09 10:10:26
|
||||||
- 扫描目录: `src\api`
|
- 扫描目录: `src\api`
|
||||||
- 模块数: 41
|
- 模块数: 41
|
||||||
- API 文件数: 41
|
- API 文件数: 41
|
||||||
- 接口数: 340
|
- 接口数: 353
|
||||||
- 已启用: 305
|
- 已启用: 318
|
||||||
- 占位接口: 2
|
- 占位接口: 2
|
||||||
|
|
||||||
## 模块统计
|
## 模块统计
|
||||||
@ -23,9 +23,9 @@
|
|||||||
| order.expectionorder | 1 | 3 | 3 | 0 |
|
| order.expectionorder | 1 | 3 | 3 | 0 |
|
||||||
| order.index | 1 | 10 | 9 | 0 |
|
| order.index | 1 | 10 | 9 | 0 |
|
||||||
| order.outboundorder | 1 | 3 | 3 | 0 |
|
| order.outboundorder | 1 | 3 | 3 | 0 |
|
||||||
| order.pendingorder | 1 | 18 | 17 | 0 |
|
| order.pendingorder | 1 | 27 | 26 | 0 |
|
||||||
| order.print | 1 | 3 | 3 | 0 |
|
| order.print | 1 | 4 | 4 | 0 |
|
||||||
| order.recheckorder | 1 | 3 | 2 | 0 |
|
| order.recheckorder | 1 | 6 | 5 | 0 |
|
||||||
| order.revieworder | 1 | 3 | 3 | 0 |
|
| order.revieworder | 1 | 3 | 3 | 0 |
|
||||||
| order.wave | 1 | 30 | 28 | 0 |
|
| order.wave | 1 | 30 | 28 | 0 |
|
||||||
| pick | 1 | 4 | 4 | 0 |
|
| pick | 1 | 4 | 4 | 0 |
|
||||||
@ -119,6 +119,14 @@
|
|||||||
| order.pendingorder | orderPendingOrderAllocateExpressCode | order.pendingOrder.allocateExpressCode | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderAllocateExpressCode | order.pendingOrder.allocateExpressCode | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderAllocateStorage | order.pendingOrder.allocateStorage | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderAllocateStorage | order.pendingOrder.allocateStorage | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderAllocateStorageProgress | order.pendingOrder.allocateStorageProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderAllocateStorageProgress | order.pendingOrder.allocateStorageProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchIntercept | order.pendingOrder.batchIntercept | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchInterceptTaskProgress | order.pendingOrder.batchInterceptTaskProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchLock | order.pendingOrder.batchLock | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchLockTaskProgress | order.pendingOrder.batchLockTaskProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchUnintercept | order.pendingOrder.batchUnintercept | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchUninterceptTaskProgress | order.pendingOrder.batchUninterceptTaskProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchUnlock | order.pendingOrder.batchUnlock | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderBatchUnlockTaskProgress | order.pendingOrder.batchUnlockTaskProgress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderCancelAllocateStorage | order.pendingOrder.cancelAllocateStorage | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderCancelAllocateStorage | order.pendingOrder.cancelAllocateStorage | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderCancelOrder | order.pendingOrder.cancelOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderCancelOrder | order.pendingOrder.cancelOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderCloneOrder | order.pendingOrder.cloneOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderCloneOrder | order.pendingOrder.cloneOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
@ -127,6 +135,7 @@
|
|||||||
| order.pendingorder | orderPendingOrderDownloadCreateTemplate | order.pendingOrder.downloadCreateTemplate | POST | 否 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderDownloadCreateTemplate | order.pendingOrder.downloadCreateTemplate | POST | 否 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderImportOrdersFromExcel | order.pendingOrder.importOrdersFromExcel | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderImportOrdersFromExcel | order.pendingOrder.importOrdersFromExcel | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderList | order.pendingOrder.list | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderList | order.pendingOrder.list | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.pendingorder | orderPendingOrderManualWaybill | order.pendingOrder.manualWaybill | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderMarkPendingOutboundOrder | order.pendingOrder.markPendingOutboundOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderMarkPendingOutboundOrder | order.pendingOrder.markPendingOutboundOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderParseAddress | order.pendingOrder.parseAddress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderParseAddress | order.pendingOrder.parseAddress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderReverseReviewOrder | order.pendingOrder.reverseReviewOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderReverseReviewOrder | order.pendingOrder.reverseReviewOrder | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
@ -134,12 +143,16 @@
|
|||||||
| order.pendingorder | orderPendingOrderUpdateAddress | order.pendingOrder.updateAddress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderUpdateAddress | order.pendingOrder.updateAddress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderUpdateOrderExpress | order.pendingOrder.updateOrderExpress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderUpdateOrderExpress | order.pendingOrder.updateOrderExpress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
| order.pendingorder | orderPendingOrderUpdateOrderPlatform | order.pendingOrder.updateOrderPlatform | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
| order.pendingorder | orderPendingOrderUpdateOrderPlatform | order.pendingOrder.updateOrderPlatform | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
|
||||||
|
| order.print | getOrderPrintData | order.print.getOrderPrintData | POST | 是 | 否 | order.print/orderprint.ts | |
|
||||||
| order.print | getWavePlatformPrintData | order.print.getWavePlatformPrintData | POST | 是 | 否 | order.print/orderprint.ts | |
|
| order.print | getWavePlatformPrintData | order.print.getWavePlatformPrintData | POST | 是 | 否 | order.print/orderprint.ts | |
|
||||||
| order.print | getWavePrintData | order.print.getWavePrintData | POST | 是 | 否 | order.print/orderprint.ts | |
|
| order.print | getWavePrintData | order.print.getWavePrintData | POST | 是 | 否 | order.print/orderprint.ts | |
|
||||||
| order.print | unlockWavePlatformPrintDataByGroup | order.print.unlockWavePlatformPrintDataByGroup | POST | 是 | 否 | order.print/orderprint.ts | |
|
| order.print | unlockWavePlatformPrintDataByGroup | order.print.unlockWavePlatformPrintDataByGroup | POST | 是 | 否 | order.print/orderprint.ts | |
|
||||||
|
| order.recheckorder | confirmIntercept | order.recheckOrder.confirmIntercept | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
| order.recheckorder | confirmRecheck | order.recheckOrder.confirmRecheck | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
| order.recheckorder | confirmRecheck | order.recheckOrder.confirmRecheck | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
| order.recheckorder | scanOrder | order.recheckOrder.scanOrder | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
| order.recheckorder | scanOrder | order.recheckOrder.scanOrder | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
|
| order.recheckorder | scanTask | order.recheckOrder.scanTask | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
| order.recheckorder | scanWaybill | order.recheckOrder.scanWaybill | POST | 否 | 否 | order.recheckorder/recheckOrder.ts | |
|
| order.recheckorder | scanWaybill | order.recheckOrder.scanWaybill | POST | 否 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
|
| order.recheckorder | updateExpressWeighingWeight | order.updateExpressWeighingWeight | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
|
||||||
| order.revieworder | orderReviewOrderDetail | order.reviewOrder.detail | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
| order.revieworder | orderReviewOrderDetail | order.reviewOrder.detail | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
||||||
| order.revieworder | orderReviewOrderList | order.reviewOrder.list | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
| order.revieworder | orderReviewOrderList | order.reviewOrder.list | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
||||||
| order.revieworder | orderReviewOrderReviewOrder | order.reviewOrder.reviewOrder | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
| order.revieworder | orderReviewOrderReviewOrder | order.reviewOrder.reviewOrder | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
"body": {}
|
"body": {}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"method": "order.deliveryOrder.detail",
|
"method": "",
|
||||||
"body": {}
|
"body": {}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"数据一览": {
|
"数据一览": {
|
||||||
"当前请求数": 3,
|
"当前请求数": 2,
|
||||||
"成功数": 2,
|
"成功数": 2,
|
||||||
"全部请求数": 3,
|
"全部请求数": 2,
|
||||||
"成功数与全部请求数": "2/3",
|
"成功数与全部请求数": "2/2",
|
||||||
"成功判定名单": [
|
"成功判定名单": [
|
||||||
"ok",
|
"ok",
|
||||||
"成功",
|
"成功",
|
||||||
@ -12,24 +12,7 @@
|
|||||||
"查询成功",
|
"查询成功",
|
||||||
"获取成功"
|
"获取成功"
|
||||||
],
|
],
|
||||||
"失败接口": [
|
"失败接口": [],
|
||||||
{
|
|
||||||
"接口": "order.deliveryOrder.detail",
|
|
||||||
"message": "接口错误: 订单ID不能为空",
|
|
||||||
"code": 500,
|
|
||||||
"模块目录": "order.deliveryorder",
|
|
||||||
"api封装": [
|
|
||||||
{
|
|
||||||
"文件": "src/api/order.deliveryorder/orderdeliveryOrder.ts",
|
|
||||||
"方法名": "orderDeliveryOrder.detail",
|
|
||||||
"说明": "聚合对象方法"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"引用页面": [
|
|
||||||
"src/views/order/orderManagement/deliveryOrder.vue"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"空数据接口": []
|
"空数据接口": []
|
||||||
},
|
},
|
||||||
"详情": [
|
"详情": [
|
||||||
@ -43,9 +26,9 @@
|
|||||||
"message": "登录成功",
|
"message": "登录成功",
|
||||||
"success": true,
|
"success": true,
|
||||||
"data": {
|
"data": {
|
||||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3ODA5MTA5NzcsImV4cCI6MTc4MDkyNTM3N30.PHAkhtpcP_n4wrXW5vTqRqtcpcrnLnM9JKl_WUxTyVw"
|
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3ODA5ODI5MjksImV4cCI6MTc4MDk5NzMyOX0.w3xvNnGQQ1y5nuybSmnJ4VtY9gC55Wx56adq4J-VsHk"
|
||||||
},
|
},
|
||||||
"timestamp": 1780910977
|
"timestamp": 1780982929
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1580,19 +1563,7 @@
|
|||||||
"hasNext": true
|
"hasNext": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"timestamp": 1780910977
|
"timestamp": 1780982929
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"接口": "order.deliveryOrder.detail",
|
|
||||||
"message": "接口错误: 订单ID不能为空",
|
|
||||||
"code": 500,
|
|
||||||
"data": {
|
|
||||||
"flag": "failure",
|
|
||||||
"code": 500,
|
|
||||||
"message": "接口错误: 订单ID不能为空",
|
|
||||||
"data": null,
|
|
||||||
"timestamp": 1780910979
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
@ -12,27 +12,59 @@
|
|||||||
"label": "全部"
|
"label": "全部"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"totalInterfaceCount": 312,
|
"totalInterfaceCount": 313,
|
||||||
"changes": {
|
"changes": {
|
||||||
"summary": {
|
"summary": {
|
||||||
"moduleAdded": 0,
|
"moduleAdded": 0,
|
||||||
"moduleDeleted": 0,
|
"moduleDeleted": 0,
|
||||||
"moduleUpdated": 0,
|
"moduleUpdated": 1,
|
||||||
"interfaceAdded": 0,
|
"interfaceAdded": 0,
|
||||||
"interfaceDeleted": 0,
|
"interfaceDeleted": 0,
|
||||||
"interfaceParamsUpdated": 0,
|
"interfaceParamsUpdated": 1,
|
||||||
"interfaceResponseUpdated": 0
|
"interfaceResponseUpdated": 1
|
||||||
},
|
},
|
||||||
"moduleUpdates": {
|
"moduleUpdates": {
|
||||||
"added": [],
|
"added": [],
|
||||||
"deleted": [],
|
"deleted": [],
|
||||||
"updated": []
|
"updated": [
|
||||||
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"previousModuleName": "订单待处理模块",
|
||||||
|
"previousModuleKey": "order.pendingOrder",
|
||||||
|
"interfaceChanges": {
|
||||||
|
"addedMethods": [],
|
||||||
|
"deletedMethods": [],
|
||||||
|
"paramsUpdatedMethods": [
|
||||||
|
"order.pendingOrder.updateAddress"
|
||||||
|
],
|
||||||
|
"responseUpdatedMethods": [
|
||||||
|
"order.pendingOrder.updateAddress"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"interfaceUpdates": {
|
"interfaceUpdates": {
|
||||||
"added": [],
|
"added": [],
|
||||||
"deleted": [],
|
"deleted": [],
|
||||||
"paramsUpdated": [],
|
"paramsUpdated": [
|
||||||
"responseUpdated": []
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"method": "order.pendingOrder.updateAddress"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responseUpdated": [
|
||||||
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"method": "order.pendingOrder.updateAddress"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"interfaces": [
|
"interfaces": [
|
||||||
@ -4374,6 +4406,69 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"moduleFolder": "order.pendingorder",
|
||||||
|
"method": "order.pendingOrder.manualWaybill",
|
||||||
|
"title": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。",
|
||||||
|
"description": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。",
|
||||||
|
"endpoint": "/system",
|
||||||
|
"authRequired": false,
|
||||||
|
"loginRequired": true,
|
||||||
|
"status": {
|
||||||
|
"isUsed": false,
|
||||||
|
"isPlaceholder": false
|
||||||
|
},
|
||||||
|
"headers": [
|
||||||
|
{
|
||||||
|
"name": "Authorization",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "Bearer token"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"params": [
|
||||||
|
{
|
||||||
|
"name": "order_id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "订单 ID,必须为正整数"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "waybill_code",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "运单号,非空字符串"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"response": [
|
||||||
|
{
|
||||||
|
"name": "id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "创建的运单记录 ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "order_id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "订单 ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "waybill_code",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "运单号"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "create_at",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "创建时间"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"moduleName": "订单待处理模块",
|
"moduleName": "订单待处理模块",
|
||||||
"moduleKey": "order.pendingOrder",
|
"moduleKey": "order.pendingOrder",
|
||||||
@ -4666,8 +4761,8 @@
|
|||||||
"moduleKey": "order.pendingOrder",
|
"moduleKey": "order.pendingOrder",
|
||||||
"moduleFolder": "order.pendingorder",
|
"moduleFolder": "order.pendingorder",
|
||||||
"method": "order.pendingOrder.updateAddress",
|
"method": "order.pendingOrder.updateAddress",
|
||||||
"title": "批量修改待处理订单的收件地址信息。仅允许修改 post_status='none'(未分配快递)的订单;至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address),空值和纯空白会被忽略。更新成功后写入操作日志。",
|
"title": "批量修改待处理订单的收件地址信息和备注。地址字段修改仅允许 post_status='none'(未分配快递)的订单;remark 字段修改不受 post_status 限制可对所有订单生效。至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address)或 remark,空值和纯空白会被忽略。更新成功后写入操作日志。",
|
||||||
"description": "批量修改待处理订单的收件地址信息。仅允许修改 post_status='none'(未分配快递)的订单;至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address),空值和纯空白会被忽略。更新成功后写入操作日志。",
|
"description": "批量修改待处理订单的收件地址信息和备注。地址字段修改仅允许 post_status='none'(未分配快递)的订单;remark 字段修改不受 post_status 限制可对所有订单生效。至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address)或 remark,空值和纯空白会被忽略。更新成功后写入操作日志。",
|
||||||
"endpoint": "/system",
|
"endpoint": "/system",
|
||||||
"authRequired": false,
|
"authRequired": false,
|
||||||
"loginRequired": true,
|
"loginRequired": true,
|
||||||
@ -4743,6 +4838,12 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"required": false,
|
"required": false,
|
||||||
"description": "详细地址"
|
"description": "详细地址"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "remark",
|
||||||
|
"type": "string",
|
||||||
|
"required": false,
|
||||||
|
"description": "订单留言/备注,最大500字符。非空时批量覆盖所选订单的 remark 字段,不受 post_status 限制。"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"response": [
|
"response": [
|
||||||
@ -4750,7 +4851,7 @@
|
|||||||
"name": "updated_count",
|
"name": "updated_count",
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"required": true,
|
"required": true,
|
||||||
"description": "实际更新的订单行数"
|
"description": "实际更新的订单行数(取地址更新行数与备注更新行数的最大值)。remark 字段的更新计数独立于地址字段。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ids",
|
"name": "ids",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
@ -13,27 +13,59 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"moduleCount": 41,
|
"moduleCount": 41,
|
||||||
"totalInterfaceCount": 312,
|
"totalInterfaceCount": 313,
|
||||||
"changes": {
|
"changes": {
|
||||||
"summary": {
|
"summary": {
|
||||||
"moduleAdded": 0,
|
"moduleAdded": 0,
|
||||||
"moduleDeleted": 0,
|
"moduleDeleted": 0,
|
||||||
"moduleUpdated": 0,
|
"moduleUpdated": 1,
|
||||||
"interfaceAdded": 0,
|
"interfaceAdded": 0,
|
||||||
"interfaceDeleted": 0,
|
"interfaceDeleted": 0,
|
||||||
"interfaceParamsUpdated": 0,
|
"interfaceParamsUpdated": 1,
|
||||||
"interfaceResponseUpdated": 0
|
"interfaceResponseUpdated": 1
|
||||||
},
|
},
|
||||||
"moduleUpdates": {
|
"moduleUpdates": {
|
||||||
"added": [],
|
"added": [],
|
||||||
"deleted": [],
|
"deleted": [],
|
||||||
"updated": []
|
"updated": [
|
||||||
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"previousModuleName": "订单待处理模块",
|
||||||
|
"previousModuleKey": "order.pendingOrder",
|
||||||
|
"interfaceChanges": {
|
||||||
|
"addedMethods": [],
|
||||||
|
"deletedMethods": [],
|
||||||
|
"paramsUpdatedMethods": [
|
||||||
|
"order.pendingOrder.updateAddress"
|
||||||
|
],
|
||||||
|
"responseUpdatedMethods": [
|
||||||
|
"order.pendingOrder.updateAddress"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"interfaceUpdates": {
|
"interfaceUpdates": {
|
||||||
"added": [],
|
"added": [],
|
||||||
"deleted": [],
|
"deleted": [],
|
||||||
"paramsUpdated": [],
|
"paramsUpdated": [
|
||||||
"responseUpdated": []
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"method": "order.pendingOrder.updateAddress"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responseUpdated": [
|
||||||
|
{
|
||||||
|
"moduleName": "订单待处理模块",
|
||||||
|
"moduleKey": "order.pendingOrder",
|
||||||
|
"folder": "order.pendingorder",
|
||||||
|
"method": "order.pendingOrder.updateAddress"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"modules": [
|
"modules": [
|
||||||
@ -411,7 +443,7 @@
|
|||||||
"moduleName": "订单待处理模块",
|
"moduleName": "订单待处理模块",
|
||||||
"moduleKey": "order.pendingOrder",
|
"moduleKey": "order.pendingOrder",
|
||||||
"folder": "order.pendingorder",
|
"folder": "order.pendingorder",
|
||||||
"interfaceCount": 25,
|
"interfaceCount": 26,
|
||||||
"interfaces": [
|
"interfaces": [
|
||||||
{
|
{
|
||||||
"method": "order.pendingOrder.list"
|
"method": "order.pendingOrder.list"
|
||||||
@ -487,6 +519,9 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"method": "order.pendingOrder.batchUninterceptTaskProgress"
|
"method": "order.pendingOrder.batchUninterceptTaskProgress"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"method": "order.pendingOrder.manualWaybill"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
@ -16,7 +16,7 @@
|
|||||||
"name": "订单待处理模块",
|
"name": "订单待处理模块",
|
||||||
"key": "order.pendingOrder",
|
"key": "order.pendingOrder",
|
||||||
"folder": "order.pendingorder",
|
"folder": "order.pendingorder",
|
||||||
"interfaceCount": 25
|
"interfaceCount": 26
|
||||||
},
|
},
|
||||||
"changes": {
|
"changes": {
|
||||||
"fromPreviousSnapshot": {
|
"fromPreviousSnapshot": {
|
||||||
@ -25,8 +25,12 @@
|
|||||||
"interfaceChanges": {
|
"interfaceChanges": {
|
||||||
"addedMethods": [],
|
"addedMethods": [],
|
||||||
"deletedMethods": [],
|
"deletedMethods": [],
|
||||||
"paramsUpdatedMethods": [],
|
"paramsUpdatedMethods": [
|
||||||
"responseUpdatedMethods": []
|
"order.pendingOrder.updateAddress"
|
||||||
|
],
|
||||||
|
"responseUpdatedMethods": [
|
||||||
|
"order.pendingOrder.updateAddress"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -1142,8 +1146,8 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"method": "order.pendingOrder.updateAddress",
|
"method": "order.pendingOrder.updateAddress",
|
||||||
"title": "批量修改待处理订单的收件地址信息。仅允许修改 post_status='none'(未分配快递)的订单;至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address),空值和纯空白会被忽略。更新成功后写入操作日志。",
|
"title": "批量修改待处理订单的收件地址信息和备注。地址字段修改仅允许 post_status='none'(未分配快递)的订单;remark 字段修改不受 post_status 限制可对所有订单生效。至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address)或 remark,空值和纯空白会被忽略。更新成功后写入操作日志。",
|
||||||
"description": "批量修改待处理订单的收件地址信息。仅允许修改 post_status='none'(未分配快递)的订单;至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address),空值和纯空白会被忽略。更新成功后写入操作日志。",
|
"description": "批量修改待处理订单的收件地址信息和备注。地址字段修改仅允许 post_status='none'(未分配快递)的订单;remark 字段修改不受 post_status 限制可对所有订单生效。至少需要提供一个地址字段(name/mobile/tel/zip_code/province/city/area/town/detail_address)或 remark,空值和纯空白会被忽略。更新成功后写入操作日志。",
|
||||||
"endpoint": "/system",
|
"endpoint": "/system",
|
||||||
"authRequired": false,
|
"authRequired": false,
|
||||||
"loginRequired": true,
|
"loginRequired": true,
|
||||||
@ -1219,6 +1223,12 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"required": false,
|
"required": false,
|
||||||
"description": "详细地址"
|
"description": "详细地址"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "remark",
|
||||||
|
"type": "string",
|
||||||
|
"required": false,
|
||||||
|
"description": "订单留言/备注,最大500字符。非空时批量覆盖所选订单的 remark 字段,不受 post_status 限制。"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"response": [
|
"response": [
|
||||||
@ -1226,7 +1236,7 @@
|
|||||||
"name": "updated_count",
|
"name": "updated_count",
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"required": true,
|
"required": true,
|
||||||
"description": "实际更新的订单行数"
|
"description": "实际更新的订单行数(取地址更新行数与备注更新行数的最大值)。remark 字段的更新计数独立于地址字段。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ids",
|
"name": "ids",
|
||||||
@ -1979,6 +1989,66 @@
|
|||||||
"description": "错误码(仅 failed 时返回,默认 'BATCH_UNINTERCEPT_FAILED')"
|
"description": "错误码(仅 failed 时返回,默认 'BATCH_UNINTERCEPT_FAILED')"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"method": "order.pendingOrder.manualWaybill",
|
||||||
|
"title": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。",
|
||||||
|
"description": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。",
|
||||||
|
"endpoint": "/system",
|
||||||
|
"authRequired": false,
|
||||||
|
"loginRequired": true,
|
||||||
|
"status": {
|
||||||
|
"isUsed": false,
|
||||||
|
"isPlaceholder": false
|
||||||
|
},
|
||||||
|
"headers": [
|
||||||
|
{
|
||||||
|
"name": "Authorization",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "Bearer token"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"params": [
|
||||||
|
{
|
||||||
|
"name": "order_id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "订单 ID,必须为正整数"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "waybill_code",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "运单号,非空字符串"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"response": [
|
||||||
|
{
|
||||||
|
"name": "id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "创建的运单记录 ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "order_id",
|
||||||
|
"type": "number",
|
||||||
|
"required": true,
|
||||||
|
"description": "订单 ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "waybill_code",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "运单号"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "create_at",
|
||||||
|
"type": "string",
|
||||||
|
"required": true,
|
||||||
|
"description": "创建时间"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-05 09:15:19",
|
"createdAt": "2026-05-05 09:15:19",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-20 08:59:09",
|
"createdAt": "2026-05-20 08:59:09",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-04 09:11:04",
|
"createdAt": "2026-05-04 09:11:04",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-09 09:52:14",
|
"createdAt": "2026-05-09 09:52:14",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-04 17:23:48",
|
"createdAt": "2026-05-04 17:23:48",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-06-03 16:55:40",
|
"createdAt": "2026-06-03 16:55:40",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-17 19:37:49",
|
"createdAt": "2026-04-17 19:37:49",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-17 20:21:27",
|
"createdAt": "2026-04-17 20:21:27",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-29 09:07:53",
|
"createdAt": "2026-05-29 09:07:53",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-29 09:07:53",
|
"createdAt": "2026-05-29 09:07:53",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-17 19:16:50",
|
"createdAt": "2026-04-17 19:16:50",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-04 09:11:04",
|
"createdAt": "2026-05-04 09:11:04",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-25 17:05:16",
|
"createdAt": "2026-05-25 17:05:16",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-05-15 17:32:36",
|
"createdAt": "2026-05-15 17:32:36",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": null
|
"restoredAt": null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"generatedAt": "2026-06-08 16:54:48",
|
"generatedAt": "2026-06-09 18:13:02",
|
||||||
"generatedAtLocal": "2026-06-08 16:54:48",
|
"generatedAtLocal": "2026-06-09 18:13:02",
|
||||||
"source": "remote",
|
"source": "remote",
|
||||||
"filter": {
|
"filter": {
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"status": "active",
|
"status": "active",
|
||||||
"createdAt": "2026-04-16 11:15:05",
|
"createdAt": "2026-04-16 11:15:05",
|
||||||
"updatedAt": "2026-06-08 16:54:48",
|
"updatedAt": "2026-06-09 18:13:02",
|
||||||
"deletedAt": null,
|
"deletedAt": null,
|
||||||
"restoredAt": "2026-04-17 19:16:50"
|
"restoredAt": "2026-04-17 19:16:50"
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user