From bf4342a57fe6a45758ee400ee31c63f5e2d2f363 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 28 Oct 2024 09:30:32 +0800
Subject: [PATCH] =?UTF-8?q?app.config=E6=B7=BB=E5=8A=A0=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E6=9F=9C=E7=9A=84machine=5Fid,=E4=BA=A4=E6=8E=A5=E6=9F=9C?=
 =?UTF-8?q?=E8=A1=A5=E8=8D=AF=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                    | 2 ++
 DM_Weight/Views/AddToJiaoJieWindow.xaml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 1533a73..4e2f10b 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -13,6 +13,8 @@
 		
 		<!-- 设备id -->
 		<add key="machineId" value="DM3" />
+		<!--交接柜设备id-->
+		<add key="jj_machineId" value="DM5" />
 		<!--请领药库-->
 		<add key="colloctedId" value="住院,DM2,门诊,DM22" />
 		<!-- 供应单位 -->
diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml b/DM_Weight/Views/AddToJiaoJieWindow.xaml
index 4a16e67..3b6ccc2 100644
--- a/DM_Weight/Views/AddToJiaoJieWindow.xaml
+++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml
@@ -58,14 +58,14 @@
                     Style="{StaticResource MaterialDesignOutlinedLightButton}"
                     Content="取消" />-->
 
-                <Button
+                <Button Visibility="Collapsed"
                     Margin="3 0 3 0"
                     VerticalAlignment="Center"
                     Command="{Binding RejectReport_Download}"
                     Style="{StaticResource MaterialDesignOutlinedLightButton}"
                     Content="注射剂报表" />
 
-                <Button
+                <Button Visibility="Collapsed"
                     Margin="3 0 3 0"
                     VerticalAlignment="Center"
                     Command="{Binding Account_Download}"