From 87b78abb2004027fdf68b19c214848feb93daff0 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 31 Dec 2024 18:34:11 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=83=A8=E5=88=86=E5=87=BA=E8=B4=A7=E4=B9=9F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=91=E8=B5=B7=E5=87=BA=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/salesShippingInform/salesShippingInform.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 1475393d..42dd9158 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -308,7 +308,7 @@
                             actions.push('<a class=" ' + confirmShippingFlag + '" href="javascript:void(0)" onclick="confirmShipping(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>确认发货</a> ');
                             actions.push('<a class=" ' + cancelShippingFlag + '" href="javascript:void(0)" onclick="cancelShipping(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>取消发货</a> ');
                         }
-                        if(row.warehouseOutStatus == '9'){
+                        if(row.warehouseOutStatus == '9' || row.warehouseOutStatus == '13'){
                             actions.push('<a class=" ' + confirmReceivingFlag + '" href="javascript:void(0)" onclick="confirmReceiving(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>确认收货</a> ');
                         }
                         var actionLinks = actions.join('');