5月2日
This commit is contained in:
parent
f75ea53f9f
commit
4323e78fa7
@ -110,6 +110,25 @@ export type PendingOrderAllocateStorageParams = {
|
||||
id?: number | string;
|
||||
};
|
||||
|
||||
export type PendingOrderAllocateStorageProgressParams = {
|
||||
request_id?: string;
|
||||
requestId?: string;
|
||||
};
|
||||
|
||||
export type PendingOrderAllocateStorageProgressResponse = {
|
||||
request_id?: string;
|
||||
status?: string;
|
||||
progress_percent?: number;
|
||||
total_count?: number;
|
||||
success_count?: number;
|
||||
failed_count?: number;
|
||||
updated_count?: number;
|
||||
error?: string;
|
||||
message?: string;
|
||||
update_time?: string;
|
||||
result?: Record<string, any>;
|
||||
};
|
||||
|
||||
export type PendingOrderSyncOrderIdsParams = {
|
||||
order_ids?: Array<number | string> | string | number;
|
||||
orderIds?: Array<number | string> | string | number;
|
||||
@ -241,6 +260,22 @@ export function orderPendingOrderCancelAllocateStorage(
|
||||
} as any);
|
||||
}
|
||||
|
||||
export function orderPendingOrderAllocateStorageProgress(
|
||||
data: PendingOrderAllocateStorageProgressParams,
|
||||
): Promise<PendingOrderAllocateStorageProgressResponse & { code?: number; message?: string; flag?: string; data?: any }> {
|
||||
return request({
|
||||
url: "/system",
|
||||
method: "post",
|
||||
params: {
|
||||
method: "order.pendingOrder.allocateStorageProgress",
|
||||
v,
|
||||
timestamp: Date.now(),
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
} as any);
|
||||
}
|
||||
|
||||
export function orderPendingOrderSyncOrderIds(
|
||||
data: PendingOrderSyncOrderIdsParams,
|
||||
): Promise<any> {
|
||||
@ -355,6 +390,7 @@ export const orderPendingOrder = {
|
||||
cancelOrder: orderPendingOrderCancelOrder,
|
||||
allocateExpressCode: orderPendingOrderAllocateExpressCode,
|
||||
allocateStorage: orderPendingOrderAllocateStorage,
|
||||
allocateStorageProgress: orderPendingOrderAllocateStorageProgress,
|
||||
cancelAllocateStorage: orderPendingOrderCancelAllocateStorage,
|
||||
syncOrderIds: orderPendingOrderSyncOrderIds,
|
||||
updateOrderPlatform: orderPendingOrderUpdateOrderPlatform,
|
||||
|
||||
198
src/api/order.wave/orderwave.ts
Normal file
198
src/api/order.wave/orderwave.ts
Normal file
@ -0,0 +1,198 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
const v = '1.0'
|
||||
|
||||
export type WaveBatchListParams = {
|
||||
pagination?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
where?: Record<string, any>
|
||||
}
|
||||
|
||||
export type WaveGroupOrderFetchListParams = {
|
||||
pagination?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
distinguish_express?: boolean
|
||||
store_id?: number
|
||||
same_order_quantity?: number
|
||||
shop_name?: string
|
||||
include_sku?: string
|
||||
return_order_ids?: boolean
|
||||
}
|
||||
|
||||
export type WaveFetchParams = {
|
||||
structure_list: Array<{
|
||||
item_detail_machine: string
|
||||
quantity?: number
|
||||
}>
|
||||
}
|
||||
|
||||
export type WaveFetchResponse = {
|
||||
task_id: string
|
||||
warehouse_id: number
|
||||
structure_count: number
|
||||
default_quantity: number
|
||||
auto_fetch_disabled_marker: string
|
||||
message?: string
|
||||
}
|
||||
|
||||
export type WaveFetchTaskProgressParams = {
|
||||
task_id?: string
|
||||
taskId?: string
|
||||
}
|
||||
|
||||
export type WaveFetchTaskProgressResponse = {
|
||||
task_id: string
|
||||
status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found'
|
||||
warehouse_id?: number
|
||||
structure_count?: number
|
||||
finished_structure_count?: number
|
||||
progress_percent?: number
|
||||
total_fetched_quantity?: number
|
||||
duration_ms?: number
|
||||
error?: string
|
||||
update_time?: string
|
||||
message?: string
|
||||
}
|
||||
|
||||
export type WaveBatchCancelParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export type WaveBatchAutoGroupingParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export type WaveBatchFinishAutoGroupingParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export type WaveBatchRemoveOrdersParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export function orderWaveBatchList(data: WaveBatchListParams = {}): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.batchList',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams = {}): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.groupOrderFetchList',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveFetch(data: WaveFetchParams): Promise<WaveFetchResponse & { code?: number; message?: string }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.fetch',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveFetchTaskProgress(data: WaveFetchTaskProgressParams): Promise<WaveFetchTaskProgressResponse & { code?: number; message?: string }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.fetchTaskProgress',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchCancel(data: WaveBatchCancelParams): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.batchCancel',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchAutoGrouping(data: WaveBatchAutoGroupingParams): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.batchAutoGrouping',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchFinishAutoGrouping(data: WaveBatchFinishAutoGroupingParams): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.batchFinishAutoGrouping',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchRemoveOrders(data: WaveBatchRemoveOrdersParams): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.batchRemoveOrders',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export const orderWave = {
|
||||
batchList: orderWaveBatchList,
|
||||
groupOrderFetchList: orderWaveGroupOrderFetchList,
|
||||
fetch: orderWaveFetch,
|
||||
fetchTaskProgress: orderWaveFetchTaskProgress,
|
||||
batchCancel: orderWaveBatchCancel,
|
||||
batchAutoGrouping: orderWaveBatchAutoGrouping,
|
||||
batchFinishAutoGrouping: orderWaveBatchFinishAutoGrouping,
|
||||
batchRemoveOrders: orderWaveBatchRemoveOrders
|
||||
}
|
||||
@ -35,10 +35,10 @@ export function quickPutaway(data: { receiving_id: number; id?: number }): Promi
|
||||
} as any)
|
||||
}
|
||||
|
||||
// 非本项目接口,不使用
|
||||
/** 收货单与入库单匹配入库:按商品维度匹配,需传收货单与入库单 ID 列表 */
|
||||
export function matchPutaway(data: {
|
||||
receiving_id: number
|
||||
extra?: Record<string, any>
|
||||
receiving_ids: number[]
|
||||
entry_order_ids: number[]
|
||||
}): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
|
||||
@ -16,6 +16,20 @@ export function getWarehouseZones(data:any) {
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function getSettings(data:any = {}) {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'setting.warehouse.getSettings',
|
||||
v: '1.0',
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function getWarehouseTree(warehouseId:any) {
|
||||
return request({
|
||||
url: '/system',
|
||||
|
||||
14466
src/apiweb.html
14466
src/apiweb.html
File diff suppressed because it is too large
Load Diff
@ -88,6 +88,24 @@
|
||||
<template v-if="column.formatter">
|
||||
<span v-html="column.formatter(scope.row, scope.column, scope.row[scope.column.property], scope.$index)"></span>
|
||||
</template>
|
||||
<template v-else-if="column.prop === 'order_flag'">
|
||||
<el-tooltip
|
||||
:content="getOrderFlagFullText(scope.row[column.prop])"
|
||||
placement="top"
|
||||
:disabled="!getOrderFlagFullText(scope.row[column.prop])"
|
||||
:show-after="400"
|
||||
>
|
||||
<span
|
||||
:class="getDefaultCellTextClass(column.prop, scope.row[column.prop])"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click.stop="copyOrderFlagText(scope.row[column.prop])"
|
||||
@keydown.enter.prevent="copyOrderFlagText(scope.row[column.prop])"
|
||||
>
|
||||
{{ getOrderFlagCellText(scope.row[column.prop]) }}
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
<template v-else-if="column.template">
|
||||
<component
|
||||
:is="column.template"
|
||||
@ -106,7 +124,7 @@
|
||||
preview-teleported
|
||||
></el-image>
|
||||
</template>
|
||||
<span v-else>{{ scope.row[column.prop] }}</span>
|
||||
<span v-else :class="getDefaultCellTextClass(column.prop, scope.row[column.prop])">{{ scope.row[column.prop] }}</span>
|
||||
</slot>
|
||||
</template>
|
||||
</template>
|
||||
@ -480,8 +498,7 @@ const displayColumns = computed(() => {
|
||||
return {
|
||||
...column,
|
||||
width: cfg.width ?? column.width,
|
||||
// 在字段设置模式下,以用户排序为最高优先级,避免 fixed 导致“置顶”不生效
|
||||
fixed: undefined
|
||||
fixed: cfg.fixed === false ? undefined : (cfg.fixed ?? column.fixed)
|
||||
}
|
||||
})
|
||||
})
|
||||
@ -696,6 +713,56 @@ function rebuildColumnConfig() {
|
||||
}
|
||||
}
|
||||
|
||||
function getDefaultCellTextClass(prop: string | undefined, value: unknown) {
|
||||
if (prop === 'order_flag' && value !== undefined && value !== null && String(value).trim() !== '') {
|
||||
return 'order-flag-text order-flag-copyable'
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
function getOrderFlagFullText(value: unknown) {
|
||||
if (value == null) return ''
|
||||
return String(value).trim()
|
||||
}
|
||||
|
||||
function getOrderFlagCellText(value: unknown) {
|
||||
const text = getOrderFlagFullText(value)
|
||||
if (!text) return '—'
|
||||
const max = 48
|
||||
return text.length > max ? `${text.slice(0, max)}…` : text
|
||||
}
|
||||
|
||||
async function copyOrderFlagText(value: unknown) {
|
||||
const text = getOrderFlagFullText(value)
|
||||
if (!text) {
|
||||
ElMessage.warning('当前行无订单标记可复制')
|
||||
return
|
||||
}
|
||||
try {
|
||||
if (navigator.clipboard?.writeText) {
|
||||
await navigator.clipboard.writeText(text)
|
||||
} else {
|
||||
throw new Error('no clipboard api')
|
||||
}
|
||||
ElMessage.success('订单标记已复制到剪贴板')
|
||||
} catch {
|
||||
try {
|
||||
const textarea = document.createElement('textarea')
|
||||
textarea.value = text
|
||||
textarea.setAttribute('readonly', 'readonly')
|
||||
textarea.style.position = 'fixed'
|
||||
textarea.style.left = '-9999px'
|
||||
document.body.appendChild(textarea)
|
||||
textarea.select()
|
||||
document.execCommand('copy')
|
||||
document.body.removeChild(textarea)
|
||||
ElMessage.success('订单标记已复制到剪贴板')
|
||||
} catch {
|
||||
ElMessage.error('复制失败,请手动复制')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function persistEditableConfigs() {
|
||||
const normalized = [...editableColumnConfigs.value]
|
||||
.sort((a, b) => a.order - b.order)
|
||||
@ -1371,6 +1438,15 @@ watch(
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.order-flag-text {
|
||||
color: #f56c6c;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.order-flag-copyable {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* 表格尺寸样式 */
|
||||
.upper-table-container.small :deep(.el-table) {
|
||||
font-size: 12px;
|
||||
|
||||
@ -260,7 +260,7 @@ export async function loadServerMessages(language: string | null = null) {
|
||||
// @ts-ignore
|
||||
i18n.global.setLocaleMessage(targetLanguage, mergedMessages)
|
||||
|
||||
console.log('整合后的语言包:', mergedMessages)
|
||||
// console.log('整合后的语言包:', mergedMessages)
|
||||
console.log(`✅ 服务器翻译加载并深度合并成功 (${targetLanguage})`);
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@ -116,7 +116,7 @@ const aiStore = useAiStore()
|
||||
const inputMessage = ref('')
|
||||
const scrollbarRef = ref<InstanceType<typeof ElScrollbar>>()
|
||||
const showHistory = ref(false)
|
||||
const IM_LOGIN_URL = 'http://192.168.11.56:9096/'
|
||||
const IM_LOGIN_URL = 'https://192.168.11.56:9096/'
|
||||
|
||||
const getIconComponent = (iconName: string) => {
|
||||
const icons: Record<string, any> = { Service }
|
||||
|
||||
@ -37,8 +37,8 @@ router.beforeEach(async (to, from) => {
|
||||
// generate accessible routes based on menus
|
||||
const accessRoutes = await permissionStore.generateRoutes(user.menus || [])
|
||||
|
||||
console.log('从后端获取并转换后的动态路由:', accessRoutes)
|
||||
console.log('合并后的前端完整路由表 (添加前):', router.getRoutes())
|
||||
// console.log('从后端获取并转换后的动态路由:', accessRoutes)
|
||||
// console.log('合并后的前端完整路由表 (添加前):', router.getRoutes())
|
||||
|
||||
// dynamically add accessible routes
|
||||
accessRoutes.forEach(route => {
|
||||
@ -47,11 +47,11 @@ router.beforeEach(async (to, from) => {
|
||||
|
||||
// 打印已添加的动态路由信息与添加后的完整路由表,便于调试
|
||||
try {
|
||||
console.log('已添加的动态路由 paths:', accessRoutes.map(r => r.path))
|
||||
// console.log('已添加的动态路由 paths:', accessRoutes.map(r => r.path))
|
||||
} catch (e) {
|
||||
console.log('已添加的动态路由 (无法列出 paths):', accessRoutes)
|
||||
// console.log('已添加的动态路由 (无法列出 paths):', accessRoutes)
|
||||
}
|
||||
console.log('合并后的前端完整路由表 (添加后):', router.getRoutes())
|
||||
// console.log('合并后的前端完整路由表 (添加后):', router.getRoutes())
|
||||
|
||||
// hack method to ensure that addRoutes is complete
|
||||
// set the replace: true, so the navigation will not leave a history record
|
||||
|
||||
@ -2,8 +2,10 @@ export const componentMap: Record<string, any> = {
|
||||
'dashboard/index': () => import('@/views/dashboard/index.vue'),
|
||||
'login/index': () => import('@/views/login/index.vue'),
|
||||
'system/setting/permission/index': () => import('@/views/system/setting/permission/index.vue'),
|
||||
// 'system/setting/index': () => import('@/views/system/setting/index.vue'),
|
||||
'system/setting/index': () => import('@/views/system/setting/index.vue'),
|
||||
'order/index': () => import('@/views/order/orderManagement/index.vue'),
|
||||
/** 与后端菜单 component 字段兼容:部分环境为 order/setting */
|
||||
'order/setting': () => import('@/views/order/orderManagement/index.vue'),
|
||||
'auth/approve': () => import('@/views/auth/approve.vue'),
|
||||
'account/index': () => import('@/views/system/setting/account/index.vue'),
|
||||
// 'permission/index': () => import('@/views/system/setting/permission/index.vue'),
|
||||
@ -16,7 +18,9 @@ export const componentMap: Record<string, any> = {
|
||||
'storage/inventory': () => import('@/views/storage/inventory/index.vue'),
|
||||
'storage/stockout': () => import('@/views/storage/stockout/index.vue'),
|
||||
'store/index': () => import('@/views/store/index.vue'),
|
||||
'role/index': () => import('@/views/system/setting/role/index.vue'),'system/setting/role/index': () => import('@/views/system/setting/role/index.vue'),
|
||||
'wave/index': () => import('@/views/wave/index.vue'),
|
||||
'role/index': () => import('@/views/system/setting/role/index.vue'),
|
||||
'system/setting/role/index': () => import('@/views/system/setting/role/index.vue'),
|
||||
'system/setting/printTemplate/index': () => import('@/views/system/setting/printTemplate/index.vue'),
|
||||
// 'system/setting/printStation/index': () => import('@/views/system/setting/printStation/index.vue'),
|
||||
'system/print/station': () => import('@/views/system/setting/printStation/index.vue'),
|
||||
|
||||
@ -105,7 +105,7 @@ service.interceptors.response.use(
|
||||
: rawToken.trim()
|
||||
|
||||
if (tokenValue && tokenValue !== getToken()) {
|
||||
console.log('检测到新 Token,正在更新存储...')
|
||||
// console.log('检测到新 Token,正在更新存储...')
|
||||
// 同步更新 localStorage 和 axios 默认头
|
||||
setToken(tokenValue)
|
||||
// console.log('Token 已更新:', tokenValue)
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
|
||||
const visible = defineModel<boolean>({ default: false })
|
||||
|
||||
|
||||
@ -318,8 +318,8 @@ import { ElMessage } from 'element-plus'
|
||||
import type { FormInstance, FormRules } from 'element-plus'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { stockWarehouse } from '@/api/stock/stock'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import type { PendingOrderCreateOrderParams } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
import type { PendingOrderCreateOrderParams } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
import pcasCodeData from 'china-division/dist/pcas-code.json'
|
||||
|
||||
const visible = defineModel<boolean>({ default: false })
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
|
||||
const props = defineProps<{
|
||||
row: Record<string, any> | null
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
<script setup lang="ts">
|
||||
import { reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { orderOutboundOrder } from '@/api/order.outboundorder/orderoutboundOrder'
|
||||
import { orderOutboundOrder } from '@/api/order.outboundOrder/orderoutboundOrder'
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'success', data: any): void
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
import { getTagType, translateOrderField } from '../config/order-common-config'
|
||||
|
||||
const props = defineProps<{
|
||||
|
||||
@ -27,7 +27,8 @@ export const COMMON_TRANSLATIONS: Record<string, Record<string, string>> = {
|
||||
storage_status: {
|
||||
'none': '未分配',
|
||||
'padding': '分配中',
|
||||
'fin': '已完成'
|
||||
'fin': '已完成',
|
||||
'error': '错误'
|
||||
},
|
||||
print_status: {
|
||||
'none': '未打印',
|
||||
@ -129,7 +130,8 @@ export const COMMON_TAG_TYPES: Record<string, Record<string, string>> = {
|
||||
'none': 'info',
|
||||
'padding': 'warning',
|
||||
'pending': 'warning',
|
||||
'fin': 'success'
|
||||
'fin': 'success',
|
||||
'error': 'danger'
|
||||
},
|
||||
print_status: {
|
||||
'none': 'info',
|
||||
@ -400,6 +402,7 @@ export const simpleListToolbarButtons = pickToolbarButtons(simpleListToolbarButt
|
||||
export const deliveryAvailableFields = [
|
||||
{ label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] },
|
||||
{ label: '订单号', value: 'delivery_order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '店铺名称', value: 'shop_nick', type: 'text' },
|
||||
{ label: '来源平台', value: 'sys_platform_name', type: 'select', options: [] },
|
||||
{ label: '收货人', value: 'name', type: 'text' },
|
||||
@ -427,6 +430,8 @@ export const deliveryAvailableFields = [
|
||||
export const deliveryColumns = [
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
{ prop: 'delivery_order_code', label: '配送单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
{ prop: 'sys_platform_code', label: '平台来源', width: '100' },
|
||||
{ prop: 'name', label: '收货人', width: '100' },
|
||||
{ prop: 'mobile', label: '手机号', width: '120' },
|
||||
@ -496,6 +501,7 @@ export const deliveryOrderToolbarButtons = simpleListToolbarButtons
|
||||
// revieworder相关配置
|
||||
export const reviewAvailableFields = [
|
||||
{ label: '发货单号', value: 'delivery_order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '店铺名称', value: 'shop_nick', type: 'text' },
|
||||
{ label: '平台编码', value: 'sys_platform_code', type: 'select', options: [] },
|
||||
{ label: '收货人', value: 'name', type: 'text' },
|
||||
@ -508,6 +514,8 @@ export const reviewAvailableFields = [
|
||||
|
||||
export const reviewColums = [
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
{ prop: 'sys_platform_code', label: '平台编码', width: '100' },
|
||||
{ prop: 'name', label: '收货人', width: '110' },
|
||||
@ -626,6 +634,7 @@ export const outboundToolbarButtons = pickToolbarButtons(outboundToolbarButtonKe
|
||||
export const pendingAvailableFields = [
|
||||
{ label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] },
|
||||
{ label: '订单号', value: 'order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '店铺名称', value: 'shop_nick', type: 'text' },
|
||||
{ label: '来源平台', value: 'sys_platform_name', type: 'select', options: [] },
|
||||
{ label: '物流公司', value: 'logistics_name', type: 'select', options: [] },
|
||||
@ -643,6 +652,8 @@ export const pendingAvailableFields = [
|
||||
|
||||
export const pendingCloums = [
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
{ prop: 'name', label: '收件人', width: '110' },
|
||||
{ prop: 'mobile', label: '电话', width: '120' },
|
||||
@ -807,6 +818,7 @@ export const workbenchStatusOptions = [
|
||||
|
||||
export const workbenchAvailableFields = [
|
||||
{ label: '订单号', value: 'delivery_order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '买家昵称', value: 'buyer_nick', type: 'text' },
|
||||
{ label: '订单状态', value: 'status', type: 'select', options: workbenchStatusOptions },
|
||||
{ label: '是否紧急', value: 'is_urgency', type: 'select', options: [ { label: '是', value: 'Y' }, { label: '否', value: 'N' } ] }
|
||||
@ -814,6 +826,8 @@ export const workbenchAvailableFields = [
|
||||
|
||||
export const workbenchColumns = [
|
||||
{ prop: 'delivery_order_code', label: '订单号', minWidth: 160 },
|
||||
{ prop: 'wave_no', label: '波次号', minWidth: 160 },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: 260 },
|
||||
{ prop: 'sys_platform_name', label: '平台', minWidth: 120 },
|
||||
{ prop: 'shop_nick', label: '店铺名称', minWidth: 140 },
|
||||
{ prop: 'buyer_nick', label: '买家昵称', minWidth: 140 },
|
||||
@ -854,6 +868,7 @@ export const expectionOrderAvailableFields = [
|
||||
{ label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] },
|
||||
{ label: '订单号', value: 'order_code', type: 'text' },
|
||||
{ label: '发货单号', value: 'delivery_order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '物流公司', value: 'logistics_name', type: 'select', options: [] },
|
||||
{ label: '快递单号', value: 'express_code', type: 'text' },
|
||||
{ label: '拦截状态', value: 'intercept_status', type: 'select', options: [
|
||||
@ -866,6 +881,7 @@ export const expectionOrderAvailableFields = [
|
||||
|
||||
export const expectionColumns = [
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'sys_platform_name', label: '来源平台', width: '120' },
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
{ prop: 'is_urgency', label: '是否紧急', width: '100' },
|
||||
@ -946,6 +962,7 @@ export const archiveAvailableFields = [
|
||||
{ label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] },
|
||||
{ label: '订单号', value: 'order_code', type: 'text' },
|
||||
{ label: '发货单号', value: 'delivery_order_code', type: 'text' },
|
||||
{ label: '波次号', value: 'wave_no', type: 'text' },
|
||||
{ label: '店铺名称', value: 'shop_nick', type: 'text' },
|
||||
{ label: '收货人', value: 'name', type: 'text' },
|
||||
{ label: '手机号', value: 'mobile', type: 'text' },
|
||||
@ -962,6 +979,8 @@ export const archiveColumns = [
|
||||
{ prop: 'id', label: 'ID', width: '80' },
|
||||
{ prop: 'order_code', label: '订单号', width: '180' },
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '160' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '160' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
{ prop: 'name', label: '收货人', width: '120' },
|
||||
{ prop: 'mobile', label: '手机号', width: '120' },
|
||||
|
||||
@ -166,7 +166,7 @@ import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder'
|
||||
import { orderDeliveryOrder } from '@/api/order.deliveryOrder/orderdeliveryOrder'
|
||||
|
||||
import {
|
||||
deliveryAvailableFields,
|
||||
|
||||
@ -196,6 +196,13 @@
|
||||
:mode="storageDialogMode"
|
||||
:order-count="storagePendingOrderIds.length"
|
||||
:loading="storageAllocateLoading"
|
||||
:request-id="storageAllocateRequestId"
|
||||
:task-status="storageAllocateTaskStatus"
|
||||
:progress-percent="storageAllocateProgressPercent"
|
||||
:total-count="storageAllocateTotalCount"
|
||||
:success-count="storageAllocateSuccessCount"
|
||||
:failed-count="storageAllocateFailedCount"
|
||||
:message="storageAllocateMessage"
|
||||
@closed="resetStorageAllocateDialog"
|
||||
@submit="submitStorageAllocate"
|
||||
/>
|
||||
@ -263,7 +270,7 @@ import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { orderQueryOrderLogs } from '@/api/order.index/orderindex'
|
||||
import { orderExpectionOrder } from '@/api/order.expectionorder/orderexpectionorder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
|
||||
import {
|
||||
expectionColumns,
|
||||
@ -759,6 +766,13 @@ const {
|
||||
storagePendingOrderIds,
|
||||
storageAllocateLoading,
|
||||
storageForm,
|
||||
storageAllocateRequestId,
|
||||
storageAllocateTaskStatus,
|
||||
storageAllocateProgressPercent,
|
||||
storageAllocateTotalCount,
|
||||
storageAllocateSuccessCount,
|
||||
storageAllocateFailedCount,
|
||||
storageAllocateMessage,
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
|
||||
@ -14,11 +14,30 @@
|
||||
<el-form-item v-if="mode !== 'cancel'" label="允许存储储位">
|
||||
<el-switch v-model="allowStorageLocationProxy" active-text="是" inactive-text="否" />
|
||||
</el-form-item>
|
||||
<template v-if="mode !== 'cancel' && requestId">
|
||||
<el-form-item label="任务ID">
|
||||
<span>{{ requestId }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务状态">
|
||||
<span>{{ progressStatusText }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="处理进度">
|
||||
<div class="storage-allocate-progress">
|
||||
<el-progress :percentage="normalizedProgressPercent" :status="progressBarStatus" :stroke-width="16" />
|
||||
<div class="storage-allocate-progress__meta">
|
||||
<span>总数:{{ totalCount }}</span>
|
||||
<span>成功:{{ successCount }}</span>
|
||||
<span>失败:{{ failedCount }}</span>
|
||||
</div>
|
||||
<div v-if="message" class="storage-allocate-progress__message">{{ message }}</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button :disabled="loading && !!requestId" @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="loading" @click="emit('submit')">
|
||||
{{ mode === 'cancel' ? '确认取消' : '开始分配' }}
|
||||
{{ submitButtonText }}
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@ -34,6 +53,13 @@ const props = defineProps<{
|
||||
mode: 'allocate' | 'cancel'
|
||||
orderCount: number
|
||||
loading: boolean
|
||||
requestId?: string
|
||||
taskStatus?: string
|
||||
progressPercent?: number
|
||||
totalCount?: number
|
||||
successCount?: number
|
||||
failedCount?: number
|
||||
message?: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
@ -47,4 +73,64 @@ const allowStorageLocationProxy = computed({
|
||||
allowStorageLocation.value = value
|
||||
}
|
||||
})
|
||||
|
||||
const normalizedProgressPercent = computed(() => {
|
||||
const value = Number(props.progressPercent || 0)
|
||||
if (!Number.isFinite(value)) return 0
|
||||
return Math.max(0, Math.min(100, value))
|
||||
})
|
||||
|
||||
const progressStatusText = computed(() => {
|
||||
const map: Record<string, string> = {
|
||||
submitted: '已受理',
|
||||
running: '进行中',
|
||||
processing: '进行中',
|
||||
pending: '等待处理',
|
||||
success: '已完成',
|
||||
finished: '已完成',
|
||||
fin: '已完成',
|
||||
failed: '失败',
|
||||
error: '失败',
|
||||
exception: '异常',
|
||||
timeout: '超时',
|
||||
not_found: '未找到'
|
||||
}
|
||||
const key = String(props.taskStatus || '').trim().toLowerCase()
|
||||
return map[key] || props.taskStatus || '—'
|
||||
})
|
||||
|
||||
const progressBarStatus = computed(() => {
|
||||
const key = String(props.taskStatus || '').trim().toLowerCase()
|
||||
if (['failed', 'error', 'exception', 'timeout', 'not_found'].includes(key)) return 'exception'
|
||||
if (['success', 'finished', 'fin'].includes(key) || normalizedProgressPercent.value >= 100) return 'success'
|
||||
return undefined
|
||||
})
|
||||
|
||||
const submitButtonText = computed(() => {
|
||||
if (props.mode === 'cancel') return '确认取消'
|
||||
if (props.requestId) return '处理中'
|
||||
return '开始分配'
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.storage-allocate-progress {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.storage-allocate-progress__meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 12px;
|
||||
margin-top: 8px;
|
||||
color: #606266;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.storage-allocate-progress__message {
|
||||
margin-top: 6px;
|
||||
color: #606266;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, watch, onMounted, computed } from 'vue'
|
||||
import { ref, watch, onMounted, computed, markRaw } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { orderBadgeCount } from '@/api/order.index/orderindex'
|
||||
@ -76,49 +76,49 @@ const tabs = ref<OrderTabItem[]>([
|
||||
name: 'reviewOrder',
|
||||
label: '待审核订单',
|
||||
count: 5,
|
||||
component: ReviewOrder
|
||||
component: markRaw(ReviewOrder)
|
||||
},
|
||||
{
|
||||
name: 'pendingOrder',
|
||||
label: '待处理订单',
|
||||
count: 10,
|
||||
component: PendingOrder
|
||||
component: markRaw(PendingOrder)
|
||||
},
|
||||
{
|
||||
name: 'exceptionOrder',
|
||||
label: '待处理异常订单',
|
||||
count: 3,
|
||||
component: ExceptionOrder
|
||||
component: markRaw(ExceptionOrder)
|
||||
},
|
||||
{
|
||||
name: 'outboundOrder',
|
||||
label: '待出库订单',
|
||||
count: 0,
|
||||
component: OutboundOrder
|
||||
component: markRaw(OutboundOrder)
|
||||
},
|
||||
{
|
||||
name: 'entrustWarehouse',
|
||||
label: '委托外仓订单',
|
||||
count: 0,
|
||||
component: EntrustWarehouse
|
||||
component: markRaw(EntrustWarehouse)
|
||||
},
|
||||
{
|
||||
name: 'deliveryOrder',
|
||||
label: '配送订单',
|
||||
count: 0,
|
||||
component: DeliveryOrder
|
||||
component: markRaw(DeliveryOrder)
|
||||
},
|
||||
{
|
||||
name: 'deliveryException',
|
||||
label: '配送异常订单',
|
||||
count: 0,
|
||||
component: DeliveryException
|
||||
component: markRaw(DeliveryException)
|
||||
},
|
||||
{
|
||||
name: 'archiveOrder',
|
||||
label: '归档订单',
|
||||
count: 0,
|
||||
component: ArchiveOrder
|
||||
component: markRaw(ArchiveOrder)
|
||||
}
|
||||
])
|
||||
|
||||
|
||||
@ -171,7 +171,7 @@ import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { orderOutboundOrder } from '@/api/order.outboundorder/orderoutboundOrder'
|
||||
import { orderOutboundOrder } from '@/api/order.outboundOrder/orderoutboundOrder'
|
||||
import {
|
||||
outboundAvailableFields,
|
||||
outboundColumns,
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
width="320px"
|
||||
:tree-props="{ children: 'children', label: 'label' }"
|
||||
:auto-submit="false"
|
||||
:initial-conditions="initialConditions"
|
||||
:preset-tree="presetTree"
|
||||
:available-fields="availableFieldsRef"
|
||||
@condition-change="handleConditionChange"
|
||||
@ -186,6 +187,13 @@
|
||||
:mode="storageDialogMode"
|
||||
:order-count="storagePendingOrderIds.length"
|
||||
:loading="storageAllocateLoading"
|
||||
:request-id="storageAllocateRequestId"
|
||||
:task-status="storageAllocateTaskStatus"
|
||||
:progress-percent="storageAllocateProgressPercent"
|
||||
:total-count="storageAllocateTotalCount"
|
||||
:success-count="storageAllocateSuccessCount"
|
||||
:failed-count="storageAllocateFailedCount"
|
||||
:message="storageAllocateMessage"
|
||||
@closed="resetStorageAllocateDialog"
|
||||
@submit="submitStorageAllocate"
|
||||
/>
|
||||
@ -223,10 +231,11 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted, computed } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
|
||||
import {
|
||||
@ -256,6 +265,7 @@ import { safeInvoke } from '@/utils/safe-invoke'
|
||||
const scanBox = ref<any>(null)
|
||||
const upperTable = ref<any>(null)
|
||||
const scrollContainerRef = ref<HTMLElement | null>(null)
|
||||
const route = useRoute()
|
||||
|
||||
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
||||
defaultLowerPercent: 38,
|
||||
@ -289,6 +299,22 @@ const detailVisible = ref(true)
|
||||
|
||||
const quickSearch = ref('')
|
||||
const toolbarButtons = pendingToolbarButtons
|
||||
const initialConditions = computed(() => {
|
||||
const waveNo = String(route.query.wave_no || '').trim()
|
||||
if (!waveNo) return undefined
|
||||
|
||||
return {
|
||||
type: 'custom',
|
||||
conditions: {
|
||||
wave_no: {
|
||||
field: 'wave_no',
|
||||
type: 'text',
|
||||
operator: 'eq',
|
||||
value: waveNo
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Toolbar 滚动与拖拽逻辑
|
||||
const isDragging = ref(false)
|
||||
@ -358,6 +384,14 @@ async function loadData() {
|
||||
const start = Date.now()
|
||||
|
||||
let where = buildWhereConditions(scanBox.value?.getConditions?.() || {})
|
||||
const routeWaveNo = String(route.query.wave_no || '').trim()
|
||||
if (routeWaveNo) {
|
||||
where.wave_no = {
|
||||
operator: 'eq',
|
||||
value: routeWaveNo,
|
||||
type: 'text'
|
||||
}
|
||||
}
|
||||
if (quickSearch.value) {
|
||||
where.delivery_order_code = {
|
||||
operator: 'like',
|
||||
@ -496,6 +530,13 @@ const {
|
||||
storagePendingOrderIds,
|
||||
storageAllocateLoading,
|
||||
storageForm,
|
||||
storageAllocateRequestId,
|
||||
storageAllocateTaskStatus,
|
||||
storageAllocateProgressPercent,
|
||||
storageAllocateTotalCount,
|
||||
storageAllocateSuccessCount,
|
||||
storageAllocateFailedCount,
|
||||
storageAllocateMessage,
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
|
||||
@ -145,7 +145,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { orderReviewOrder } from '@/api/order.revieworder/orderreviewOrder'
|
||||
import { orderReviewOrder } from '@/api/order.reviewOrder/orderreviewOrder'
|
||||
|
||||
import {
|
||||
reviewAvailableFields,
|
||||
|
||||
@ -222,6 +222,29 @@ function buildAllocateExpressPayload(rows: any[]): Array<Record<string, any>> {
|
||||
return out
|
||||
}
|
||||
|
||||
function normalizeAsyncTaskStatus(value: unknown) {
|
||||
return String(value ?? '').trim().toLowerCase()
|
||||
}
|
||||
|
||||
function isAsyncTaskSuccessStatus(status: string) {
|
||||
return ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete'].includes(status)
|
||||
}
|
||||
|
||||
function isAsyncTaskFailureStatus(status: string) {
|
||||
return ['failed', 'failure', 'error', 'exception', 'cancel', 'cancelled', 'canceled', 'timeout', 'not_found'].includes(status)
|
||||
}
|
||||
|
||||
function sleep(ms: number) {
|
||||
return new Promise((resolve) => {
|
||||
setTimeout(resolve, ms)
|
||||
})
|
||||
}
|
||||
|
||||
function getApiResponsePayload<T = Record<string, any>>(response: any): T {
|
||||
if (response?.data && typeof response.data === 'object') return response.data as T
|
||||
return (response || {}) as T
|
||||
}
|
||||
|
||||
export function createPendingToolbarController(params: {
|
||||
loadData: () => Promise<void>
|
||||
handleExport: () => Promise<void>
|
||||
@ -246,6 +269,13 @@ export function createPendingToolbarController(params: {
|
||||
const storagePendingOrderIds = ref<Array<number | string>>([])
|
||||
const storageAllocateLoading = ref(false)
|
||||
const storageForm = reactive({ allowStorageLocation: false })
|
||||
const storageAllocateRequestId = ref('')
|
||||
const storageAllocateTaskStatus = ref('')
|
||||
const storageAllocateProgressPercent = ref(0)
|
||||
const storageAllocateTotalCount = ref(0)
|
||||
const storageAllocateSuccessCount = ref(0)
|
||||
const storageAllocateFailedCount = ref(0)
|
||||
const storageAllocateMessage = ref('')
|
||||
|
||||
const updateOrderMetaDialogVisible = ref(false)
|
||||
const updateOrderMetaDialogMode = ref<'express' | 'platform'>('express')
|
||||
@ -303,9 +333,26 @@ export function createPendingToolbarController(params: {
|
||||
storageDialogMode.value = mode
|
||||
storagePendingOrderIds.value = [...ids]
|
||||
storageForm.allowStorageLocation = false
|
||||
storageAllocateRequestId.value = ''
|
||||
storageAllocateTaskStatus.value = ''
|
||||
storageAllocateProgressPercent.value = 0
|
||||
storageAllocateTotalCount.value = 0
|
||||
storageAllocateSuccessCount.value = 0
|
||||
storageAllocateFailedCount.value = 0
|
||||
storageAllocateMessage.value = ''
|
||||
storageDialogVisible.value = true
|
||||
}
|
||||
|
||||
function applyStorageAllocateProgress(progress: Record<string, any>, fallbackRequestId = '') {
|
||||
storageAllocateRequestId.value = String(progress.request_id || fallbackRequestId || storageAllocateRequestId.value || '')
|
||||
storageAllocateTaskStatus.value = normalizeAsyncTaskStatus(progress.status)
|
||||
storageAllocateProgressPercent.value = Number(progress.progress_percent ?? storageAllocateProgressPercent.value ?? 0) || 0
|
||||
storageAllocateTotalCount.value = Number(progress.total_count ?? progress.result?.total_count ?? storageAllocateTotalCount.value ?? 0) || 0
|
||||
storageAllocateSuccessCount.value = Number(progress.success_count ?? progress.updated_count ?? progress.result?.updated_count ?? storageAllocateSuccessCount.value ?? 0) || 0
|
||||
storageAllocateFailedCount.value = Number(progress.failed_count ?? progress.result?.failed_count ?? storageAllocateFailedCount.value ?? 0) || 0
|
||||
storageAllocateMessage.value = String(progress.error || progress.message || '')
|
||||
}
|
||||
|
||||
async function submitStorageAllocate() {
|
||||
const order_ids = [...storagePendingOrderIds.value]
|
||||
if (!order_ids.length || storageAllocateLoading.value) return
|
||||
@ -323,9 +370,69 @@ export function createPendingToolbarController(params: {
|
||||
ElMessage.error(res?.message || (isCancel ? '取消分配储位失败' : '储位分配失败'))
|
||||
return
|
||||
}
|
||||
ElMessage.success(res.message || (isCancel ? '取消分配储位已提交' : '储位分配已提交'))
|
||||
storageDialogVisible.value = false
|
||||
|
||||
if (isCancel) {
|
||||
ElMessage.success(res.message || '取消分配储位已提交')
|
||||
storageDialogVisible.value = false
|
||||
params.clearSelection()
|
||||
await params.loadData()
|
||||
return
|
||||
}
|
||||
|
||||
const acceptedPayload = getApiResponsePayload<{ request_id?: string }>(res)
|
||||
const requestId = String(acceptedPayload.request_id || res?.request_id || '').trim()
|
||||
if (!requestId) {
|
||||
ElMessage.success(res.message || '储位分配已提交')
|
||||
storageDialogVisible.value = false
|
||||
params.clearSelection()
|
||||
await params.loadData()
|
||||
return
|
||||
}
|
||||
|
||||
applyStorageAllocateProgress({
|
||||
request_id: requestId,
|
||||
status: 'submitted',
|
||||
progress_percent: 0,
|
||||
total_count: order_ids.length,
|
||||
success_count: 0,
|
||||
failed_count: 0,
|
||||
message: res.message || '储位分配任务已受理'
|
||||
}, requestId)
|
||||
|
||||
ElMessage.success((res.message || '储位分配任务已受理') + `(任务ID: ${requestId})`)
|
||||
params.clearSelection()
|
||||
|
||||
const pollProgress = async () => {
|
||||
let latestPayload: Record<string, any> = {}
|
||||
for (let attempt = 0; attempt < 120; attempt += 1) {
|
||||
const progressRes = await params.pendingApi.allocateStorageProgress({ request_id: requestId })
|
||||
const progressOk = progressRes && (progressRes.code === 1 || progressRes.code === 200 || progressRes.flag === 'success')
|
||||
if (!progressOk) {
|
||||
throw new Error(progressRes?.message || '查询储位分配进度失败')
|
||||
}
|
||||
latestPayload = getApiResponsePayload(progressRes)
|
||||
applyStorageAllocateProgress(latestPayload, requestId)
|
||||
const status = normalizeAsyncTaskStatus(latestPayload.status)
|
||||
if (isAsyncTaskSuccessStatus(status)) {
|
||||
return latestPayload
|
||||
}
|
||||
if (isAsyncTaskFailureStatus(status)) {
|
||||
throw new Error(String(latestPayload.error || latestPayload.message || '储位分配失败'))
|
||||
}
|
||||
await sleep(1500)
|
||||
}
|
||||
return latestPayload
|
||||
}
|
||||
|
||||
const progressPayload = await pollProgress()
|
||||
const updatedCount = Number(
|
||||
progressPayload.updated_count
|
||||
?? progressPayload.success_count
|
||||
?? progressPayload.result?.updated_count
|
||||
?? order_ids.length
|
||||
) || order_ids.length
|
||||
ElMessage.success(`储位分配完成 ${updatedCount} 条`)
|
||||
storageDialogVisible.value = false
|
||||
await params.loadData()
|
||||
} catch {
|
||||
ElMessage.error(isCancel ? '取消分配储位失败' : '储位分配失败')
|
||||
@ -515,6 +622,13 @@ export function createPendingToolbarController(params: {
|
||||
storageDialogMode.value = 'allocate'
|
||||
storagePendingOrderIds.value = []
|
||||
storageForm.allowStorageLocation = false
|
||||
storageAllocateRequestId.value = ''
|
||||
storageAllocateTaskStatus.value = ''
|
||||
storageAllocateProgressPercent.value = 0
|
||||
storageAllocateTotalCount.value = 0
|
||||
storageAllocateSuccessCount.value = 0
|
||||
storageAllocateFailedCount.value = 0
|
||||
storageAllocateMessage.value = ''
|
||||
}
|
||||
|
||||
function resetUpdateOrderMetaDialog() {
|
||||
@ -540,6 +654,13 @@ export function createPendingToolbarController(params: {
|
||||
storagePendingOrderIds,
|
||||
storageAllocateLoading,
|
||||
storageForm,
|
||||
storageAllocateRequestId,
|
||||
storageAllocateTaskStatus,
|
||||
storageAllocateProgressPercent,
|
||||
storageAllocateTotalCount,
|
||||
storageAllocateSuccessCount,
|
||||
storageAllocateFailedCount,
|
||||
storageAllocateMessage,
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
|
||||
@ -94,9 +94,9 @@
|
||||
<!-- 管理标识 -->
|
||||
<el-form-item label="管理标识">
|
||||
<el-checkbox-group v-model="formData.managementFlags" class="management-flags">
|
||||
<el-checkbox label="is_sn_mgmt" title="开启后商品执行一物一码出库,不能进团购波次,打包需要扫描商品SN码">序列号管理</el-checkbox>
|
||||
<el-checkbox label="is_shelf_life_mgmt">保质期管理</el-checkbox>
|
||||
<el-checkbox label="is_batch_mgmt">批次管理</el-checkbox>
|
||||
<el-checkbox value="is_sn_mgmt" title="开启后商品执行一物一码出库,不能进团购波次,打包需要扫描商品SN码">序列号管理</el-checkbox>
|
||||
<el-checkbox value="is_shelf_life_mgmt">保质期管理</el-checkbox>
|
||||
<el-checkbox value="is_batch_mgmt">批次管理</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
@ -111,7 +111,7 @@ async function fetchStockInfo() {
|
||||
const response: any = await stockApi.getStoreStocks({
|
||||
stock_id: props.id
|
||||
})
|
||||
console.log(response)
|
||||
// console.log(response)
|
||||
if (response.code == 200) {
|
||||
tableData.value = response.data.rows
|
||||
store_id.value = response.data.store_id
|
||||
|
||||
@ -132,9 +132,9 @@
|
||||
<!-- 管理标识 -->
|
||||
<el-form-item label="管理标识">
|
||||
<el-checkbox-group v-model="formData.managementFlags" class="management-flags">
|
||||
<el-checkbox label="is_sn_mgmt" title="开启后商品执行一物一码出库,不能进团购波次,打包需要扫描商品SN码">序列号管理</el-checkbox>
|
||||
<el-checkbox label="is_shelf_life_mgmt">保质期管理</el-checkbox>
|
||||
<el-checkbox label="is_batch_mgmt">批次管理</el-checkbox>
|
||||
<el-checkbox value="is_sn_mgmt" title="开启后商品执行一物一码出库,不能进团购波次,打包需要扫描商品SN码">序列号管理</el-checkbox>
|
||||
<el-checkbox value="is_shelf_life_mgmt">保质期管理</el-checkbox>
|
||||
<el-checkbox value="is_batch_mgmt">批次管理</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
|
||||
@ -695,7 +695,7 @@ const formRules = reactive<FormRules>({
|
||||
|
||||
// 监听器
|
||||
watch(() => props.id, (newVal) => {
|
||||
console.log("info stockId Change", newVal)
|
||||
// console.log("info stockId Change", newVal)
|
||||
if (newVal) {
|
||||
fetchStockInfo(newVal)
|
||||
} else {
|
||||
@ -743,6 +743,52 @@ onMounted(() => {
|
||||
})
|
||||
|
||||
// 方法
|
||||
/** API 常把金额/尺寸等序列化为字符串,el-input-number 需要 number */
|
||||
function toFiniteNumber(v: unknown, fallback = 0): number {
|
||||
if (v === null || v === undefined || v === '') return fallback
|
||||
if (typeof v === 'number' && Number.isFinite(v)) return v
|
||||
const n = Number(v)
|
||||
return Number.isFinite(n) ? n : fallback
|
||||
}
|
||||
|
||||
function normalizeStockInfoFormNumbers() {
|
||||
formData.tag_price = toFiniteNumber(formData.tag_price, 0)
|
||||
formData.retail_price = toFiniteNumber(formData.retail_price, 0)
|
||||
formData.gross_weight = toFiniteNumber(formData.gross_weight, 0)
|
||||
formData.net_weight = toFiniteNumber(formData.net_weight, 0)
|
||||
formData.length = toFiniteNumber(formData.length, 0)
|
||||
formData.width = toFiniteNumber(formData.width, 0)
|
||||
formData.height = toFiniteNumber(formData.height, 0)
|
||||
formData.volume = toFiniteNumber(formData.volume, 0)
|
||||
formData.shelf_life_days = toFiniteNumber(formData.shelf_life_days, 0)
|
||||
formData.inbound_min_days = toFiniteNumber(formData.inbound_min_days, 0)
|
||||
formData.outbound_min_days = toFiniteNumber(formData.outbound_min_days, 0)
|
||||
formData.remaining_threshold_days = toFiniteNumber(formData.remaining_threshold_days, 0)
|
||||
formData.quantity_per_box = toFiniteNumber(formData.quantity_per_box, 0)
|
||||
formData.box_gross_weight = toFiniteNumber(formData.box_gross_weight, 0)
|
||||
formData.box_net_weight = toFiniteNumber(formData.box_net_weight, 0)
|
||||
formData.box_length = toFiniteNumber(formData.box_length, 0)
|
||||
formData.box_width = toFiniteNumber(formData.box_width, 0)
|
||||
formData.box_height = toFiniteNumber(formData.box_height, 0)
|
||||
formData.box_volume = toFiniteNumber(formData.box_volume, 0)
|
||||
const rawStore = formData.store_id as unknown
|
||||
if (rawStore != null && rawStore !== '') {
|
||||
const sid = Number(rawStore)
|
||||
formData.store_id = Number.isFinite(sid) ? sid : undefined
|
||||
}
|
||||
const rawProhibited = formData.prohibited_id as unknown
|
||||
if (rawProhibited === null || rawProhibited === undefined || rawProhibited === '') {
|
||||
formData.prohibited_id = undefined
|
||||
} else {
|
||||
const pid = Number(rawProhibited)
|
||||
formData.prohibited_id = Number.isFinite(pid) ? pid : undefined
|
||||
}
|
||||
if (formData.id != null) {
|
||||
const id = Number(formData.id)
|
||||
formData.id = Number.isFinite(id) ? id : undefined
|
||||
}
|
||||
}
|
||||
|
||||
function totalVolume(length: number, width: number, height: number) {
|
||||
if (length && width && height) {
|
||||
// 将厘米转换为米计算体积
|
||||
@ -798,14 +844,15 @@ async function fetchStockInfo(stockId: number) {
|
||||
loading.value = true
|
||||
try {
|
||||
const response: any = await stockApi.getInfo(stockId)
|
||||
console.log(response)
|
||||
// console.log(response)
|
||||
if (response.code == 200) {
|
||||
const mockData = response.data
|
||||
originalData.value = JSON.parse(JSON.stringify(mockData))
|
||||
|
||||
// 更新表单数据
|
||||
Object.assign(formData, baseFormData, originalData.value)
|
||||
console.log('formData', formData)
|
||||
normalizeStockInfoFormNumbers()
|
||||
// console.log('formData', formData)
|
||||
updateManagementFlags()
|
||||
} else {
|
||||
throw new Error(response.message || '请求失败')
|
||||
@ -876,6 +923,7 @@ async function handleSave() {
|
||||
ElMessage.success('保存成功')
|
||||
originalData.value = JSON.parse(JSON.stringify(response.data))
|
||||
Object.assign(formData, baseFormData, originalData.value)
|
||||
normalizeStockInfoFormNumbers()
|
||||
updateManagementFlags()
|
||||
} else {
|
||||
throw new Error(response.message || '请求失败')
|
||||
@ -899,6 +947,7 @@ function resetForm() {
|
||||
}
|
||||
if (Object.keys(originalData.value).length > 0) {
|
||||
Object.assign(formData, originalData.value)
|
||||
normalizeStockInfoFormNumbers()
|
||||
updateManagementFlags()
|
||||
}
|
||||
ElMessage.info('表单已重置')
|
||||
@ -1003,7 +1052,7 @@ function openProhibitedDrawer() {
|
||||
}
|
||||
|
||||
function handleCustomChange(value: any) {
|
||||
console.log('违禁品类型变更:', value)
|
||||
// console.log('违禁品类型变更:', value)
|
||||
}
|
||||
|
||||
async function handleAddProhibited() {
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
<el-pagination
|
||||
v-if="pagination.total > 0"
|
||||
class="pagination"
|
||||
small
|
||||
size="small"
|
||||
background
|
||||
layout="total, prev, pager, next"
|
||||
:total="pagination.total"
|
||||
|
||||
@ -116,7 +116,7 @@ async function loadEntryDetail() {
|
||||
if (!props.id) return
|
||||
loading.value = true
|
||||
try {
|
||||
console.log('加载入库单详情, ID:', props.id)
|
||||
// console.log('加载入库单详情, ID:', props.id)
|
||||
|
||||
const res = await entryApi.getEntryDetail({
|
||||
id: props.id
|
||||
|
||||
@ -21,7 +21,7 @@ export const availableFields = [
|
||||
{ label: 'B2B入库', value: 'B2BRK' },
|
||||
{ label: '虚拟入库', value: 'XNRK' },
|
||||
]},
|
||||
{ label: '同步状态', value: 'sync_status', type: 'select', options: [
|
||||
{ label: '入库状态', value: 'sync_status', type: 'select', options: [
|
||||
{ label: '待推送', value: 'PENDING' },
|
||||
{ label: '推送中', value: 'SYNCING' },
|
||||
{ label: '成功', value: 'SUCCESS' },
|
||||
@ -53,7 +53,7 @@ export const entryColums = [
|
||||
{ prop: 'purchase_order_code',label:'单据编号 ',width:'160' },
|
||||
{ prop: 'total_order_lines',label:'商品数',width:'160', sortable: 'custom' },
|
||||
{ prop: 'order_status',label:'订单状态',width:'160' },
|
||||
{ prop: 'sync_status',label:'同步状态',width:'160' },
|
||||
{ prop: 'sync_status',label:'入库状态',width:'160' },
|
||||
{ prop: 'supplier_code',label:'供应商编码',width:'160' },
|
||||
{ prop: 'supplier_name',label:'供应商名称',width:'160' },
|
||||
{ prop: '',label:'',width:'160' },
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
<div class="left-actions">
|
||||
<el-button size="small" @click="loadProductData">刷新</el-button>
|
||||
<el-radio-group v-model="matchFilter" size="small" class="match-filter-group">
|
||||
<el-radio-button label="all">全部</el-radio-button>
|
||||
<el-radio-button label="matched">已匹配</el-radio-button>
|
||||
<el-radio-button label="unmatched">未匹配</el-radio-button>
|
||||
<el-radio-button value="all">全部</el-radio-button>
|
||||
<el-radio-button value="matched">已匹配</el-radio-button>
|
||||
<el-radio-button value="unmatched">未匹配</el-radio-button>
|
||||
</el-radio-group>
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -96,13 +96,6 @@
|
||||
>
|
||||
快速关联
|
||||
</el-button>
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="small"
|
||||
style="margin-left:8px"
|
||||
@click="openAddDrawer"
|
||||
>添加商品</el-button> -->
|
||||
</template>
|
||||
|
||||
<template #column-product_name="{ row }">
|
||||
@ -279,7 +272,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onUnmounted, computed, reactive, watch, nextTick } from 'vue'
|
||||
import { ref, onMounted, onUnmounted, computed, reactive, watch } from 'vue'
|
||||
import { productdetail, productquick, productsnapshop, windowtopbar, formatProductStorageStatus } from '../receiving-config'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { FullScreen, Close, CopyDocument, Search } from '@element-plus/icons-vue'
|
||||
|
||||
@ -93,6 +93,17 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-actions="{ row }">
|
||||
<el-button
|
||||
type="success"
|
||||
link
|
||||
size="small"
|
||||
@click.stop="openMatchPutawayDialog(row)"
|
||||
>
|
||||
匹配入库
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">暂无收货单</div>
|
||||
</template>
|
||||
@ -284,11 +295,124 @@
|
||||
<el-button size="small" type="warning" :loading="rejectLoading" @click="submitRejectReceiving">确认驳回</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 匹配入库:选择入库单后与当前行收货单执行 storage.inventory.matchPutaway -->
|
||||
<el-dialog
|
||||
v-model="matchPutawayDialogVisible"
|
||||
title="匹配入库 — 选择入库单"
|
||||
width="780px"
|
||||
align-center
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
@closed="resetMatchPutawayDialog"
|
||||
>
|
||||
<div class="match-putaway-dialog">
|
||||
<p v-if="matchPutawayContextHint" class="match-hint">{{ matchPutawayContextHint }}</p>
|
||||
<p class="match-desc">
|
||||
请选择与当前收货单对应的入库单(可多选)。接口将按商品维度匹配数量;收货单需已完成且已审核。
|
||||
</p>
|
||||
<el-form :inline="true" size="small" class="match-entry-filters">
|
||||
<el-form-item label="货主">
|
||||
<el-select
|
||||
v-model="matchEntryFilterStoreId"
|
||||
placeholder="全部"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 200px"
|
||||
@change="onMatchEntryFilterChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="s in matchEntryStoreOptions"
|
||||
:key="String(s.value)"
|
||||
:label="s.label"
|
||||
:value="s.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库状态">
|
||||
<el-select
|
||||
v-model="matchEntryFilterOrderStatus"
|
||||
placeholder="全部"
|
||||
clearable
|
||||
style="width: 170px"
|
||||
@change="onMatchEntryFilterChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="o in ENTRY_ORDER_STATUS_OPTIONS"
|
||||
:key="o.value"
|
||||
:label="o.label"
|
||||
:value="o.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="matchEntryListLoading" @click="fetchMatchEntryList">查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table
|
||||
ref="matchEntryTableRef"
|
||||
:data="matchEntryList"
|
||||
v-loading="matchEntryListLoading"
|
||||
max-height="380"
|
||||
border
|
||||
size="small"
|
||||
row-key="id"
|
||||
@selection-change="onMatchEntrySelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="48" />
|
||||
<el-table-column prop="entry_order_code" label="入库单号" min-width="170" show-overflow-tooltip />
|
||||
<el-table-column label="货主" min-width="120" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
{{ row.store_name || row.store?.store_remask || row.store?.name || '--' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入库状态" width="120" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="entryOrderStatusTag(row.order_status)">
|
||||
{{ entryOrderStatusLabel(row.order_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div class="match-entry-pager">
|
||||
<el-pagination
|
||||
:current-page="matchEntryPagination.page"
|
||||
:page-size="matchEntryPagination.pageSize"
|
||||
:total="matchEntryPagination.total"
|
||||
:page-sizes="[10, 20, 50]"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
small
|
||||
background
|
||||
@current-change="handleMatchEntryPageChange"
|
||||
@size-change="handleMatchEntryPageSizeChange"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="match-putaway-footer">
|
||||
<span class="match-selection-tip">已选 {{ matchEntrySelectedRows.length }} 条入库单</span>
|
||||
<div>
|
||||
<el-button size="small" @click="matchPutawayDialogVisible = false">取消</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="primary"
|
||||
:loading="matchPutawaySubmitLoading"
|
||||
:disabled="!matchEntrySelectedRows.length"
|
||||
@click="submitMatchPutaway"
|
||||
>
|
||||
确认匹配入库
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted, computed, watch, h } from 'vue'
|
||||
import { ref, reactive, onMounted, computed, watch, h, nextTick } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
@ -299,6 +423,8 @@ import Logs from './component/Logs.vue'
|
||||
import Product from './component/Product.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import * as receivingApi from '@/api/storage_receiving/receiving'
|
||||
import * as entryApi from '@/api/storage.entry/entry'
|
||||
import * as inventoryApi from '@/api/storage.inventory/inventory'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import {
|
||||
receivingColumns,
|
||||
@ -312,7 +438,7 @@ import {
|
||||
printFormConfig,
|
||||
addReceivingFields
|
||||
} from './receiving-config'
|
||||
import * as templateApi from '@/api/setting.printtemplate/printTemplate'
|
||||
import * as templateApi from '@/api/setting.printTemplate/printTemplate'
|
||||
|
||||
import * as stationApi from '@/api/print/print'
|
||||
import JsBarcode from 'jsbarcode'
|
||||
@ -418,7 +544,7 @@ async function loadData() {
|
||||
try {
|
||||
// 直接使用 handleConditionChange 保存的完整条件(含 operator),避免丢失操作符信息
|
||||
const where = currentCondition.value || {}
|
||||
console.log('当前筛选条件:', where)
|
||||
// console.log('当前筛选条件:', where)
|
||||
|
||||
const params: any = {
|
||||
pagination: { page: pagination.currentPage, pageSize: pagination.pageSize },
|
||||
@ -432,7 +558,7 @@ async function loadData() {
|
||||
|
||||
const res: any = await receivingApi.getReceivingList(params)
|
||||
if (res && res.code === 200) {
|
||||
console.log('API 返回数据:', res.data.list)
|
||||
// console.log('API 返回数据:', res.data.list)
|
||||
list.value = formatReceivingData(res.data.list || [])
|
||||
pagination.currentPage = res.data.pagination?.currentPage || pagination.currentPage
|
||||
pagination.pageSize = res.data.pagination?.pageSize || pagination.pageSize
|
||||
@ -461,7 +587,7 @@ async function loadFilterData() {
|
||||
if (af) af.options = stores
|
||||
}
|
||||
if (presetRes && presetRes.code === 200) {
|
||||
console.log('筛选配置', presetRes)
|
||||
// console.log('筛选配置', presetRes)
|
||||
presetTree.value = presetRes.presetTree || []
|
||||
}
|
||||
} catch (e) {
|
||||
@ -731,7 +857,7 @@ async function submitCreateReceiving() {
|
||||
createLoading.value = true
|
||||
try {
|
||||
const res: any = await receivingApi.createReceiving(createForm)
|
||||
console.log('新建收货单返回结果:', res)
|
||||
// console.log('新建收货单返回结果:', res)
|
||||
if (res && res.code === 200) {
|
||||
ElMessage.success('新建收货单成功')
|
||||
createDialogVisible.value = false
|
||||
@ -1092,10 +1218,10 @@ async function confirmcomplete() {
|
||||
await ElMessageBox.confirm(`确定要批量完成 ${selectionRows.value.length} 个收货单的收货吗?`, '确认完成', { type: 'success' })
|
||||
|
||||
for (const row of selectionRows.value) {
|
||||
console.log('正在执行完成收货,请求数据:', { id: row.id, type: 'complete' })
|
||||
// console.log('正在执行完成收货,请求数据:', { id: row.id, type: 'complete' })
|
||||
// 传递 id 标识单号,以及 type: 'complete' 来表示完成收货操作(补全请求数据)
|
||||
const res: any = await receivingApi.completeReceiving({ id: row.id, type: 'complete' })
|
||||
console.log('完成收货接口返回数据:', res)
|
||||
// console.log('完成收货接口返回数据:', res)
|
||||
|
||||
if (res && res.code === 200) {
|
||||
ElMessage.success(`收货单 ${row.receiving_number} 已完成`)
|
||||
@ -1218,6 +1344,234 @@ async function submitRejectReceiving() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 入库单列表 order_status,与 storage.entry.list 一致 */
|
||||
const ENTRY_ORDER_STATUS_OPTIONS = [
|
||||
{ label: '已创建', value: 'CREATED' },
|
||||
{ label: '待入库', value: 'PENDING' },
|
||||
{ label: '入库中', value: 'PARTIAL' },
|
||||
{ label: '部分收货', value: 'PARTIAL_RECEIVED' },
|
||||
{ label: '已完成', value: 'COMPLETED' },
|
||||
{ label: '已取消', value: 'CANCELLED' }
|
||||
]
|
||||
|
||||
const matchPutawayDialogVisible = ref(false)
|
||||
const matchPutawayReceivingRow = ref<any>(null)
|
||||
const matchPutawayContextHint = ref('')
|
||||
const matchEntryList = ref<any[]>([])
|
||||
const matchEntryListLoading = ref(false)
|
||||
const matchEntryStoreOptions = ref<any[]>([])
|
||||
/** 货主筛选值,与选项 value 同类型(一般为 number) */
|
||||
const matchEntryFilterStoreId = ref<number | string | undefined>(undefined)
|
||||
const matchEntryFilterOrderStatus = ref('')
|
||||
const matchEntryPagination = reactive({ page: 1, pageSize: 10, total: 0 })
|
||||
const matchEntrySelectedRows = ref<any[]>([])
|
||||
const matchEntryTableRef = ref<any>(null)
|
||||
const matchPutawaySubmitLoading = ref(false)
|
||||
|
||||
function entryOrderStatusLabel(status: string) {
|
||||
const o = ENTRY_ORDER_STATUS_OPTIONS.find(i => i.value === status)
|
||||
return o?.label || status || '--'
|
||||
}
|
||||
|
||||
function entryOrderStatusTag(status: string) {
|
||||
const map: Record<string, string> = {
|
||||
CREATED: 'info',
|
||||
PENDING: 'warning',
|
||||
PARTIAL: 'primary',
|
||||
PARTIAL_RECEIVED: 'primary',
|
||||
COMPLETED: 'success',
|
||||
CANCELLED: 'danger'
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 index.loadStores / ScanBox 等处的货主项统一为下拉可用的 { value, label }。
|
||||
* 兼容 { value, label }、{ id, store_remask }、{ store_id, store_name } 等形态。
|
||||
*/
|
||||
function normalizeStoreOptionsForSelect(stores: any[]): { value: number; label: string }[] {
|
||||
if (!Array.isArray(stores)) return []
|
||||
const out: { value: number; label: string }[] = []
|
||||
for (const s of stores) {
|
||||
const rawVal = s?.value ?? s?.id ?? s?.store_id
|
||||
if (rawVal === undefined || rawVal === null || rawVal === '') continue
|
||||
const num = typeof rawVal === 'number' ? rawVal : Number(rawVal)
|
||||
const value = Number.isFinite(num) ? num : (rawVal as number)
|
||||
const label =
|
||||
(s?.label != null && String(s.label).trim() !== '' && String(s.label)) ||
|
||||
(s?.store_remask != null && String(s.store_remask)) ||
|
||||
(s?.name != null && String(s.name)) ||
|
||||
(s?.store_name != null && String(s.store_name)) ||
|
||||
String(value)
|
||||
out.push({ value: value as number, label })
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
async function ensureMatchEntryStores() {
|
||||
const storeField = availableFieldsRef.find((i: any) => i.value === 'store_id')
|
||||
const fromScan = Array.isArray(storeField?.options) ? storeField.options : []
|
||||
if (fromScan.length) {
|
||||
matchEntryStoreOptions.value = normalizeStoreOptionsForSelect(fromScan)
|
||||
return
|
||||
}
|
||||
if (matchEntryStoreOptions.value.length) return
|
||||
try {
|
||||
const res: any = await indexApi.loadStores({ type: 'receiving' })
|
||||
if (res && res.code === 200) {
|
||||
const raw = res.stores ?? res.data?.stores ?? []
|
||||
matchEntryStoreOptions.value = normalizeStoreOptionsForSelect(raw)
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('加载货主列表失败', e)
|
||||
}
|
||||
}
|
||||
|
||||
function resetMatchPutawayDialog() {
|
||||
matchPutawayReceivingRow.value = null
|
||||
matchPutawayContextHint.value = ''
|
||||
matchEntryList.value = []
|
||||
matchEntrySelectedRows.value = []
|
||||
matchEntryFilterStoreId.value = undefined
|
||||
matchEntryFilterOrderStatus.value = ''
|
||||
matchEntryPagination.page = 1
|
||||
matchEntryPagination.total = 0
|
||||
}
|
||||
|
||||
async function openMatchPutawayDialog(row: any) {
|
||||
if (!row?.id) {
|
||||
ElMessage.warning('缺少收货单信息')
|
||||
return
|
||||
}
|
||||
matchPutawayReceivingRow.value = row
|
||||
matchPutawayContextHint.value = `收货单:${row.receiving_number || row.id}`
|
||||
matchPutawayDialogVisible.value = true
|
||||
await ensureMatchEntryStores()
|
||||
const sid = row.store_id
|
||||
if (sid != null && sid !== '') {
|
||||
const n = Number(sid)
|
||||
matchEntryFilterStoreId.value = Number.isFinite(n) ? n : sid
|
||||
} else {
|
||||
matchEntryFilterStoreId.value = undefined
|
||||
}
|
||||
matchEntryFilterOrderStatus.value = ''
|
||||
matchEntryPagination.page = 1
|
||||
matchEntrySelectedRows.value = []
|
||||
await fetchMatchEntryList()
|
||||
}
|
||||
|
||||
function onMatchEntryFilterChange() {
|
||||
matchEntryPagination.page = 1
|
||||
fetchMatchEntryList()
|
||||
}
|
||||
|
||||
function handleMatchEntryPageChange(page: number) {
|
||||
matchEntryPagination.page = page
|
||||
fetchMatchEntryList()
|
||||
}
|
||||
|
||||
function handleMatchEntryPageSizeChange(size: number) {
|
||||
matchEntryPagination.pageSize = size
|
||||
matchEntryPagination.page = 1
|
||||
fetchMatchEntryList()
|
||||
}
|
||||
|
||||
function onMatchEntrySelectionChange(rows: any[]) {
|
||||
matchEntrySelectedRows.value = rows || []
|
||||
}
|
||||
|
||||
async function fetchMatchEntryList() {
|
||||
matchEntryListLoading.value = true
|
||||
try {
|
||||
const where: Record<string, any> = {}
|
||||
if (matchEntryFilterStoreId.value !== '' && matchEntryFilterStoreId.value != null) {
|
||||
const sid = Number(matchEntryFilterStoreId.value)
|
||||
if (Number.isFinite(sid)) {
|
||||
where.store_id = {
|
||||
operator: 'eq',
|
||||
value: sid,
|
||||
type: 'number'
|
||||
}
|
||||
}
|
||||
}
|
||||
if (matchEntryFilterOrderStatus.value) {
|
||||
where.order_status = {
|
||||
operator: 'eq',
|
||||
value: matchEntryFilterOrderStatus.value,
|
||||
type: 'text'
|
||||
}
|
||||
}
|
||||
const res: any = await entryApi.getEntryList({
|
||||
pagination: {
|
||||
page: matchEntryPagination.page,
|
||||
pageSize: matchEntryPagination.pageSize
|
||||
},
|
||||
where: Object.keys(where).length ? where : {}
|
||||
})
|
||||
if (res && res.code === 200 && res.data) {
|
||||
matchEntryList.value = res.data.list || []
|
||||
matchEntryPagination.total = res.data.pagination?.total ?? 0
|
||||
} else {
|
||||
matchEntryList.value = []
|
||||
matchEntryPagination.total = 0
|
||||
if (res?.message) ElMessage.error(res.message)
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('加载入库单列表失败', e)
|
||||
ElMessage.error('加载入库单列表失败')
|
||||
matchEntryList.value = []
|
||||
matchEntryPagination.total = 0
|
||||
} finally {
|
||||
matchEntryListLoading.value = false
|
||||
await nextTick()
|
||||
matchEntryTableRef.value?.clearSelection?.()
|
||||
matchEntrySelectedRows.value = []
|
||||
}
|
||||
}
|
||||
|
||||
async function submitMatchPutaway() {
|
||||
const row = matchPutawayReceivingRow.value
|
||||
const receivingId = row?.id != null ? Number(row.id) : NaN
|
||||
if (!Number.isFinite(receivingId) || receivingId <= 0) {
|
||||
ElMessage.warning('缺少收货单ID')
|
||||
return
|
||||
}
|
||||
const ids = matchEntrySelectedRows.value
|
||||
.map((r: any) => Number(r.id))
|
||||
.filter((id: number) => Number.isFinite(id) && id > 0)
|
||||
if (!ids.length) {
|
||||
ElMessage.warning('请至少选择一条入库单')
|
||||
return
|
||||
}
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`将对收货单「${row?.receiving_number || receivingId}」与已选的 ${ids.length} 条入库单执行匹配入库(按 SKU 数量匹配)。确定继续?`,
|
||||
'确认匹配入库',
|
||||
{ confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
matchPutawaySubmitLoading.value = true
|
||||
try {
|
||||
const res: any = await inventoryApi.matchPutaway({
|
||||
receiving_ids: [receivingId],
|
||||
entry_order_ids: ids
|
||||
})
|
||||
if (res && (res.code === 200 || res.flag === 'success' || res.status === 'success')) {
|
||||
ElMessage.success(res.message || '匹配入库已提交')
|
||||
matchPutawayDialogVisible.value = false
|
||||
loadData()
|
||||
} else {
|
||||
ElMessage.error(res?.message || res?.msg || '匹配入库失败')
|
||||
}
|
||||
} catch (e: any) {
|
||||
ElMessage.error(e?.message || '匹配入库请求失败')
|
||||
} finally {
|
||||
matchPutawaySubmitLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function printReceiving() {
|
||||
if (!selectionRows.value.length) {
|
||||
ElMessage.warning('请选择要打印的收货单')
|
||||
@ -1667,4 +2021,39 @@ async function handleExport() {
|
||||
top: 50% !important;
|
||||
transform: translateY(-50%) !important;
|
||||
}
|
||||
|
||||
.match-putaway-dialog .match-hint {
|
||||
margin: 0 0 8px;
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.match-putaway-dialog .match-desc {
|
||||
margin: 0 0 12px;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.match-entry-filters {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.match-entry-pager {
|
||||
margin-top: 12px;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.match-putaway-footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.match-selection-tip {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
</style>
|
||||
@ -119,6 +119,7 @@ export const receivingColumns = [
|
||||
{ prop: 'created_at', label: '创建时间', width: '150', sortable: true, formatter: (row: any) => formatDateTime(row.created_at) },
|
||||
{ prop: 'updated_at', label: '更新时间', width: '150', sortable: true, formatter: (row: any) => formatDateTime(row.updated_at) },
|
||||
{ prop: 'remark', label: '备注', minWidth: '120' },
|
||||
{ prop: 'actions', label: '操作', width: '120', align: 'center', fixed: 'right' },
|
||||
]
|
||||
|
||||
|
||||
|
||||
@ -776,7 +776,7 @@ import { storeWarehouseList, storeWarehouseSign, storeWarehouseUnbind,
|
||||
storeWarehouseRename, storeWarehouseGetPolicyConfig, storeWarehouseGetPolicyConfigFields,
|
||||
storeWarehouseSavePolicyConfig, saveApiConfig, storeWarehouseDeleteQimenConfig,
|
||||
storeWarehouseAdjustPrintQuantity, listApiConfig
|
||||
} from '@/api/storewarehouse.store/storeWarehouse'
|
||||
} from '@/api/storeWarehouse.store/storeWarehouse'
|
||||
import { listInterfaceTypes, getExpressList, getPlatformList } from '@/api/index/index'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
|
||||
@ -271,7 +271,7 @@ import {
|
||||
expressInterfaceList,
|
||||
expressInterfaceListByWarehousePlatformCode,
|
||||
expressInterfaceUpdate
|
||||
} from '@/api/setting.expressinterface/expressInterface'
|
||||
} from '@/api/setting.expressInterface/expressInterface'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
|
||||
type ExpressOption = { code: string; name: string; label?: string }
|
||||
|
||||
3
src/views/system/setting/index.vue
Normal file
3
src/views/system/setting/index.vue
Normal file
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<router-view />
|
||||
</template>
|
||||
@ -53,7 +53,7 @@ import { ref, computed, onMounted } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { Document, Folder } from '@element-plus/icons-vue'
|
||||
import TemplateEditor from './components/TemplateEditor.vue'
|
||||
import * as TemplatesApi from '@/api/setting.printtemplate/printTemplate'
|
||||
import * as TemplatesApi from '@/api/setting.printTemplate/printTemplate'
|
||||
import { usePrintTemplateStore } from '@/stores/modules/printTemplate'
|
||||
import { storeToRefs } from 'pinia'
|
||||
|
||||
|
||||
607
src/views/wave/component/PendingOrderListPanel.vue
Normal file
607
src/views/wave/component/PendingOrderListPanel.vue
Normal file
@ -0,0 +1,607 @@
|
||||
<template>
|
||||
<div class="pending-order-panel">
|
||||
<scan-box
|
||||
ref="scanBox"
|
||||
width="300px"
|
||||
:tree-props="{ children: 'children', label: 'label' }"
|
||||
:auto-submit="false"
|
||||
:initial-conditions="initialConditions"
|
||||
:preset-tree="presetTree"
|
||||
:available-fields="availableFieldsRef"
|
||||
@condition-change="handleConditionChange"
|
||||
@reset="handleConditionReset"
|
||||
@condition-clear="handleConditionClear"
|
||||
/>
|
||||
|
||||
<div class="pending-order-panel__main">
|
||||
<div class="pending-order-panel__toolbar">
|
||||
<div class="pending-order-panel__toolbar-left">
|
||||
<span class="pending-order-panel__wave">当前波次:{{ waveNo }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
plain
|
||||
:disabled="!hasSelection"
|
||||
:loading="removeFromWaveLoading"
|
||||
@click="handleRemoveOrdersFromWave"
|
||||
>
|
||||
移出波次
|
||||
</el-button>
|
||||
<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)"
|
||||
>
|
||||
{{ button.label }}
|
||||
</el-button>
|
||||
</div>
|
||||
|
||||
<div class="pending-order-panel__toolbar-right">
|
||||
<el-input v-model="quickSearch" size="small" placeholder="搜索订单号" style="width: 220px" @keyup.enter="onQuickSearch" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<upper-table
|
||||
ref="upperTable"
|
||||
title="待处理订单列表"
|
||||
:enable-column-config="true"
|
||||
table-id="wave-pending-order-dialog"
|
||||
:data="list"
|
||||
:columns="columns"
|
||||
:table-size="tableSize"
|
||||
:pagination="pagination"
|
||||
:show-index="true"
|
||||
:show-selection="true"
|
||||
:loading="loading"
|
||||
:queryTime="queryTime"
|
||||
@page-change="handlePageChange"
|
||||
@page-size-change="handlePageSizeChange"
|
||||
@refresh="loadData"
|
||||
@selection-change="onSelectionChange"
|
||||
>
|
||||
<template #column-status="{ row }">
|
||||
<el-tag :type="getTagType('status', row.status)" size="small">
|
||||
{{ translateOrderField('status', row.status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-is_urgency="{ row }">
|
||||
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
|
||||
{{ translateOrderField('is_urgency', row.is_urgency) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-post_status="{ row }">
|
||||
<el-tag :type="getTagType('post_status', row.post_status)" size="small">
|
||||
{{ translateOrderField('post_status', row.post_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-storage_status="{ row }">
|
||||
<el-tag :type="getTagType('storage_status', row.storage_status)" size="small">
|
||||
{{ translateOrderField('storage_status', row.storage_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-print_status="{ row }">
|
||||
<el-tag :type="getTagType('print_status', row.print_status)" size="small">
|
||||
{{ translateOrderField('print_status', row.print_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-pick_status="{ row }">
|
||||
<el-tag :type="getTagType('pick_status', row.pick_status)" size="small">
|
||||
{{ translateOrderField('pick_status', row.pick_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-pack_status="{ row }">
|
||||
<el-tag :type="getTagType('pack_status', row.pack_status)" size="small">
|
||||
{{ translateOrderField('pack_status', row.pack_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-sync_status="{ row }">
|
||||
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
|
||||
{{ translateOrderField('sync_status', row.sync_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">暂无待处理订单</div>
|
||||
</template>
|
||||
</upper-table>
|
||||
</div>
|
||||
|
||||
<allocate-express-form
|
||||
v-model="allocateDialogVisible"
|
||||
:loading="allocateLoading"
|
||||
@closed="resetAllocateDialog"
|
||||
@submit="submitAllocateExpress"
|
||||
/>
|
||||
<storage-allocate-form
|
||||
v-model="storageDialogVisible"
|
||||
v-model:allow-storage-location="storageForm.allowStorageLocation"
|
||||
:mode="storageDialogMode"
|
||||
:order-count="storagePendingOrderIds.length"
|
||||
:loading="storageAllocateLoading"
|
||||
:request-id="storageAllocateRequestId"
|
||||
:task-status="storageAllocateTaskStatus"
|
||||
:progress-percent="storageAllocateProgressPercent"
|
||||
:total-count="storageAllocateTotalCount"
|
||||
:success-count="storageAllocateSuccessCount"
|
||||
:failed-count="storageAllocateFailedCount"
|
||||
:message="storageAllocateMessage"
|
||||
@closed="resetStorageAllocateDialog"
|
||||
@submit="submitStorageAllocate"
|
||||
/>
|
||||
<sync-order-ids-form
|
||||
v-model="syncOrderIdsDialogVisible"
|
||||
:order-count="selectionRows.length"
|
||||
:loading="syncOrderIdsLoading"
|
||||
@closed="resetSyncOrderIdsDialog"
|
||||
@submit="submitSyncOrderIds"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import { orderPendingOrder } from '@/api/order.pendingOrder/orderpendingOrder'
|
||||
import { orderWaveBatchRemoveOrders } from '@/api/order.wave/orderwave'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import AllocateExpressForm from '@/views/order/orderManagement/form/AllocateExpressForm.vue'
|
||||
import StorageAllocateForm from '@/views/order/orderManagement/form/StorageAllocateForm.vue'
|
||||
import SyncOrderIdsForm from '@/views/order/orderManagement/form/SyncOrderIdsForm.vue'
|
||||
import { createPendingToolbarController } from '@/views/order/orderManagement/utils/toolbar-actions'
|
||||
import {
|
||||
pendingCloums,
|
||||
pendingAvailableFields,
|
||||
pickToolbarButtons,
|
||||
type ToolbarButtonConfig,
|
||||
translateOrderField,
|
||||
getTagType
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
|
||||
const props = defineProps<{
|
||||
waveNo: string
|
||||
}>()
|
||||
|
||||
const scanBox = ref<any>(null)
|
||||
const upperTable = ref<any>(null)
|
||||
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(pendingAvailableFields.filter((field: any) => field.value !== 'wave_no'))))
|
||||
const toolbarButtons = pickToolbarButtons(['refresh', 'columnConfig', 'allocateStorage', 'allocateExpress', 'syncOrderIds'])
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
const queryTime = ref(0)
|
||||
const tableSize = ref('small')
|
||||
const columns = ref(pendingCloums)
|
||||
const selectionRows = ref<any[]>([])
|
||||
const hasSelection = ref(false)
|
||||
const quickSearch = ref('')
|
||||
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
|
||||
const actionLoading = ref(false)
|
||||
const removeFromWaveLoading = ref(false)
|
||||
|
||||
const expressCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const platformCodeOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
|
||||
const initialConditions = computed(() => ({
|
||||
type: 'custom',
|
||||
conditions: {
|
||||
wave_no: {
|
||||
field: 'wave_no',
|
||||
type: 'text',
|
||||
operator: 'eq',
|
||||
value: props.waveNo
|
||||
}
|
||||
}
|
||||
}))
|
||||
|
||||
onMounted(() => {
|
||||
loadData()
|
||||
loadOrderMetaOptions()
|
||||
loadStoreOptions()
|
||||
})
|
||||
|
||||
watch(() => props.waveNo, () => {
|
||||
pagination.currentPage = 1
|
||||
loadData()
|
||||
})
|
||||
|
||||
function normalizePositiveIntId(raw: unknown): number | null {
|
||||
if (raw === undefined || raw === null || raw === '') return null
|
||||
const n = typeof raw === 'number' ? raw : Number(raw)
|
||||
if (!Number.isInteger(n) || n <= 0) return null
|
||||
return n
|
||||
}
|
||||
|
||||
function buildWhereConditions(rawConditions: Record<string, any>) {
|
||||
const where: Record<string, any> = {}
|
||||
Object.keys(rawConditions || {}).forEach((key) => {
|
||||
const condition = rawConditions[key]
|
||||
const normalizedKey = key === 'order_code' ? 'delivery_order_code' : key
|
||||
if (condition && typeof condition === 'object' && 'operator' in condition) {
|
||||
where[normalizedKey] = Array.isArray(condition.value)
|
||||
? { ...condition, value: condition.value[0] ?? '', type: 'text' }
|
||||
: condition
|
||||
return
|
||||
}
|
||||
if (condition !== undefined && condition !== null && condition !== '') {
|
||||
where[normalizedKey] = {
|
||||
operator: 'eq',
|
||||
value: Array.isArray(condition) ? condition[0] ?? '' : condition,
|
||||
type: 'text'
|
||||
}
|
||||
}
|
||||
})
|
||||
return where
|
||||
}
|
||||
|
||||
function sanitizePendingListWhere(where: Record<string, any>) {
|
||||
const w = { ...where }
|
||||
delete w.warehouse_id
|
||||
delete w.warehouseId
|
||||
return w
|
||||
}
|
||||
|
||||
async function loadData() {
|
||||
if (loading.value) return
|
||||
loading.value = true
|
||||
const start = Date.now()
|
||||
|
||||
let where = buildWhereConditions(scanBox.value?.getConditions?.() || {})
|
||||
where.wave_no = {
|
||||
operator: 'eq',
|
||||
value: props.waveNo,
|
||||
type: 'text'
|
||||
}
|
||||
if (quickSearch.value) {
|
||||
where.delivery_order_code = {
|
||||
operator: 'like',
|
||||
value: quickSearch.value,
|
||||
type: 'text'
|
||||
}
|
||||
}
|
||||
where = sanitizePendingListWhere(where)
|
||||
|
||||
try {
|
||||
const res = await orderPendingOrder.list({
|
||||
pagination: {
|
||||
page: pagination.currentPage,
|
||||
pageSize: pagination.pageSize
|
||||
},
|
||||
where,
|
||||
sort: {
|
||||
sortField: 'updated_at',
|
||||
sortOrder: 'DESC' as const
|
||||
}
|
||||
})
|
||||
if (res && (res.code === 1 || res.code === 200) && res.data) {
|
||||
list.value = res.data.list || []
|
||||
pagination.total = res.data.pagination?.total || res.data.total || 0
|
||||
} else {
|
||||
list.value = []
|
||||
pagination.total = 0
|
||||
}
|
||||
} catch {
|
||||
list.value = []
|
||||
pagination.total = 0
|
||||
ElMessage.error('获取待处理订单列表失败')
|
||||
} finally {
|
||||
loading.value = false
|
||||
queryTime.value = Date.now() - start
|
||||
}
|
||||
}
|
||||
|
||||
function onSelectionChange(rows: any[]) {
|
||||
selectionRows.value = rows || []
|
||||
hasSelection.value = selectionRows.value.length > 0
|
||||
}
|
||||
|
||||
function handleConditionChange() {
|
||||
pagination.currentPage = 1
|
||||
loadData()
|
||||
}
|
||||
|
||||
function handleConditionClear() {
|
||||
pagination.currentPage = 1
|
||||
loadData()
|
||||
}
|
||||
|
||||
function handleConditionReset() {
|
||||
pagination.currentPage = 1
|
||||
scanBox.value?.reset?.()
|
||||
loadData()
|
||||
}
|
||||
|
||||
function handlePageChange(page: number) {
|
||||
pagination.currentPage = page
|
||||
loadData()
|
||||
}
|
||||
|
||||
function handlePageSizeChange(size: number) {
|
||||
pagination.pageSize = size
|
||||
pagination.currentPage = 1
|
||||
loadData()
|
||||
}
|
||||
|
||||
function onQuickSearch() {
|
||||
pagination.currentPage = 1
|
||||
loadData()
|
||||
}
|
||||
|
||||
function openColumnConfigPanel() {
|
||||
upperTable.value?.openColumnConfig?.()
|
||||
}
|
||||
|
||||
function getSelectedIds(): number[] {
|
||||
const ids: number[] = []
|
||||
for (const item of selectionRows.value) {
|
||||
const n = normalizePositiveIntId(item?.id)
|
||||
if (n !== null) ids.push(n)
|
||||
}
|
||||
return ids
|
||||
}
|
||||
|
||||
const {
|
||||
actionMap,
|
||||
dialogState: {
|
||||
allocateDialogVisible,
|
||||
allocateLoading,
|
||||
storageDialogVisible,
|
||||
storageDialogMode,
|
||||
storagePendingOrderIds,
|
||||
storageAllocateLoading,
|
||||
storageForm,
|
||||
storageAllocateRequestId,
|
||||
storageAllocateTaskStatus,
|
||||
storageAllocateProgressPercent,
|
||||
storageAllocateTotalCount,
|
||||
storageAllocateSuccessCount,
|
||||
storageAllocateFailedCount,
|
||||
storageAllocateMessage,
|
||||
syncOrderIdsDialogVisible,
|
||||
syncOrderIdsLoading
|
||||
},
|
||||
submitStorageAllocate,
|
||||
submitAllocateExpress,
|
||||
submitSyncOrderIds,
|
||||
resetAllocateDialog,
|
||||
resetStorageAllocateDialog,
|
||||
resetSyncOrderIdsDialog
|
||||
} = createPendingToolbarController({
|
||||
loadData,
|
||||
handleExport: async () => {},
|
||||
openColumnConfigPanel,
|
||||
toggleDetailVisible: () => {},
|
||||
openManualCreateDialog: () => {},
|
||||
openImportOrderDialog: () => {},
|
||||
getSelectedRows: () => selectionRows.value,
|
||||
getSelectedIds,
|
||||
pendingApi: orderPendingOrder,
|
||||
actionLoading,
|
||||
clearSelection: () => {
|
||||
upperTable.value?.clearSelection?.()
|
||||
selectionRows.value = []
|
||||
hasSelection.value = false
|
||||
},
|
||||
expressCodeOptions,
|
||||
platformCodeOptions
|
||||
})
|
||||
|
||||
function resolveButtonLoading(loadingKey?: string) {
|
||||
if (!loadingKey) return false
|
||||
const loadingMap: Record<string, boolean> = {
|
||||
actionLoading: actionLoading.value,
|
||||
storageAllocateLoading: storageAllocateLoading.value,
|
||||
allocateLoading: allocateLoading.value,
|
||||
syncOrderIdsLoading: syncOrderIdsLoading.value
|
||||
}
|
||||
return Boolean(loadingMap[loadingKey])
|
||||
}
|
||||
|
||||
function resolveButtonDisabled(disabledKey?: string) {
|
||||
if (!disabledKey) return false
|
||||
const disabledMap: Record<string, boolean> = {
|
||||
hasNoSelection: !hasSelection.value
|
||||
}
|
||||
return Boolean(disabledMap[disabledKey])
|
||||
}
|
||||
|
||||
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
|
||||
const handler = actionMap[action]
|
||||
if (!handler) return
|
||||
void handler()
|
||||
}
|
||||
|
||||
async function handleRemoveOrdersFromWave() {
|
||||
const ids = getSelectedIds()
|
||||
if (!ids.length) {
|
||||
ElMessage.warning('请先勾选需要移出波次的订单')
|
||||
return
|
||||
}
|
||||
if (removeFromWaveLoading.value) return
|
||||
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确定将选中的 ${ids.length} 条订单移出当前波次吗?`,
|
||||
'移出波次',
|
||||
{ type: 'warning', confirmButtonText: '确认移出', cancelButtonText: '取消' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
removeFromWaveLoading.value = true
|
||||
try {
|
||||
const res = await orderWaveBatchRemoveOrders({ ids })
|
||||
const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
|
||||
if (!ok) {
|
||||
ElMessage.error(res?.message || '移出波次失败')
|
||||
return
|
||||
}
|
||||
|
||||
const updatedCount = Number(res?.data?.updated_count ?? ids.length) || ids.length
|
||||
ElMessage.success(`${res?.message || '移出波次成功'} ${updatedCount} 条`)
|
||||
upperTable.value?.clearSelection?.()
|
||||
selectionRows.value = []
|
||||
hasSelection.value = false
|
||||
await loadData()
|
||||
} catch (error: any) {
|
||||
ElMessage.error(error?.message || '移出波次失败')
|
||||
} finally {
|
||||
removeFromWaveLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeCode(value: unknown) {
|
||||
return String(value ?? '').trim()
|
||||
}
|
||||
|
||||
function mapCodeOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) {
|
||||
const result: Array<{ label: string; value: string }> = []
|
||||
const seen = new Set<string>()
|
||||
for (const item of rawList || []) {
|
||||
const code = normalizeCode(codeKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
|
||||
if (!code || seen.has(code)) continue
|
||||
const name = normalizeCode(nameKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
|
||||
result.push({ value: code, label: name ? `${code} - ${name}` : code })
|
||||
seen.add(code)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
function mapNameOptions(rawList: any[], nameKeys: string[]) {
|
||||
const result: Array<{ label: string; value: string }> = []
|
||||
const seen = new Set<string>()
|
||||
for (const item of rawList || []) {
|
||||
const name = normalizeCode(nameKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
|
||||
if (!name || seen.has(name)) continue
|
||||
result.push({ value: name, label: name })
|
||||
seen.add(name)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
async function loadOrderMetaOptions() {
|
||||
try {
|
||||
const [expressRes, platformRes] = await Promise.all([
|
||||
indexApi.getExpressList({}),
|
||||
indexApi.getPlatformList({})
|
||||
])
|
||||
const expressData: any = expressRes?.data
|
||||
const platformData: any = platformRes?.data
|
||||
const expressRaw = expressData?.list || expressData || []
|
||||
const platformRaw = platformData?.list || platformData || []
|
||||
expressCodeOptions.value = mapCodeOptions(expressRaw, ['code', 'logistics_code', 'express_code'], ['name', 'logistics_name', 'express_name'])
|
||||
platformCodeOptions.value = mapCodeOptions(platformRaw, ['code', 'platform_code'], ['name', 'platform_name'])
|
||||
const logisticsField = availableFieldsRef.find((item: any) => item.value === 'logistics_name')
|
||||
if (logisticsField) {
|
||||
logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name'])
|
||||
}
|
||||
const platformField = availableFieldsRef.find((item: any) => item.value === 'sys_platform_name')
|
||||
if (platformField) {
|
||||
platformField.options = mapNameOptions(platformRaw, ['name', 'platform_name'])
|
||||
}
|
||||
} catch {
|
||||
expressCodeOptions.value = []
|
||||
platformCodeOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeStoreOptions(rawStores: any[]) {
|
||||
const result: Array<{ label: string; value: number | string }> = []
|
||||
const seen = new Set<string>()
|
||||
for (const item of rawStores || []) {
|
||||
const rawValue = item?.value ?? item?.store_id ?? item?.id ?? item?.storeId
|
||||
if (rawValue === undefined || rawValue === null || rawValue === '') continue
|
||||
const value = Number.isNaN(Number(rawValue)) ? String(rawValue) : Number(rawValue)
|
||||
const key = String(value)
|
||||
if (seen.has(key)) continue
|
||||
const label = String(item?.label ?? item?.store_name ?? item?.name ?? item?.storeName ?? key).trim() || key
|
||||
result.push({ label, value })
|
||||
seen.add(key)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
async function loadStoreOptions() {
|
||||
try {
|
||||
const storesRes: any = await indexApi.loadStores({ type: 'order' })
|
||||
const rawStores = storesRes?.stores || storesRes?.data?.stores || storesRes?.data || []
|
||||
const storeField = availableFieldsRef.find((item: any) => item.value === 'store_id')
|
||||
if (storeField) {
|
||||
storeField.options = normalizeStoreOptions(rawStores)
|
||||
}
|
||||
} catch {
|
||||
const storeField = availableFieldsRef.find((item: any) => item.value === 'store_id')
|
||||
if (storeField) storeField.options = []
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.pending-order-panel {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
height: 72vh;
|
||||
min-height: 560px;
|
||||
}
|
||||
|
||||
.pending-order-panel__main {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.pending-order-panel__toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 10px 12px;
|
||||
background: #f8fafc;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.pending-order-panel__toolbar-left {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.pending-order-panel__toolbar-right {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.pending-order-panel__wave {
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
:deep(.upper-table-container) {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
:deep(.scan-box-container) {
|
||||
flex: 0 0 300px;
|
||||
}
|
||||
</style>
|
||||
1543
src/views/wave/index.vue
Normal file
1543
src/views/wave/index.vue
Normal file
File diff suppressed because it is too large
Load Diff
@ -3,23 +3,91 @@
|
||||
{
|
||||
"接口": "user.login",
|
||||
"data": {
|
||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3Nzc2MzA2ODgsImV4cCI6MTc3NzY0NTA4OH0.2FEpYiiNRuit-7zqB8CR-BqAUeFwpU8q_RSuF1HhqIA"
|
||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3Nzc3MDE3NDksImV4cCI6MTc3NzcxNjE0OX0.tp7grssYCswBwcWl6JZUXT_O0Xxz7o2s-MqG-o7V6cM"
|
||||
}
|
||||
},
|
||||
{
|
||||
"接口": "index.loginToIm",
|
||||
"接口": "storage.inventory.quickPutaway",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.matchPutaway",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferLocation",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferByProduct",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.list",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.expiry.list",
|
||||
"data": {
|
||||
"code": "82fa24a74781d86d3a85dceadbcd0552e1cf5bd88949391cec203198d8df3730",
|
||||
"employees_id": "31",
|
||||
"employees_name": "殷建铭",
|
||||
"subject": {
|
||||
"id": "100000",
|
||||
"name": "测试仓",
|
||||
"type": "warehouse"
|
||||
},
|
||||
"store_type": "warehouse",
|
||||
"avatar": ""
|
||||
"list": [
|
||||
{
|
||||
"id": 142,
|
||||
"warehouse_id": 100000,
|
||||
"store_id": 1000000,
|
||||
"space_id": 7178,
|
||||
"stock_id": 157059,
|
||||
"batch_no": "R20554119",
|
||||
"inventory_type": "ZP",
|
||||
"quantity": 10,
|
||||
"locked_quantity": 0,
|
||||
"available_quantity": 10,
|
||||
"production_date": "2023-10-12 08:00:00",
|
||||
"expiry_date": "2026-10-11 08:00:00",
|
||||
"inbound_time": "2026-04-12 00:01:11",
|
||||
"inbound_order_no": "TEST-ENTRY-1775923270905",
|
||||
"receiving_id": 666,
|
||||
"entry_order_id": 189,
|
||||
"supplier_id": null,
|
||||
"supplier_batch_no": null,
|
||||
"is_enabled": 1,
|
||||
"created_at": "2026-04-12 00:01:11",
|
||||
"updated_at": "2026-04-14 16:44:39",
|
||||
"delete_at": null,
|
||||
"stock": {
|
||||
"id": 157059,
|
||||
"item_code": "yjm20260411",
|
||||
"goods_code": null,
|
||||
"item_name": "yjm0411",
|
||||
"sku_property": "",
|
||||
"stock_unit": "个",
|
||||
"store_id": 1000000,
|
||||
"warehouse_id": 100000,
|
||||
"is_shelf_life_mgmt": "Y",
|
||||
"remaining_threshold_days": 180
|
||||
},
|
||||
"space": {
|
||||
"id": 7178,
|
||||
"space_code": "E02-01-01-01",
|
||||
"custom_name": null
|
||||
},
|
||||
"threshold_days": 180,
|
||||
"remaining_days": 162,
|
||||
"is_expired": false
|
||||
}
|
||||
],
|
||||
"pagination": {
|
||||
"page": 1,
|
||||
"pageSize": 20,
|
||||
"total": 1,
|
||||
"totalPages": 1,
|
||||
"hasPrevious": false,
|
||||
"hasNext": false
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"接口": "storage.transaction.list",
|
||||
"data": null
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
@ -8,63 +8,33 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"method": "index.loginToIm",
|
||||
"body": {
|
||||
}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.inventory.quickPutaway",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.inventory.matchPutaway",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.inventory.transferLocation",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.inventory.transferByProduct",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.inventory.list",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.expiry.list",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"body": {}
|
||||
},
|
||||
{
|
||||
"method": "",
|
||||
"method": "storage.transaction.list",
|
||||
"body": {}
|
||||
}
|
||||
|
||||
],
|
||||
"successMessages": [
|
||||
"ok",
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"数据一览": {
|
||||
"当前请求数": 2,
|
||||
"成功数": 2,
|
||||
"全部请求数": 2,
|
||||
"成功数与全部请求数": "2/2",
|
||||
"当前请求数": 8,
|
||||
"成功数": 4,
|
||||
"全部请求数": 8,
|
||||
"成功数与全部请求数": "4/8",
|
||||
"成功判定名单": [
|
||||
"ok",
|
||||
"成功",
|
||||
@ -12,7 +12,70 @@
|
||||
"查询成功",
|
||||
"获取成功"
|
||||
],
|
||||
"失败接口": [],
|
||||
"失败接口": [
|
||||
{
|
||||
"接口": "storage.inventory.quickPutaway",
|
||||
"message": "receiving_id 必填",
|
||||
"code": 400,
|
||||
"模块目录": "storage.inventory",
|
||||
"api封装": [
|
||||
{
|
||||
"文件": "src/api/storage.inventory/inventory.ts",
|
||||
"方法名": "quickPutaway"
|
||||
},
|
||||
{
|
||||
"文件": "src/api/storage_receiving/receiving.ts",
|
||||
"方法名": "quickPutaway"
|
||||
}
|
||||
],
|
||||
"引用页面": [
|
||||
"src/views/storage/receiving/index.vue"
|
||||
]
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.matchPutaway",
|
||||
"message": "receiving_ids 不能为空",
|
||||
"code": 400,
|
||||
"模块目录": "storage.inventory",
|
||||
"api封装": [
|
||||
{
|
||||
"文件": "src/api/storage.inventory/inventory.ts",
|
||||
"方法名": "matchPutaway"
|
||||
}
|
||||
],
|
||||
"引用页面": []
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferLocation",
|
||||
"message": "storage_id 必填",
|
||||
"code": 400,
|
||||
"模块目录": "storage.inventory",
|
||||
"api封装": [
|
||||
{
|
||||
"文件": "src/api/storage.inventory/inventory.ts",
|
||||
"方法名": "transferLocation"
|
||||
}
|
||||
],
|
||||
"引用页面": [
|
||||
"src/views/storage/inventory/component/panelstockdetail.vue"
|
||||
]
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferByProduct",
|
||||
"message": "space_id 必填",
|
||||
"code": 400,
|
||||
"模块目录": "storage.inventory",
|
||||
"api封装": [
|
||||
{
|
||||
"文件": "src/api/storage.inventory/inventory.ts",
|
||||
"方法名": "transferByProduct"
|
||||
}
|
||||
],
|
||||
"引用页面": [
|
||||
"src/views/storage/inventory/component/panelstockdetail.vue"
|
||||
]
|
||||
}
|
||||
],
|
||||
"空数据接口": []
|
||||
},
|
||||
"详情": [
|
||||
@ -21,25 +84,105 @@
|
||||
"message": "登录成功",
|
||||
"code": 200,
|
||||
"data": {
|
||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3Nzc2MzA2ODgsImV4cCI6MTc3NzY0NTA4OH0.2FEpYiiNRuit-7zqB8CR-BqAUeFwpU8q_RSuF1HhqIA"
|
||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywidXNlcm5hbWUiOiJ5am0iLCJyZWFsX25hbWUiOiJ5aW4iLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjozMSwiY3VycmVudF9zdG9yZV9pZCI6MTAwMDAwLCJpYXQiOjE3Nzc3MDE3NDksImV4cCI6MTc3NzcxNjE0OX0.tp7grssYCswBwcWl6JZUXT_O0Xxz7o2s-MqG-o7V6cM"
|
||||
}
|
||||
},
|
||||
{
|
||||
"接口": "index.loginToIm",
|
||||
"接口": "storage.inventory.quickPutaway",
|
||||
"message": "receiving_id 必填",
|
||||
"code": 400,
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.matchPutaway",
|
||||
"message": "receiving_ids 不能为空",
|
||||
"code": 400,
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferLocation",
|
||||
"message": "storage_id 必填",
|
||||
"code": 400,
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.transferByProduct",
|
||||
"message": "space_id 必填",
|
||||
"code": 400,
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.inventory.list",
|
||||
"message": "ok",
|
||||
"code": 1,
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"接口": "storage.expiry.list",
|
||||
"message": "查询成功",
|
||||
"code": 200,
|
||||
"data": {
|
||||
"code": "82fa24a74781d86d3a85dceadbcd0552e1cf5bd88949391cec203198d8df3730",
|
||||
"employees_id": "31",
|
||||
"employees_name": "殷建铭",
|
||||
"subject": {
|
||||
"id": "100000",
|
||||
"name": "测试仓",
|
||||
"type": "warehouse"
|
||||
},
|
||||
"store_type": "warehouse",
|
||||
"avatar": ""
|
||||
"list": [
|
||||
{
|
||||
"id": 142,
|
||||
"warehouse_id": 100000,
|
||||
"store_id": 1000000,
|
||||
"space_id": 7178,
|
||||
"stock_id": 157059,
|
||||
"batch_no": "R20554119",
|
||||
"inventory_type": "ZP",
|
||||
"quantity": 10,
|
||||
"locked_quantity": 0,
|
||||
"available_quantity": 10,
|
||||
"production_date": "2023-10-12 08:00:00",
|
||||
"expiry_date": "2026-10-11 08:00:00",
|
||||
"inbound_time": "2026-04-12 00:01:11",
|
||||
"inbound_order_no": "TEST-ENTRY-1775923270905",
|
||||
"receiving_id": 666,
|
||||
"entry_order_id": 189,
|
||||
"supplier_id": null,
|
||||
"supplier_batch_no": null,
|
||||
"is_enabled": 1,
|
||||
"created_at": "2026-04-12 00:01:11",
|
||||
"updated_at": "2026-04-14 16:44:39",
|
||||
"delete_at": null,
|
||||
"stock": {
|
||||
"id": 157059,
|
||||
"item_code": "yjm20260411",
|
||||
"goods_code": null,
|
||||
"item_name": "yjm0411",
|
||||
"sku_property": "",
|
||||
"stock_unit": "个",
|
||||
"store_id": 1000000,
|
||||
"warehouse_id": 100000,
|
||||
"is_shelf_life_mgmt": "Y",
|
||||
"remaining_threshold_days": 180
|
||||
},
|
||||
"space": {
|
||||
"id": 7178,
|
||||
"space_code": "E02-01-01-01",
|
||||
"custom_name": null
|
||||
},
|
||||
"threshold_days": 180,
|
||||
"remaining_days": 162,
|
||||
"is_expired": false
|
||||
}
|
||||
],
|
||||
"pagination": {
|
||||
"page": 1,
|
||||
"pageSize": 20,
|
||||
"total": 1,
|
||||
"totalPages": 1,
|
||||
"hasPrevious": false,
|
||||
"hasNext": false
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"接口": "storage.transaction.list",
|
||||
"message": "ok",
|
||||
"code": 1,
|
||||
"data": null
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
@ -17,45 +17,22 @@
|
||||
"summary": {
|
||||
"moduleAdded": 0,
|
||||
"moduleDeleted": 0,
|
||||
"moduleUpdated": 1,
|
||||
"moduleUpdated": 0,
|
||||
"interfaceAdded": 0,
|
||||
"interfaceDeleted": 0,
|
||||
"interfaceParamsUpdated": 0,
|
||||
"interfaceResponseUpdated": 1
|
||||
"interfaceResponseUpdated": 0
|
||||
},
|
||||
"moduleUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"updated": [
|
||||
{
|
||||
"moduleName": "基础模块",
|
||||
"moduleKey": "index",
|
||||
"folder": "index",
|
||||
"previousModuleName": "基础模块",
|
||||
"previousModuleKey": "index",
|
||||
"interfaceChanges": {
|
||||
"addedMethods": [],
|
||||
"deletedMethods": [],
|
||||
"paramsUpdatedMethods": [],
|
||||
"responseUpdatedMethods": [
|
||||
"index.loginToIm"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
"updated": []
|
||||
},
|
||||
"interfaceUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"paramsUpdated": [],
|
||||
"responseUpdated": [
|
||||
{
|
||||
"moduleName": "基础模块",
|
||||
"moduleKey": "index",
|
||||
"folder": "index",
|
||||
"method": "index.loginToIm"
|
||||
}
|
||||
]
|
||||
"responseUpdated": []
|
||||
}
|
||||
},
|
||||
"interfaces": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
@ -18,45 +18,22 @@
|
||||
"summary": {
|
||||
"moduleAdded": 0,
|
||||
"moduleDeleted": 0,
|
||||
"moduleUpdated": 1,
|
||||
"moduleUpdated": 0,
|
||||
"interfaceAdded": 0,
|
||||
"interfaceDeleted": 0,
|
||||
"interfaceParamsUpdated": 0,
|
||||
"interfaceResponseUpdated": 1
|
||||
"interfaceResponseUpdated": 0
|
||||
},
|
||||
"moduleUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"updated": [
|
||||
{
|
||||
"moduleName": "基础模块",
|
||||
"moduleKey": "index",
|
||||
"folder": "index",
|
||||
"previousModuleName": "基础模块",
|
||||
"previousModuleKey": "index",
|
||||
"interfaceChanges": {
|
||||
"addedMethods": [],
|
||||
"deletedMethods": [],
|
||||
"paramsUpdatedMethods": [],
|
||||
"responseUpdatedMethods": [
|
||||
"index.loginToIm"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
"updated": []
|
||||
},
|
||||
"interfaceUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"paramsUpdated": [],
|
||||
"responseUpdated": [
|
||||
{
|
||||
"moduleName": "基础模块",
|
||||
"moduleKey": "index",
|
||||
"folder": "index",
|
||||
"method": "index.loginToIm"
|
||||
}
|
||||
]
|
||||
"responseUpdated": []
|
||||
}
|
||||
},
|
||||
"modules": [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
@ -26,9 +26,7 @@
|
||||
"addedMethods": [],
|
||||
"deletedMethods": [],
|
||||
"paramsUpdatedMethods": [],
|
||||
"responseUpdatedMethods": [
|
||||
"index.loginToIm"
|
||||
]
|
||||
"responseUpdatedMethods": []
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 19:37:49",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 20:21:27",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 19:16:50",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-01 16:03:30",
|
||||
"generatedAtLocal": "2026-05-01 16:03:30",
|
||||
"generatedAt": "2026-05-02 09:08:01",
|
||||
"generatedAtLocal": "2026-05-02 09:08:01",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-01 16:03:30",
|
||||
"updatedAt": "2026-05-02 09:08:01",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
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