领料单指定物料优化

src/views/modules/haianWarehouse/automatedWarehouse/orderTaskQuery54.vue

@@ -127,6 +127,12 @@
           border
           v-loading="dataListLoading"
           style="width: 100%;">
+          <!-- 查看明细固定最左，避免横向滚动后找不到操作入口 - rqrq -->
+          <el-table-column header-align="center" align="center" width="100" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="viewTransportDetail(scope.row)">查看明细</a>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList3" :key="index"
             :sortable="item.columnSortable"
@@ -141,11 +147,6 @@
               <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
             </template>
           </el-table-column>
-          <el-table-column header-align="center" align="center" width="100" label="操作">
-            <template slot-scope="scope">
-              <a type="text" size="small" @click="viewTransportDetail(scope.row)">查看明细</a>
-            </template>
-          </el-table-column>
         </el-table>
       </el-tab-pane>
 
@@ -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 },

src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="事务类型">
-        <!-- 海安回调查询仅认新中文：入货架（原入库）/出货架（原出库）/到达出库口（原取货通知）/离开入库口（原取走栈板）/到达异常位（原异常位处理）/到达手工分拣区 - rqrq -->
+        <!-- 海安回调查询仅认新中文：入货架（原入库）/出货架（原出库）/到达出库口（原取货通知）/离开入库口（原取走栈板）/到达异常位（原异常位处理）/到达手工分拣区/进入叠盘机 - rqrq -->
         <el-select v-model="queryData.transTypeDesc" placeholder="请选择" style="width: 160px" clearable>
           <el-option label="全部" value=""></el-option>
           <el-option label="入货架" value="入货架"></el-option>
@@ -20,6 +20,7 @@
           <el-option label="离开入库口" value="离开入库口"></el-option>
           <el-option label="到达异常位" value="到达异常位"></el-option>
           <el-option label="到达手工分拣区" value="到达手工分拣区"></el-option>
+          <el-option label="进入叠盘机" value="进入叠盘机"></el-option>
         </el-select>
       </el-form-item>