diff --git a/dist.tar.gz b/dist.tar.gz index 3853487e..665b18b4 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue index 4b5c27e5..413ff4d3 100644 --- a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue +++ b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue @@ -8,14 +8,14 @@ :close-on-click-modal="!loading" @closed="emit('closed')" > - + /> --> diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index fe01f812..5ac751a5 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -27,7 +27,7 @@ > 批量删除 - 共 {{ pagination.total }} 条 +
快速搜索 @@ -40,6 +40,7 @@ 批量删除 - 共 {{ pagination.total }} 条 +
新增供应商 @@ -36,6 +36,7 @@ formatComboGoodsDateTime(row.updated_at) }, - { prop: 'actions', label: '操作', width: '150', align: 'center', fixed: 'right' } + { prop: 'actions', label: '操作', width: '150', fixed: 'right' } ] export const comboGoodsScanFields = [ diff --git a/src/views/stock/combo_stock/index.vue b/src/views/stock/combo_stock/index.vue index 1b4e3622..8c4f4e06 100644 --- a/src/views/stock/combo_stock/index.vue +++ b/src/views/stock/combo_stock/index.vue @@ -30,6 +30,7 @@ row['store_stock.store_remask'] || '--' }, { @@ -73,7 +72,6 @@ export const stockColumns = [ prop: 'images', label: '商品图片', width: '120', - align: 'center', imgs: (row: any) => { return row.images || [] } @@ -82,7 +80,6 @@ export const stockColumns = [ prop: 'gross_weight', label: '毛重', width: '100', - align: 'right', formatter: (row: any) => row.gross_weight ? `${formatNumber(row.gross_weight, 0)}g` : '--' }, { @@ -120,7 +117,6 @@ export const stockColumns = [ prop: 'quantity', label: '库存数量', width: '100', - align: 'right', sortable: true, formatter: (row: any) => formatNumber(row.quantity || 0, 0) }, @@ -128,7 +124,6 @@ export const stockColumns = [ prop: 'locked_quantity', label: '锁定量', width: '100', - align: 'right', sortable: true, formatter: (row: any) => formatNumber(row.locked_quantity || 0, 0) }, @@ -136,7 +131,6 @@ export const stockColumns = [ prop: 'available_quantity', label: '可用库存', width: '100', - align: 'right', sortable: true, formatter: (row: any) => { const available = row.available_quantity || Math.max(0, (row.quantity || 0) - (row.locked_quantity || 0)) @@ -147,20 +141,17 @@ export const stockColumns = [ prop: 'lock_rate_display', label: '锁定率', width: '100', - align: 'right', formatter: (row: any) => row.lock_rate_display || '--' }, { prop: 'stock_unit', label: '库存单位', - width: '100', - align: 'center' + width: '100' }, { prop: 'tag_price', label: '标价', width: '100', - align: 'right', sortable: true, formatter: (row: any) => row.tag_price ? `¥${formatNumber(row.tag_price, 2)}` : '--' }, @@ -168,7 +159,6 @@ export const stockColumns = [ prop: 'retail_price', label: '零售价', width: '100', - align: 'right', sortable: true, formatter: (row: any) => row.retail_price ? `¥${formatNumber(row.retail_price, 2)}` : '--' }, @@ -176,7 +166,6 @@ export const stockColumns = [ prop: 'is_sn_mgmt', label: 'SN码', width: '80', - align: 'center', slotName: 'is_sn_mgmt', formatter: (row: any) => row.is_sn_mgmt === 'Y' ? '是' : '否' }, @@ -184,7 +173,6 @@ export const stockColumns = [ prop: 'is_shelf_life_mgmt', label: '保质期', width: '80', - align: 'center', slotName: 'is_shelf_life_mgmt', formatter: (row: any) => row.is_shelf_life_mgmt === 'Y' ? '是' : '否' }, @@ -192,14 +180,12 @@ export const stockColumns = [ prop: 'shelf_life_days', label: '保质期天数', width: '110', - align: 'right', formatter: (row: any) => row.shelf_life_days ? `${formatNumber(row.shelf_life_days, 0)}天` : '--' }, { prop: 'is_batch_mgmt', label: '批次', width: '80', - align: 'center', slotName: 'is_batch_mgmt', formatter: (row: any) => row.is_batch_mgmt === 'Y' ? '是' : '否' }, @@ -207,7 +193,6 @@ export const stockColumns = [ prop: 'dimensions', label: '尺寸(长×宽×高)', width: '180', - align: 'center', formatter: (row: any) => { if (!row.length && !row.width && !row.height) return '--' return `${row.length || 0} cm× ${row.width || 0} cm× ${row.height || 0}cm` @@ -217,21 +202,18 @@ export const stockColumns = [ prop: 'level', label: 'ABC分类', sortable: true, - align: 'center', width: '100', }, { prop: 'volume', label: '体积', width: '100', - align: 'right', formatter: (row: any) => row.volume ? `${formatNumber(row.volume, 2)}cm³` : '--' }, { prop: 'net_weight', label: '净重', width: '100', - align: 'right', formatter: (row: any) => row.net_weight ? `${formatNumber(row.net_weight, 0)}g` : '--' }, { diff --git a/src/views/storage/entry/entry-config.ts b/src/views/storage/entry/entry-config.ts index 7ab20eb7..3227a409 100644 --- a/src/views/storage/entry/entry-config.ts +++ b/src/views/storage/entry/entry-config.ts @@ -192,7 +192,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: 'hasReceiving', label: '收货绑定', width: '100', align: 'center' }, + { prop: 'hasReceiving', label: '收货绑定', width: '100' }, { prop: 'receivingBindings', label: '绑定收货单', minWidth: '180' }, { prop: 'sync_status',label:'入库状态',width:'160' }, { prop: 'supplier_code',label:'供应商编码',width:'160' }, diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue index 64bdfbb5..2f768eeb 100644 --- a/src/views/storage/entry/index.vue +++ b/src/views/storage/entry/index.vue @@ -52,6 +52,7 @@ - - @@ -84,9 +81,6 @@ {{ selectedRowData.transaction_type === 'INBOUND' ? '入库' : '出库' }} - - {{ inventoryTypeMap[selectedRowData.inventory_type] || selectedRowData.inventory_type }} - {{ selectedRowData.stock_id }} {{ selectedRowData.space_id }} {{ selectedRowData.warehouse_id }} @@ -179,16 +173,6 @@ const selectedLogId = ref(null) const currentCondition = ref(null) const currentConditionRaw = ref(null) -const inventoryTypeMap: Record = { - ZP: '正品', - CC: '残次', - JS: '机损', - XS: '箱损', - ZT: '在途', - DJ: '待检', - FP: '返品' -} - const selectedRowData = computed(() => { return list.value.find(item => item.id === selectedLogId.value) || {} }) diff --git a/src/views/storage/log/log-config.ts b/src/views/storage/log/log-config.ts index c38c6d99..02631c3d 100644 --- a/src/views/storage/log/log-config.ts +++ b/src/views/storage/log/log-config.ts @@ -67,17 +67,16 @@ export const orderTypeConfig = { // 出入库记录列表列 export const transactionColumns = [ - { prop: 'stock_id', label: '商品ID', width: '100', align: 'center' }, - { prop: 'transaction_type', label: '交易类型', width: '100', align: 'center' }, - { prop: 'inventory_type', label: '库存类型', width: '100', align: 'center' }, - { prop: 'space_id', label: '库位ID', width: '100', align: 'center' }, - { prop: 'warehouse_id', label: '仓库ID', width: '100', align: 'center' }, - { prop: 'order_type', label: '订单类型', width: '100', align: 'center' }, - { prop: 'quantity', label: '数量', width: '100', align: 'right' }, - { prop: 'record_count', label: '记录数', width: '100', align: 'right' }, + { prop: 'stock_id', label: '商品ID', width: '100' }, + { prop: 'transaction_type', label: '交易类型', width: '100' }, + { prop: 'space_id', label: '库位ID', width: '100' }, + { prop: 'warehouse_id', label: '仓库ID', width: '100' }, + { prop: 'order_type', label: '订单类型', width: '100' }, + { prop: 'quantity', label: '数量', width: '100' }, + { prop: 'record_count', label: '记录数', width: '100' }, { prop: 'first_created_at', label: '首次创建', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.first_created_at) }, { prop: 'last_created_at', label: '最后创建', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.last_created_at) }, - { prop: 'operator_name', label: '操作人', width: '100', align: 'center' } + { prop: 'operator_name', label: '操作人', width: '100' } ] // scan-box 可用字段(基础信息在前,流程状态在后;对齐收货单 ScanBox 分组) diff --git a/src/views/storage/receiving/index.vue b/src/views/storage/receiving/index.vue index e2d9679f..ebaf57e6 100644 --- a/src/views/storage/receiving/index.vue +++ b/src/views/storage/receiving/index.vue @@ -31,7 +31,7 @@
- { return row.images || [] } }, - { prop: 'status', label: '收货状态', width: '90', align: 'center' }, - { prop: 'detail_status', label: '匹配状态', width: '90', align: 'center' }, - { prop: 'storage_status', label: '入库状态', width: '90', align: 'center' }, - { prop: 'is_review', label: '审核状态', width: '90', align: 'center' }, + { prop: 'status', label: '收货状态', width: '90' }, + { prop: 'detail_status', label: '匹配状态', width: '90' }, + { prop: 'storage_status', label: '入库状态', width: '90' }, + { prop: 'is_review', label: '审核状态', width: '90' }, { prop: 'store_name', label: '货主', width: '100' }, - { prop: 'total_items', label: '商品种类', width: '90', align: 'right', sortable: true }, - { prop: 'total_quantity', label: '总数量', width: '90', align: 'right', sortable: true }, - { prop: 'total_boxes', label: '总箱数', width: '90', align: 'right', sortable: true }, - { prop: 'total_pallets', label: '总托盘数', width: '90', align: 'right', sortable: true }, + { prop: 'total_items', label: '商品种类', width: '90', sortable: true }, + { prop: 'total_quantity', label: '总数量', width: '90', sortable: true }, + { prop: 'total_boxes', label: '总箱数', width: '90', sortable: true }, + { prop: 'total_pallets', label: '总托盘数', width: '90', sortable: true }, { prop: 'license_plate', label: '车牌号', width: '100' }, { prop: 'tracking_number', label: '物流单号', width: '120' }, { prop: 'video_device_id', label: '录像设备ID', width: '140' }, - { prop: 'delivery_method', label: '来货方式', width: '90', align: 'center' }, - { prop: 'loading_method', label: '装卸方式', width: '100', align: 'center' }, + { prop: 'delivery_method', label: '来货方式', width: '90' }, + { prop: 'loading_method', label: '装卸方式', width: '100' }, { prop: 'creator_name', label: '创建人', width: '100' }, { prop: 'receiving_start_time', label: '收货开始', width: '150', sortable: true, formatter: (row: any) => formatDateTime(row.receiving_start_time) }, { prop: 'receiving_end_time', label: '收货结束', width: '150', sortable: true, formatter: (row: any) => formatDateTime(row.receiving_end_time) }, { 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' }, + { prop: 'actions', label: '操作', width: '120', fixed: 'right' }, ] diff --git a/src/views/storage/report/index.vue b/src/views/storage/report/index.vue index 914afc90..18805a0e 100644 --- a/src/views/storage/report/index.vue +++ b/src/views/storage/report/index.vue @@ -34,6 +34,7 @@ ref="upperTable" row-key="__rid" title="报表明细" + default-align="center" table-id="storage-report-list" :enable-column-config="true" :data="list" diff --git a/src/views/storage/report/report-config.ts b/src/views/storage/report/report-config.ts index 1729ab3c..11fbfe8f 100644 --- a/src/views/storage/report/report-config.ts +++ b/src/views/storage/report/report-config.ts @@ -77,12 +77,11 @@ export const fixedReportColumns: ReportColumn[] = [ { prop: 'item_name', label: '商品名称', minWidth: 140, formatter: (row) => row.item_name || '--' }, { prop: 'item_code', label: '商品编码', minWidth: 120, formatter: (row) => row.item_code || '--' }, { prop: 'barcode', label: '条码', minWidth: 140, formatter: (row) => row.barcode || '--' }, - { prop: 'stock_id', label: 'SKU', width: 96, align: 'center', formatter: (row) => formatReportCell(row.stock_id) }, + { prop: 'stock_id', label: 'SKU', width: 96, formatter: (row) => formatReportCell(row.stock_id) }, { prop: 'begin_total', label: '期初数量', width: 104, - align: 'right', sortable: 'custom', formatter: (row) => formatReportNumber(row.begin_total) }, @@ -90,7 +89,6 @@ export const fixedReportColumns: ReportColumn[] = [ prop: 'inbound_total', label: '区间内入库', width: 112, - align: 'right', sortable: 'custom', formatter: (row) => formatReportNumber(row.inbound_total) }, @@ -98,7 +96,6 @@ export const fixedReportColumns: ReportColumn[] = [ prop: 'outbound_total', label: '区间内出库', width: 112, - align: 'right', sortable: 'custom', formatter: (row) => formatReportNumber(row.outbound_total) }, @@ -106,7 +103,6 @@ export const fixedReportColumns: ReportColumn[] = [ prop: 'end_total', label: '期末数量', width: 104, - align: 'right', sortable: 'custom', formatter: (row) => formatReportNumber(row.end_total) }, @@ -114,14 +110,12 @@ export const fixedReportColumns: ReportColumn[] = [ prop: 'start_time', label: '区间开始', width: 168, - align: 'center', formatter: (row) => formatReportDateTime(row.start_time) }, { prop: 'end_time', label: '区间结束', width: 168, - align: 'center', formatter: (row) => formatReportDateTime(row.end_time) } ] @@ -143,7 +137,6 @@ export function buildReportTableColumns(rows: StorageReportListItem[]) { prop, label: reportFieldLabels[prop] || prop, minWidth: 110, - align: /total|qty|count|amount|_id$/i.test(prop) ? 'right' : 'left', formatter: (row) => formatReportCell((row as any)[prop]) }) } diff --git a/src/views/storage/stockout/index.vue b/src/views/storage/stockout/index.vue index 26d44ed2..4cf68039 100644 --- a/src/views/storage/stockout/index.vue +++ b/src/views/storage/stockout/index.vue @@ -37,6 +37,7 @@ formatDateTime(row.place_order_time) }, { prop: 'updated_at', label: '更新时间', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.updated_at) } ] diff --git a/src/views/store/index.vue b/src/views/store/index.vue index 731a2328..5a8897d3 100644 --- a/src/views/store/index.vue +++ b/src/views/store/index.vue @@ -46,6 +46,7 @@
) { diff --git a/src/views/system/setting/shops/index.vue b/src/views/system/setting/shops/index.vue index fa7ae5fe..8a2e0580 100644 --- a/src/views/system/setting/shops/index.vue +++ b/src/views/system/setting/shops/index.vue @@ -26,6 +26,7 @@