diff --git a/src/views/storage/entry/component/entrydetail.vue b/src/views/storage/entry/component/entrydetail.vue
index 9dd6a145..4985eb07 100644
--- a/src/views/storage/entry/component/entrydetail.vue
+++ b/src/views/storage/entry/component/entrydetail.vue
@@ -50,11 +50,6 @@
导入
-
-
- {{ row.direct_inbound_quantity ?? 0 }}
-
-
{{ row.remaining_quantity ?? 0 }}
@@ -143,9 +138,8 @@ const canDirectInbound = computed(() => {
const detailColumns = computed(() => {
const columns = [...entrydetail]
const countIndex = columns.findIndex((col) => col.prop === 'count')
- const insertAt = countIndex >= 0 ? countIndex : columns.length
+ const insertAt = countIndex >= 0 ? countIndex + 1 : columns.length
columns.splice(insertAt, 0,
- { prop: 'direct_inbound_quantity', label: '已导入', width: '90', align: 'right' },
{ prop: 'remaining_quantity', label: '剩余可入', width: '90', align: 'right' },
)
if (canBatchImport.value) {
diff --git a/src/views/storage/entry/entry-config.ts b/src/views/storage/entry/entry-config.ts
index ea72ad1c..b2f36e6e 100644
--- a/src/views/storage/entry/entry-config.ts
+++ b/src/views/storage/entry/entry-config.ts
@@ -227,10 +227,7 @@ export const entryColums = [
{ prop: 'warehouse_name', label: '仓库', width: '120' },
{ prop: 'order_type', label: '类型', width: '100' },
{ prop: 'purchase_order_code', label: '单据编号', width: '160' },
- { prop: 'total_order_lines', label: '商品数', width: '80', sortable: 'custom' },
- { prop: 'order_status', label: '订单状态', width: '100' },
- { prop: 'hasReceiving', label: '收货绑定', width: '100' },
- { prop: 'receivingBindings', label: '绑定收货单', minWidth: '180' },
+ { prop: 'total_order_lines', label: '商品种类数', width: '110', sortable: 'custom' },
{ prop: 'sync_status', label: '入库状态', width: '100' },
{ prop: 'sync_message', label: '同步信息', minWidth: '220' },
{ prop: 'supplier_code', label: '供应商编码', width: '120' },
@@ -255,10 +252,7 @@ export const entryStoreColums = [
{ prop: 'warehouse_name', label: '仓库', width: '120' },
{ prop: 'order_type', label: '类型', width: '100' },
{ prop: 'purchase_order_code', label: '单据编号', width: '160' },
- { prop: 'total_order_lines', label: '商品数', width: '80', sortable: 'custom' },
- { prop: 'order_status', label: '订单状态', width: '100' },
- { prop: 'hasReceiving', label: '收货绑定', width: '100' },
- { prop: 'sync_status', label: '入库状态', width: '100' },
+ { prop: 'total_order_lines', label: '商品种类数', width: '110', sortable: 'custom' },
{ prop: 'sync_message', label: '同步信息', minWidth: '220' },
{ prop: 'supplier_code', label: '供应商编码', width: '120' },
{ prop: 'supplier_name', label: '供应商名称', width: '140' },
@@ -342,7 +336,6 @@ export const entrydetail = [
{ prop: 'stock_unit', label: '单位', width: '80' },
{ prop: 'count', label: '应收数量', width: '100', align: 'right' },
{ prop: 'received_quantity', label: '实收数量', width: '100', align: 'right' },
- { prop: 'warehouse_quantity', label: '库存数量', width: '100', align: 'right' },
{ prop: 'is_batch_mgmt', label: '批次管理', width: '100', align: 'center' },
{ prop: 'is_shelf_life_mgmt', label: '效期管理', width: '100', align: 'center' },
]