From 216ab4c62a1f777c4a100690371d61f43a82e60c Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 11 Jul 2024 16:03:26 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93=E5=8D=95=20=E9=94=80?=
 =?UTF-8?q?=E5=94=AE-=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseOutOrder/salesOutWarehouseDetail.html          | 1 -
 .../warehouse/warehouseOutOrder/warehouseOutOrder.html      | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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('<a class="btn btn-success btn-xs ' + salesOutWarehouseFlag + '" href="javascript:void(0)" onclick="salesOutWarehouse(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>出库</a> ');
+                        }
+
+                        /*销售单-出库详情*/
+                        if (row.warehouseOrderType == 0 && row.warehouseOutType == 0 && row.warehouseOutStatus != 0 ){
                             actions.push('<a class="btn btn-success btn-xs ' + salesOutWarehouseDetailFlag + '" href="javascript:void(0)" onclick="salesOutWarehouseDetail(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
@@ -219,7 +223,7 @@
                             actions.push('<a class="btn btn-success btn-xs ' + refundsExchangesOutWarehouseFlag + '" href="javascript:void(0)" onclick="refundsExchangesOutWarehouse(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>出库</a> ');
                         }
 
-                        /*退换货-出库*/
+                        /*退换货-出库详情*/
                         if (row.warehouseOrderType == 4 && row.warehouseOutType == 4){
                             actions.push('<a class="btn btn-success btn-xs ' + refundsExchangesOutWarehouseDetailFlag + '" href="javascript:void(0)" onclick="refundsExchangesOutWarehouseDetail(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }