diff --git a/src/views/modules/haianWarehouse/automatedWarehouse/orderTaskQuery54.vue b/src/views/modules/haianWarehouse/automatedWarehouse/orderTaskQuery54.vue index 1946484..6f42186 100644 --- a/src/views/modules/haianWarehouse/automatedWarehouse/orderTaskQuery54.vue +++ b/src/views/modules/haianWarehouse/automatedWarehouse/orderTaskQuery54.vue @@ -127,6 +127,12 @@ border v-loading="dataListLoading" style="width: 100%;"> + + + + {{ scope.row[item.columnProp] }} - - - @@ -297,13 +298,12 @@ export default { // { columnProp: 'priority', headerAlign: 'center', align: 'center', columnLabel: '优先级', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 60, showOverflowTooltip: true }, { columnProp: 'createdTime', headerAlign: 'center', align: 'center', columnLabel: '创建时间', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 140, showOverflowTooltip: true } ], - // 运输明细列 - rqrq + // 小车运行记录列:海安明细没有起始位置,目标点位按任务位置展示 - rqrq columnList4: [ { columnProp: 'seqNo', headerAlign: 'center', align: 'center', columnLabel: '步骤序号', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 80, showOverflowTooltip: true }, { columnProp: 'actionType', headerAlign: 'center', align: 'left', columnLabel: '动作类型', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 120, showOverflowTooltip: true }, { columnProp: 'comment', headerAlign: 'center', align: 'left', columnLabel: '备注', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 200, showOverflowTooltip: true }, - { columnProp: 'fromLocation', headerAlign: 'center', align: 'center', columnLabel: '起始位置', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 100, showOverflowTooltip: true }, - { columnProp: 'toLocation', headerAlign: 'center', align: 'center', columnLabel: '目标位置', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 100, showOverflowTooltip: true }, + { columnProp: 'toLocation', headerAlign: 'center', align: 'center', columnLabel: '任务位置', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 100, showOverflowTooltip: true }, { columnProp: 'agvCode', headerAlign: 'center', align: 'center', columnLabel: 'AGV编码', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 100, showOverflowTooltip: true }, { columnProp: 'status', headerAlign: 'center', align: 'center', columnLabel: '步骤状态', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 80, showOverflowTooltip: true }, { columnProp: 'startTime', headerAlign: 'center', align: 'center', columnLabel: '开始时间', columnHidden: false, columnSortable: false, fixed: '', columnWidth: 140, showOverflowTooltip: true }, diff --git a/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue b/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue index 68b9a87..03377ec 100644 --- a/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue +++ b/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue @@ -11,7 +11,7 @@ - + @@ -20,6 +20,7 @@ +