diff --git a/src/views/agvTask/TesAgvList.vue b/src/views/agvTask/TesAgvList.vue index 728b514..14dc61e 100644 --- a/src/views/agvTask/TesAgvList.vue +++ b/src/views/agvTask/TesAgvList.vue @@ -298,7 +298,7 @@ placement: 'topLeft', }, auth: 'agvTask:data_agv_task:edit', - disabled: record.status === 4 || record.status === 1 || record.status === 5, + disabled: record.status === 4 || record.status === 1 , }, { label: '任务取消', diff --git a/src/views/inventory/Inventory.data.ts b/src/views/inventory/Inventory.data.ts index 1a9afd8..8c8c8b4 100644 --- a/src/views/inventory/Inventory.data.ts +++ b/src/views/inventory/Inventory.data.ts @@ -86,4 +86,10 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'description', }, + { + title: '创建时间', + align: 'center', + dataIndex: 'createTime', + sorter: true, + }, ]; diff --git a/src/views/inventoryLog/InventoryLog.data.ts b/src/views/inventoryLog/InventoryLog.data.ts index e1d4874..143382c 100644 --- a/src/views/inventoryLog/InventoryLog.data.ts +++ b/src/views/inventoryLog/InventoryLog.data.ts @@ -87,5 +87,41 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'afterAllocatedQty', width: 100, - } + }, + { + title: '外部仓库', + align: 'center', + dataIndex: 'whCode', + width: 100, + }, + { + title: '项目号', + align: 'center', + dataIndex: 'project', + width: 100, + }, + { + title: '任务号', + align: 'center', + dataIndex: 'taskNo', + width: 100, + }, + { + title: '批次号', + align: 'center', + dataIndex: 'propC1', + width: 100, + }, + { + title: '外部库存状态', + align: 'center', + dataIndex: 'propC3', + width: 110, + }, + { + title: '创建时间', + align: 'center', + dataIndex: 'createTime', + sorter: true, + }, ]; diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts index f735169..637cc17 100644 --- a/src/views/shipping/Pick.data.ts +++ b/src/views/shipping/Pick.data.ts @@ -97,6 +97,11 @@ export const pickDetailColumns: JVxeColumn[] = [ key: 'pickId', type: JVxeTypes.hidden, }, + { + title: '顺序号', + key: 'lineNo', + type: JVxeTypes.normal, + }, { title: '物料', key: 'itemId',