diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html index 6b1bbb27..6549cdb8 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html @@ -258,91 +258,91 @@ /*暂收-采购单(仓库入库)*/ if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){ - actions.push('暂收 '); + actions.push('暂收 '); } /*暂收-采购单(仓库入库)详情*/ if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){ - actions.push('详情 '); + actions.push('详情 '); } /*暂收-采购单(采购入库)*/ if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){ - actions.push('暂收 '); + actions.push('暂收 '); } /*暂收-采购单(采购入库)详情*/ if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){ - actions.push('详情 '); + actions.push('详情 '); } /*暂收-委外单*/ if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && row.warehouseStorageStatus == 0 ){ - actions.push('暂收 '); + actions.push('暂收 '); } /*暂收-委外单 详情*/ if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-采购单(采购入库)*/ if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-采购单(采购入库)详情*/ if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-采购单(仓库入库)*/ if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-采购单(仓库入库) 详情*/ if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-委外单*/ if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-委外单 详情*/ if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-生产订单(生产入库)*/ if ( row.warehouseStorageType == 5 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-生产订单(生产入库) 详情*/ if ( row.warehouseStorageType == 5 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-生产订单(委内入库)*/ if ( row.warehouseStorageType == 2 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-生产订单(委内入库) 详情*/ if ( row.warehouseStorageType == 2 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-退换货单*/ if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ - actions.push('入库 '); + actions.push('入库 '); } /*入库-退换货单 详情*/ if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){ - actions.push('详情 '); + actions.push('详情 '); } /*入库-退料单*/