diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof
index 1b9204a..5f05724 100644
--- a/打卷检验管理/TradeManage.dof
+++ b/打卷检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\������Ŀ����\��Ŀ����\巺�\����������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJchenhang\����������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/打卷检验管理/TradeManage.dpr b/打卷检验管理/TradeManage.dpr
index ab999ad..f0caa31 100644
--- a/打卷检验管理/TradeManage.dpr
+++ b/打卷检验管理/TradeManage.dpr
@@ -3,7 +3,7 @@ uses
   SysUtils,
   classes,
   forms,
-  WinTypes,
+  WinTypes,                
   WinProcs,
   U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule},
   U_GetDllForm in 'U_GetDllForm.pas',                                                                   
diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index bbe9f90..2414df8 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -149,19 +149,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25209#37327#20462#25913#27611#37325
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton15Click
     end
     object ToolButton8: TToolButton
-      Left = 0
-      Top = 30
+      Left = 1214
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton17: TToolButton
-      Left = 111
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#21367#21495
@@ -169,7 +169,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton17Click
     end
     object ToolButton1: TToolButton
-      Left = 222
+      Left = 111
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -177,7 +177,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 309
+      Left = 198
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -185,7 +185,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 396
+      Left = 285
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -194,7 +194,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 495
+      Left = 384
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
@@ -202,7 +202,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 606
+      Left = 495
       Top = 30
       AutoSize = True
       Caption = #25171#21360
@@ -210,7 +210,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 669
+      Left = 558
       Top = 30
       Width = 68
       Height = 30
@@ -225,7 +225,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 737
+      Left = 626
       Top = 33
       Width = 149
       Height = 24
@@ -250,7 +250,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 886
+      Left = 775
       Top = 30
       Width = 121
       Height = 30
@@ -264,7 +264,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 1007
+      Left = 896
       Top = 30
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
@@ -272,7 +272,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 1114
+      Left = 1003
       Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
@@ -280,7 +280,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 1201
+      Left = 1090
       Top = 30
       AutoSize = True
       Caption = #23548#20986
@@ -288,7 +288,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 1264
+      Left = 1153
       Top = 30
       AutoSize = True
       Caption = #20851#38381
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index 292ba8b..8878dfc 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -1666,7 +1666,7 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥') then
+  if (trim(ComboBox1.Text) = '�����뵥')   or (trim(ComboBox1.Text) = '�����뵥(ë��)') then
   begin
     with ADOQueryTemp do
     begin
diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index 1f3a946..b8f20c8 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -2610,6 +2610,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label51: TLabel
       Left = 691
@@ -2786,6 +2787,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
       ReadOnly = True
       TabOrder = 5
+      Visible = False
       OnClick = Edit11Click
     end
     object Edit12: TEdit
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index 2a0fd29..f1cdef8 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -1,7 +1,7 @@
 unit U_MJManageNewFDNew;
 
 interface
-
+                     
 uses
   Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,