diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html index 7d5e01f5..984038c3 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html @@ -265,7 +265,6 @@ sidePagination: "server", contentType: "application/x-www-form-urlencoded", queryParams : { - salesOrderCode: row.salesOrderCode, materialNo: row.materialNo, }, columns: [ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html index 13a976a8..c037a3be 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -192,6 +192,10 @@ /*销售单-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){ actions.push('出库 '); + } + + /*销售单-出库详情*/ + if (row.warehouseOrderType == 0 && row.warehouseOutType == 0 && row.warehouseOutStatus != 0 ){ actions.push('详情 '); } @@ -219,7 +223,7 @@ actions.push('出库 '); } - /*退换货-出库*/ + /*退换货-出库详情*/ if (row.warehouseOrderType == 4 && row.warehouseOutType == 4){ actions.push('详情 '); }