From 26c1f1d3dac54841f53dce43fd271d2fb91d5114 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 25 Jun 2024 13:37:16 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8C=89=E9=92=AE=E7=9A=84=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=BA:(row.makeStatus=20=3D=3D=20'3'=20||?=
 =?UTF-8?q?=20row.makeStatus=20=3D=3D=20'4'=20||=20row.makeStatus=20=3D=3D?=
 =?UTF-8?q?=20'5')=20&&=20(row.eceiptStatus=20=3D=3D=20'7'=20||=20row.ecei?=
 =?UTF-8?q?ptStatus=20=3D=3D=20'8')?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/makeorder/makeorder.html   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index ef301b71..4fac1404 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -245,7 +245,8 @@
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')">工程审核</a> ');
                         }
                         // 领料
-                        if(row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5'){
+                        if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
+                            (row.eceiptStatus == '7' || row.eceiptStatus == '8')){
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')">领料</a> ');
                         }
                         // 委内入库