From 4eb0282a6af5f4286fdbe9ff9356b9a1c4b390dc Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 18 Nov 2026 09:09:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor(storage):=20=E6=B8=85=E7=90=86?= =?UTF-8?q?=E5=BA=9F=E5=BC=83=E7=BB=84=E4=BB=B6=E4=B8=8E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E7=AD=9B=E9=80=89/=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8F=82=E6=95=B0=E5=B9=B6=E5=AE=8C=E5=96=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 包装耗材、包装供应商:移除未使用的搜索表单与废弃接口,去掉后端不支持的 顶层 page/pageSize 与 order 参数,列表统一使用 pagination;新增创建/更新时间列、 重量格式化与空值显示;编辑时被清空的数值字段显式提交 null,保留「未修改」语义 - 库存:删除已废弃的 InventoryStockPickerDialog、库存日志组件与 quickPutaway 接口; 列表与导出支持文档声明的排序白名单(id/stock_id/space_id/时间/数量); 库位关键字先解析为 space_id、stock_query 先解析为 stock_id 后再下发, 规避导出接口 Unknown column 报错;新增库存类型筛选与库位库存入口, 详情面板复用入库明细组件 - 入库:ScanBox 新增「快捷搜索」(quickWhere 直接传字符串), 列表与导出共用当前排序 - 出库:转单表单增加字段级校验与错误提示(收货人、手机/固话二选一、 省市区镇、详细地址) - 包装流程:运单号汇总优先取 expresses 并去重,按选中导出一致带上运单号与 当前排序,补充录像列表弹窗并调整详情面板布局 --- .../packagematerial.ts | 13 - .../packagesupplier.ts | 15 - src/api/storage.inventory/inventory.ts | 18 - src/views/data/packingflow/index.vue | 91 +-- .../data/packingflow/packingflow-config.ts | 10 + .../form/PackageMaterialSearchForm.vue | 170 ------ src/views/material/packageMaterial/index.vue | 65 ++- .../package-material-config.ts | 33 +- src/views/material/packageSupplier/index.vue | 15 +- .../package-supplier-config.ts | 35 +- src/views/storage/entry/entry-config.ts | 25 +- src/views/storage/entry/index.vue | 91 +-- .../component/InventoryStockPickerDialog.vue | 534 ------------------ src/views/storage/inventory/component/log.vue | 9 - src/views/storage/inventory/index.vue | 179 +++--- .../storage/inventory/inventory-config.ts | 86 +-- src/views/storage/stockout/index.vue | 127 ++++- src/views/storage/stockout/stockout-config.ts | 9 + 18 files changed, 410 insertions(+), 1115 deletions(-) delete mode 100644 src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue delete mode 100644 src/views/storage/inventory/component/InventoryStockPickerDialog.vue delete mode 100644 src/views/storage/inventory/component/log.vue diff --git a/src/api/setting.packagematerial/packagematerial.ts b/src/api/setting.packagematerial/packagematerial.ts index 81d7d489..d84ba7d9 100644 --- a/src/api/setting.packagematerial/packagematerial.ts +++ b/src/api/setting.packagematerial/packagematerial.ts @@ -93,19 +93,6 @@ export function packageMaterialGet(data?: PackageMaterialGetParams) { }) } -export function packageMaterialList(data?: PackageMaterialGetParams) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'setting.packageMaterial.list', - v, - timestamp: new Date().getTime() - }, - data: data || {} - }) -} - export type PackageMaterialSearchParams = { keyword?: string } diff --git a/src/api/setting.packagesupplier/packagesupplier.ts b/src/api/setting.packagesupplier/packagesupplier.ts index 1d7ef537..b66a1dc6 100644 --- a/src/api/setting.packagesupplier/packagesupplier.ts +++ b/src/api/setting.packagesupplier/packagesupplier.ts @@ -22,8 +22,6 @@ export type PackageSupplierCreatePayload = { export type PackageSupplierUpdatePayload = { id: number - supplier_id?: number - supplierId?: number supplier_code?: string supplier_name?: string contact_name?: string @@ -82,16 +80,3 @@ export function packageSupplierGet(data?: PackageSupplierGetParams) { data: data || {} }) } - -export function packageSupplierList(data?: PackageSupplierGetParams) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'setting.packageSupplier.list', - v, - timestamp: new Date().getTime() - }, - data: data || {} - }) -} diff --git a/src/api/storage.inventory/inventory.ts b/src/api/storage.inventory/inventory.ts index 667b36e1..6174c575 100644 --- a/src/api/storage.inventory/inventory.ts +++ b/src/api/storage.inventory/inventory.ts @@ -193,24 +193,6 @@ export function updateInventoryExpiry(data: InventoryUpdateExpiryParams): Promis } as any) } -export function quickPutaway(data: { receiving_id: number; id?: number }): Promise { - const body: Record = { ...data } - if (body.receiving_id === undefined && body.id != null) { - body.receiving_id = Number(body.id) - } - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.inventory.quickPutaway', - v, - timestamp: new Date().getTime() - }, - data: body, - isSystemApi: true - } as any) -} - export type MatchPutawayReceivingResult = { receiving_id?: number storage_status?: 'all' | 'partial' | 'none' | string diff --git a/src/views/data/packingflow/index.vue b/src/views/data/packingflow/index.vue index 05a6ccca..e0cc39fe 100644 --- a/src/views/data/packingflow/index.vue +++ b/src/views/data/packingflow/index.vue @@ -120,11 +120,10 @@
-
-
+
任务信息
@@ -232,33 +231,6 @@
-
- - -
@@ -271,7 +243,7 @@ - + - - - () + for (const row of rows || []) { + const expresses = Array.isArray(row?.expresses) ? row.expresses : [] + for (const exp of expresses) { + const code = String((exp as any)?.waybill_code ?? '').trim() + if (code) codes.add(code) + } + const topCode = String(row?.waybill_code ?? '').trim() + if (topCode) codes.add(topCode) + } + return [...codes] +} + // ─── 导出处理(导出选中 / 导出全部)─────────────────────────────────────── /** * 构建导出参数:where 语义与 order.packing.list 一致(warehouse_id 由服务端注入,禁止传)。 @@ -553,9 +537,7 @@ function buildPackingExportPayload(selected: boolean): Record { payload.where = { ...filterWhere } } if (selected) { - const waybillCodes = selectionRows.value - .map((row) => row?.waybill_code) - .filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '') + const waybillCodes = collectRowWaybillCodes(selectionRows.value) if (waybillCodes.length) { payload.where = { ...(payload.where || {}), @@ -566,7 +548,7 @@ function buildPackingExportPayload(selected: boolean): Record { if (sortState.value?.sortField) { payload.sort = { sortField: sortState.value.sortField, - sortOrder: String(sortState.value.sortOrder || 'desc').toLowerCase() + sortOrder: sortState.value.sortOrder || 'desc' } } return payload @@ -582,11 +564,9 @@ async function handleExportSelected() { resumeExportTaskFromStorage() return } - const waybillCodes = selectionRows.value - .map((row) => row?.waybill_code) - .filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '') + const waybillCodes = collectRowWaybillCodes(selectionRows.value) if (!waybillCodes.length) { - ElMessage.warning('选中的记录无有效运单号') + ElMessage.warning(`已勾选 ${selectionRows.value.length} 条任务,但未取到运单号,无法按选中导出`) return } await submitExportTask(buildPackingExportPayload(true)) @@ -644,12 +624,12 @@ async function loadData() { // ─── 排序状态 ────────────────────────────────────────────────────────────── const sortState = ref({ sortField: 'create_time', - sortOrder: 'DESC' + sortOrder: 'desc' }) function handleSortChange(sort: { prop: string; order: string }) { if (!sort.order) { - sortState.value = { sortField: 'create_time', sortOrder: 'DESC' } + sortState.value = { sortField: 'create_time', sortOrder: 'desc' } } else { sortState.value = { sortField: sort.prop, @@ -724,12 +704,6 @@ function handleRowClick(row: PackingTaskItem | null) { void loadDetail(row) } -function openDetail(row: PackingTaskItem | null) { - if (!row) return - selectedRow.value = row - void loadDetail(row) -} - async function loadDetail(row: PackingTaskItem | null | undefined) { if (!row || row.id == null) return detailLoading.value = true @@ -755,27 +729,18 @@ async function loadDetail(row: PackingTaskItem | null | undefined) { // ─── 录像相关 ────────────────────────────────────────────────────────────── const videoListVisible = ref(false) -const playerVisible = ref(false) const currentVideos = ref([]) -const playingVideo = ref(null) function openVideoList(row: PackingTaskItem) { currentVideos.value = (row.videos as VideoItem[]) || [] if (currentVideos.value.length === 0) return selectedRow.value = row - activeTab.value = 'videos' if (!detailVisible.value) { detailVisible.value = true } videoListVisible.value = true } -function handlePlayVideo(video: VideoItem) { - videoListVisible.value = false - playingVideo.value = video - playerVisible.value = true -} - function handleVideoListForceRecord() { videoListVisible.value = false if (selectedRow.value) { @@ -893,6 +858,8 @@ async function doForceRecord() { // ─── 初始化 ──────────────────────────────────────────────────────────────── onMounted(() => { loadData() + // 刷新后恢复未完成的导出任务进度弹窗(与其他导出页一致) + resumeExportTaskFromStorage() }) diff --git a/src/views/data/packingflow/packingflow-config.ts b/src/views/data/packingflow/packingflow-config.ts index e7a0c528..20800b37 100644 --- a/src/views/data/packingflow/packingflow-config.ts +++ b/src/views/data/packingflow/packingflow-config.ts @@ -238,6 +238,16 @@ export const baseAvailableFields = [ value: 'order_id', type: 'text' as const }), + // 工作台ID(文档 order.packing.export 的 where 字段含 workbench_id,精确匹配) + packingScanField('basic', { + label: '工作台ID', + value: 'workbench_id', + type: 'number' as const, + placeholder: '工作台ID', + operators: ['eq'], + defaultOperator: 'eq', + hideOperator: true + }), // 打包员(operator_text,任务主表展示文本列;默认模糊匹配,支持精确/包含) packingScanField('basic', { label: '打包员', diff --git a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue deleted file mode 100644 index 75f93ca8..00000000 --- a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index 9513b8d1..40143f38 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -50,7 +50,6 @@ @current-change="handleRowClick" @page-change="handlePageChange" @page-size-change="handlePageSizeChange" - @sort-change="handleSortChange" @refresh="loadList" @selection-change="onSelectionChange" > @@ -59,7 +58,7 @@ @@ -283,14 +281,12 @@ import { getStatusTextClass } from '@/utils/statusText' import { safeInvoke } from '@/utils/safe-invoke' import * as indexApi from '@/api/index/index' import BatchImportDialog from './component/BatchImportDialog.vue' -import PackageMaterialSearchForm from './form/PackageMaterialSearchForm.vue' import { packageMaterialCreate, packageMaterialDelete, packageMaterialGet, packageMaterialUpdate } from '@/api/setting.packagematerial/packagematerial' -import { useSettingsStore } from '@/stores/modules/settings' import { buildPackageMaterialListPayload, parsePackageMaterialListResponse, @@ -298,13 +294,13 @@ import { formatDimensions, formatNumber, formatPackageMaterialStatus, + formatPackageMaterialWeight, normalizePackageMaterialScanConditionToWhere, packageMaterialColumns, packageMaterialScanFields, type PackageMaterialRecord } from './package-material-config' -const settingsStore = useSettingsStore() const scanBox = ref(null) const upperTable = ref(null) const splitStackRef = ref(null) @@ -374,14 +370,12 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { const queryTime = ref(0) const tableSize = ref<'small' | 'default' | 'large'>('small') const currentConditionRaw = ref(null) -const currentSort = reactive({ prop: '', order: '' }) const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) const dialogVisible = ref(false) const dialogMode = ref<'create' | 'edit'>('create') const batchImportVisible = ref(false) -const searchFormVisible = ref(false) const formRef = ref() const formData = reactive({ id: undefined as number | undefined, @@ -402,13 +396,6 @@ const rules: FormRules = { material_name: [{ required: true, message: '请输入包材名称', trigger: 'blur' }] } -function handleSortChange({ prop, order }: any) { - currentSort.prop = prop - currentSort.order = order - pagination.currentPage = 1 - loadList() -} - function handleRowClick(_row: any) { // 预留行点击事件,用于未来扩展详情面板 } @@ -426,10 +413,30 @@ function onSelectionChange(rows: PackageMaterialRecord[]) { .map((id) => Number(id)) } -function pickOptionalNumber(value: number | undefined) { +function pickOptionalNumber(value: number | undefined | null) { return value === undefined || value === null ? undefined : value } +/** 编辑前的行快照:用于区分「未修改」与「被清空」 */ +const editingSnapshot = ref(null) + +type NumericFieldKey = 'length' | 'width' | 'height' | 'weight' | 'cost_price' + +/** + * 编辑态数值字段取值: + * - 有值 → 直接下发 + * - 被清空(undefined/null/NaN)且原值有值 → 显式下发 null(后端 update 支持 null 清空,实测) + * - 原本就为空 → 不下发(保持“未传=保持原值”) + */ +function pickUpdateNumber(key: NumericFieldKey): number | null | undefined { + const current = formData[key] + const isEmpty = current === undefined || current === null || (typeof current === 'number' && Number.isNaN(current)) + if (!isEmpty) return current + const before = editingSnapshot.value?.[key] + const hadValue = before !== undefined && before !== null + return hadValue ? null : undefined +} + function buildCreatePayload() { const payload: Record = { material_code: formData.material_code.trim(), @@ -462,11 +469,11 @@ function buildUpdatePayload() { const spec = formData.spec.trim() payload.material_type = materialType || '' payload.spec = spec || '' - const length = pickOptionalNumber(formData.length) - const width = pickOptionalNumber(formData.width) - const height = pickOptionalNumber(formData.height) - const weight = pickOptionalNumber(formData.weight) - const costPrice = pickOptionalNumber(formData.cost_price) + const length = pickUpdateNumber('length') + const width = pickUpdateNumber('width') + const height = pickUpdateNumber('height') + const weight = pickUpdateNumber('weight') + const costPrice = pickUpdateNumber('cost_price') if (length !== undefined) payload.length = length if (width !== undefined) payload.width = width if (height !== undefined) payload.height = height @@ -482,13 +489,11 @@ async function loadList() { const start = Date.now() try { const where = normalizePackageMaterialScanConditionToWhere(currentConditionRaw.value) - const order = currentSort.prop ? { [currentSort.prop]: currentSort.order === 'ascending' ? 'ASC' : 'DESC' } : undefined const res: any = await packageMaterialGet( buildPackageMaterialListPayload({ page: pagination.currentPage, pageSize: pagination.pageSize, - where, - order + where }) ) if (!isSuccess(res)) { @@ -563,6 +568,7 @@ function resetForm() { formData.weight = undefined formData.cost_price = undefined formData.status = 1 + editingSnapshot.value = null formRef.value?.clearValidate() } @@ -576,16 +582,17 @@ function openEdit(row: PackageMaterialRecord) { if (!row.id) return dialogMode.value = 'edit' dialogVisible.value = true + editingSnapshot.value = { ...row } formData.id = row.id formData.material_code = row.material_code || '' formData.material_name = row.material_name || '' formData.material_type = row.material_type || '' formData.spec = row.spec || '' - formData.length = row.length - formData.width = row.width - formData.height = row.height - formData.weight = row.weight - formData.cost_price = row.cost_price + formData.length = row.length ?? undefined + formData.width = row.width ?? undefined + formData.height = row.height ?? undefined + formData.weight = row.weight ?? undefined + formData.cost_price = row.cost_price ?? undefined formData.status = row.status === 0 ? 0 : 1 formRef.value?.clearValidate() } diff --git a/src/views/material/packageMaterial/package-material-config.ts b/src/views/material/packageMaterial/package-material-config.ts index e2f337f8..09009355 100644 --- a/src/views/material/packageMaterial/package-material-config.ts +++ b/src/views/material/packageMaterial/package-material-config.ts @@ -57,6 +57,8 @@ export const packageMaterialColumns = [ { prop: 'weight', label: '重量(g)', width: '90' }, { prop: 'cost_price', label: '成本价', width: '100' }, { prop: 'status', label: '状态', width: '90' }, + { prop: 'created_at', label: '创建时间', width: '168', formatter: (row: PackageMaterialRecord) => formatDateTime(row.created_at) }, + { prop: 'updated_at', label: '更新时间', width: '168', formatter: (row: PackageMaterialRecord) => formatDateTime(row.updated_at) }, { prop: 'actions', label: '操作', width: '150', fixed: 'right' } ] @@ -67,8 +69,11 @@ export const packageMaterialScanFields = [ type: 'text', group: '基础信息', placeholder: '编码/名称/类型', - operators: ['eq','contains'], - defaultOperator: 'eq' + // quickWhere 由 normalizePackageMaterialScanConditionToWhere 固定转成纯字符串(后端按模糊匹配处理), + // 操作符实际不生效,故隐藏下拉避免“等于”误导 + operators: ['contains'], + defaultOperator: 'contains', + hideOperator: true }, { value: 'material_code', @@ -223,15 +228,30 @@ export function formatNumber(value: unknown, digits = 2): string { return Number.isInteger(num) ? String(num) : num.toFixed(digits) } +/** 重量展示:空值直接 --,有值补 g 单位(避免出现 `--g`) */ +export function formatPackageMaterialWeight(value: unknown): string { + if (value === null || value === undefined || value === '') return '--' + const num = Number(value) + if (!Number.isFinite(num)) return String(value) + return `${formatNumber(num)}g` +} + +/** 时间展示:YYYY-MM-DD HH:mm:ss,空值/非法值回退 -- */ +export function formatDateTime(value: unknown): string { + if (value === null || value === undefined || value === '') return '--' + const date = new Date(String(value)) + if (Number.isNaN(date.getTime())) return String(value) + const pad = (n: number) => String(n).padStart(2, '0') + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}` +} + export function buildPackageMaterialListPayload(options: { page: number pageSize: number where?: Record - order?: Record }) { + // 仅用文档声明的 pagination;顶层 page/pageSize 与后端的 order/sort 均未在文档中且实测被忽略 const payload: Record = { - page: options.page, - pageSize: options.pageSize, pagination: { page: options.page, pageSize: options.pageSize @@ -240,9 +260,6 @@ export function buildPackageMaterialListPayload(options: { if (options.where && Object.keys(options.where).length) { payload.where = options.where } - if (options.order && Object.keys(options.order).length) { - payload.order = options.order - } return payload } diff --git a/src/views/material/packageSupplier/index.vue b/src/views/material/packageSupplier/index.vue index 34a63a66..31b236de 100644 --- a/src/views/material/packageSupplier/index.vue +++ b/src/views/material/packageSupplier/index.vue @@ -50,7 +50,6 @@ @current-change="handleRowClick" @page-change="handlePageChange" @page-size-change="handlePageSizeChange" - @sort-change="handleSortChange" @refresh="loadList" @selection-change="onSelectionChange" > @@ -192,7 +191,6 @@ import { packageSupplierGet, packageSupplierUpdate } from '@/api/setting.packagesupplier/packagesupplier' -import { useSettingsStore } from '@/stores/modules/settings' import { buildPackageSupplierListPayload, parsePackageSupplierListResponse, @@ -204,7 +202,6 @@ import { type PackageSupplierRecord } from './package-supplier-config' -const settingsStore = useSettingsStore() const scanBox = ref(null) const upperTable = ref(null) const splitStackRef = ref(null) @@ -273,7 +270,6 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { const queryTime = ref(0) const tableSize = ref<'small' | 'default' | 'large'>('small') const currentConditionRaw = ref(null) -const currentSort = reactive({ prop: '', order: '' }) const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) @@ -296,13 +292,6 @@ const rules: FormRules = { const isSuccess = (res: any) => res && [0, 1, 200].includes(res.code) -function handleSortChange({ prop, order }: any) { - currentSort.prop = prop - currentSort.order = order - pagination.currentPage = 1 - loadList() -} - function handleRowClick(_row: any) { // 预留行点击事件,用于未来扩展详情面板 } @@ -348,13 +337,11 @@ async function loadList() { const start = Date.now() try { const where = normalizePackageSupplierScanConditionToWhere(currentConditionRaw.value) - const order = currentSort.prop ? { [currentSort.prop]: currentSort.order === 'ascending' ? 'ASC' : 'DESC' } : undefined const res: any = await packageSupplierGet( buildPackageSupplierListPayload({ page: pagination.currentPage, pageSize: pagination.pageSize, - where, - order + where }) ) if (!isSuccess(res)) { diff --git a/src/views/material/packageSupplier/package-supplier-config.ts b/src/views/material/packageSupplier/package-supplier-config.ts index d1019930..587b81b3 100644 --- a/src/views/material/packageSupplier/package-supplier-config.ts +++ b/src/views/material/packageSupplier/package-supplier-config.ts @@ -39,9 +39,11 @@ export const packageSupplierColumns = [ // { prop: 'id', label: 'ID', width: '80', sortable: true }, { prop: 'supplier_code', label: '供应商编码', minWidth: '130', showOverflowTooltip: true }, { prop: 'supplier_name', label: '供应商名称', minWidth: '160', showOverflowTooltip: true }, - { prop: 'contact_name', label: '联系人', minWidth: '120', showOverflowTooltip: true }, - { prop: 'contact_phone', label: '联系电话', minWidth: '140', showOverflowTooltip: true }, + { prop: 'contact_name', label: '联系人', minWidth: '120', showOverflowTooltip: true, formatter: (row: PackageSupplierRecord) => formatOptionalText(row.contact_name) }, + { prop: 'contact_phone', label: '联系电话', minWidth: '140', showOverflowTooltip: true, formatter: (row: PackageSupplierRecord) => formatOptionalText(row.contact_phone) }, { prop: 'status', label: '状态', width: '90' }, + { prop: 'created_at', label: '创建时间', width: '168', formatter: (row: PackageSupplierRecord) => formatDateTime(row.created_at) }, + { prop: 'updated_at', label: '更新时间', width: '168', formatter: (row: PackageSupplierRecord) => formatDateTime(row.updated_at) }, { prop: 'actions', label: '操作', width: '150', fixed: 'right' } ] @@ -52,8 +54,11 @@ export const packageSupplierScanFields = [ type: 'text', group: '基础信息', placeholder: '编码/名称/联系人/电话', - operators: ['eq','contains'], - defaultOperator: 'eq' + // quickWhere 由 normalizePackageSupplierScanConditionToWhere 固定转成纯字符串(后端按模糊匹配处理), + // 操作符实际不生效,故隐藏下拉避免“等于”误导 + operators: ['contains'], + defaultOperator: 'contains', + hideOperator: true }, { value: 'supplier_code', @@ -189,6 +194,21 @@ export function normalizePackageSupplierScanConditionToWhere( return where } +/** 文本展示:空值 / 空串统一显示 -- */ +export function formatOptionalText(value: unknown): string { + const text = String(value ?? '').trim() + return text || '--' +} + +/** 时间展示:YYYY-MM-DD HH:mm:ss,空值/非法值回退 -- */ +export function formatDateTime(value: unknown): string { + if (value === null || value === undefined || value === '') return '--' + const date = new Date(String(value)) + if (Number.isNaN(date.getTime())) return String(value) + const pad = (n: number) => String(n).padStart(2, '0') + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}` +} + export function formatPackageSupplierStatus(status: string | number | undefined) { const raw = String(status ?? '').trim() if (!raw) return { text: '--', type: 'info' as const } @@ -205,11 +225,9 @@ export function buildPackageSupplierListPayload(options: { page: number pageSize: number where?: Record - order?: Record }) { + // 仅用文档声明的 pagination;顶层 page/pageSize 与后端的 order/sort 均未在文档中且实测被忽略 const payload: Record = { - page: options.page, - pageSize: options.pageSize, pagination: { page: options.page, pageSize: options.pageSize @@ -218,9 +236,6 @@ export function buildPackageSupplierListPayload(options: { if (options.where && Object.keys(options.where).length) { payload.where = options.where } - if (options.order && Object.keys(options.order).length) { - payload.order = options.order - } return payload } diff --git a/src/views/storage/entry/entry-config.ts b/src/views/storage/entry/entry-config.ts index db16e898..31e80cd4 100644 --- a/src/views/storage/entry/entry-config.ts +++ b/src/views/storage/entry/entry-config.ts @@ -93,6 +93,14 @@ export function translateEntryField(fieldValue: string, value: unknown): string } export const availableFields: EntryScanFieldConfig[] = [ + // 快捷搜索:对应 where.quickWhere(服务端在入库单号/采购单号/供应商/货主/仓库等字段 OR 模糊),直接传字符串 + entryScanBasicField({ + label: '快捷搜索', + value: 'quickWhere', + type: 'text', + placeholder: '入库单号/采购单号/供应商', + hideOperator: true, + }), entryScanBasicField({ label: '入库单号', value: 'entry_order_code', @@ -1051,20 +1059,3 @@ export function buildReceivingCompareSummaryItems( return items } - -export const addEntryFields = [ - { label: '业务类型', prop: 'order_type', type: 'select', options: [ - { label: '生产入库', value: 'SCRK' }, - { label: '领用入库', value: 'LYRK' }, - { label: '拆解入库', value: 'CCRK' }, - { label: '采购入库', value: 'CGRK' }, - { label: '调拨入库', value: 'DBRK' }, - { label: '其他入库', value: 'QTRK' }, - { label: 'B2B入库', value: 'B2BRK' }, - { label: '虚拟入库', value: 'XNRK' }, - ]}, - { label: '货主', prop: 'store_id', type: 'select', options: [] }, - { label: '入库单号', prop: 'entry_order_code' }, - { label: '采购单号', prop: 'purchase_order_code' }, - { label: '备注', prop: 'remark', type: 'textarea' } -] diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue index 2b0e1129..3bf05bc0 100644 --- a/src/views/storage/entry/index.vue +++ b/src/views/storage/entry/index.vue @@ -230,33 +230,6 @@ :receiving-bindings="receivingBindingsDialogData" /> - - - - - - - - - - - - - - - - - - (null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(availableFields))) -const addEntryFieldsRef = reactive(JSON.parse(JSON.stringify(addEntryFields))) const activeTab = ref('details') @@ -582,15 +553,22 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { safeInvoke(() => handler()) } -const quickSearch = ref('') const currentSort = reactive({ prop: '', order: '' }) // 导出相关 —— 使用异步任务模式 function buildExportPayload() { - if (currentCondition.value && currentCondition.value !== 'reset') { - return { where: normalizeToWhere(currentCondition.value) } - } - return { where: normalizeToWhere({}) } + const sort = currentSort.prop + ? { + sortField: currentSort.prop, + sortOrder: currentSort.order === 'ascending' ? 'ASC' : 'DESC' + } + : undefined + const where = + currentCondition.value && currentCondition.value !== 'reset' + ? normalizeToWhere(currentCondition.value) + : normalizeToWhere({}) + // 导出接口(未文档化)实测接受 sort,与列表保持同序 + return sort ? { where, sort } : { where } } function buildExportSelectedPayload() { @@ -744,6 +722,17 @@ function formatTime(val: any) { * - 是简单值(string/number/array):包装为 { operator: 'eq', value: val } * - 空或 undefined:忽略该字段 */ +/** + * quickWhere:项目惯例直接传字符串(服务端在入库单号/采购单号/供应商/货主/仓库等字段 OR 模糊), + * 不能包成 { operator, value } 对象 + */ +function assignQuickWhere(source: any, where: Record) { + const raw = source?.quickWhere + const text = raw && typeof raw === 'object' && 'value' in raw ? (raw as any).value : raw + if (text === undefined || text === null || String(text).trim() === '') return + where.quickWhere = String(text).trim() +} + // 将 scan-box 返回的条件标准化为后端推荐结构:{ operator, value, type } function normalizeToWhere(condition: any) { if (!condition) return {} @@ -789,7 +778,9 @@ function normalizeToWhere(condition: any) { // 如果来自 ScanBox 的 preset(包含 conditions) if (condition.conditions && typeof condition.conditions === 'object') { const where: any = {} + assignQuickWhere(condition.conditions, where) Object.keys(condition.conditions).forEach(k => { + if (k === 'quickWhere') return const result = processConditionValue(k, condition.conditions[k]) if (result) where[k] = result }) @@ -799,7 +790,9 @@ function normalizeToWhere(condition: any) { // 普通自定义条件对象 if (typeof condition === 'object') { const where: any = {} + assignQuickWhere(condition, where) Object.keys(condition).forEach(k => { + if (k === 'quickWhere') return const result = processConditionValue(k, condition[k]) if (result) where[k] = result }) @@ -989,9 +982,6 @@ async function loadFilterData() { const stores = storesRes.stores || [] const f = availableFieldsRef.find((i: any) => i.value === 'store_id') if (f) f.options = stores - - const af = addEntryFieldsRef.find((i: any) => i.prop === 'store_id') - if (af) af.options = stores } if (presetRes && presetRes.code === 200) { presetTree.value = presetRes.presetTree || [] @@ -1069,26 +1059,6 @@ function handlePageSizeChange(size: number) { loadData() } -function onQuickSearch() { - pagination.currentPage = 1 - loadData() -} - -// 新建入库单相关 -const createDialogVisible = ref(false) -const createLoading = ref(false) -const createForm = reactive({ - order_type: '', - store_id: '', - entry_order_code: '', - purchase_order_code: '', - remark: '' -}) - -function handleCreateEntry() { - ElMessage.warning('接口已下线:入库单不再支持手工新建,请使用快捷入库/匹配入库流程') -} - /** 一键上架后是否通知货主:返回 0=通知、1=不通知;关闭/ESC 返回 null(取消) */ async function askOwnerNotice(actionDesc: string): Promise { return new Promise((resolve) => { @@ -1231,13 +1201,6 @@ async function handleReviewConfirm() { reviewSubmitting.value = false } } -function handleCreateDialogClosed() { - Object.keys(createForm).forEach(key => createForm[key] = '') -} - -async function submitCreateEntry() { - ElMessage.warning('接口已下线:storage.entry.create 不再对外开放') -} async function confirmBatchCancel() { if (!selectionRows.value.length) { diff --git a/src/views/storage/inventory/component/InventoryStockPickerDialog.vue b/src/views/storage/inventory/component/InventoryStockPickerDialog.vue deleted file mode 100644 index cd2aaf7f..00000000 --- a/src/views/storage/inventory/component/InventoryStockPickerDialog.vue +++ /dev/null @@ -1,534 +0,0 @@ - - - - - diff --git a/src/views/storage/inventory/component/log.vue b/src/views/storage/inventory/component/log.vue deleted file mode 100644 index cea42337..00000000 --- a/src/views/storage/inventory/component/log.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/storage/inventory/index.vue b/src/views/storage/inventory/index.vue index 772fe509..f02531f1 100644 --- a/src/views/storage/inventory/index.vue +++ b/src/views/storage/inventory/index.vue @@ -39,7 +39,7 @@
@@ -113,7 +114,7 @@
@@ -128,7 +129,6 @@
-
@@ -178,7 +178,7 @@