From 76e60e33354490f26224166ae811eefa3a615d74 Mon Sep 17 00:00:00 2001
From: libingpeng <3360871605@qq.com>
Date: Tue, 18 Nov 2025 13:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E6=A3=80=E9=AA=8C-------?=
 =?UTF-8?q?=E6=8A=8A=E2=80=9C=E5=87=BA=E7=BA=B8=E2=80=9D=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=8B=86=E6=88=90=E4=B8=A4=E4=B8=AA=20=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=98=AF=E2=80=9C=E5=87=BA=E5=8D=B7=E5=94=9B=E2=80=9D?=
 =?UTF-8?q?=E5=92=8C=E2=80=9C=E5=87=BA=E5=8C=85=E5=94=9B=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC=E7=9A=84=E5=8D=B7=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=92=8C=E5=8C=85=E6=A0=87=E7=AD=BE=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E6=A0=B7=EF=BC=8C=E4=B8=80=E5=8F=B0=E6=9C=BA?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AA=E9=85=8D=E5=A4=87=E4=B8=80=E4=B8=AA=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=BA=EF=BC=8C=E6=89=80=E4=BB=A5=E5=85=88=E6=89=93?=
 =?UTF-8?q?=E5=8D=B7=E6=A0=87=E7=AD=BE=E5=86=8D=E6=89=93=E5=8C=85=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E4=BD=86=E6=98=AF=E8=80=81=E7=89=88=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=82=B9=E6=89=93=E5=8D=B0=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=8C=85=E6=A0=87=E7=AD=BE=E5=92=8C=E5=8D=B7=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=98=AF=E4=B8=80=E8=B5=B7=E5=87=BA=E6=9D=A5=E7=9A=84=20?=
 =?UTF-8?q?=E5=A5=BD=E5=83=8F=E4=B8=8D=E8=83=BD=E5=8F=AA=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8D=B7=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E6=89=B9=E9=87=8F=E5=A4=A7=E5=8C=85=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 打卷检验管理/TradeManage.dof        |   5 +-
 打卷检验管理/U_DataLink.pas         |   3 +-
 打卷检验管理/U_MJManageNewFDNew.dfm | 100 ++++++++++++++++++----------
 打卷检验管理/U_MJManageNewFDNew.pas |  41 +++++++++---
 4 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof
index 753607b..1b7bfbc 100644
--- a/打卷检验管理/TradeManage.dof
+++ b/打卷检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\����\����������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJmingfan\����������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/打卷检验管理/U_DataLink.pas b/打卷检验管理/U_DataLink.pas
index e53b287..bba5dd8 100644
--- a/打卷检验管理/U_DataLink.pas
+++ b/打卷检验管理/U_DataLink.pas
@@ -4,7 +4,8 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs,
+  dxSkinsCore, dxSkinsDefaultPainters;
 type
   TMyThread = class(TThread)
   protected
diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index e00c9b5..e5e6870 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 322
-  Top = 165
+  Left = 193
+  Top = 118
   Width = 1366
   Height = 754
   Caption = #25104#21697#26816#39564
@@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 214
-    Height = 628
+    Height = 636
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -123,10 +123,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object ScrollBox1: TScrollBox
-    Left = 633
+    Left = 649
     Top = 87
-    Width = 717
-    Height = 628
+    Width = 709
+    Height = 636
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -976,8 +976,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel2: TPanel
     Left = 428
     Top = 87
-    Width = 205
-    Height = 628
+    Width = 221
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -999,7 +999,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label3: TLabel
       Left = 144
-      Top = 383
+      Top = 385
       Width = 26
       Height = 22
       Caption = 'cm'
@@ -1038,7 +1038,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label6: TLabel
       Left = 8
-      Top = 383
+      Top = 385
       Width = 42
       Height = 20
       Caption = #24133#23485
@@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label22: TLabel
       Left = 144
-      Top = 424
+      Top = 426
       Width = 36
       Height = 22
       Caption = 'g/'#13217
@@ -1143,7 +1143,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label23: TLabel
       Left = 8
-      Top = 423
+      Top = 425
       Width = 42
       Height = 20
       Caption = #20811#37325
@@ -1169,10 +1169,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label26: TLabel
       Left = 8
-      Top = 339
-      Width = 42
+      Top = 347
+      Width = 63
       Height = 20
-      Caption = #20986#32440
+      Caption = #20986#21367#21787
       Font.Charset = ANSI_CHARSET
       Font.Color = clBlue
       Font.Height = -20
@@ -1247,8 +1247,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label34: TLabel
-      Left = 90
-      Top = 342
+      Left = 130
+      Top = 344
       Width = 40
       Height = 19
       Caption = #20221#25968
@@ -1337,9 +1337,22 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label53: TLabel
+      Left = 160
+      Top = 219
+      Width = 63
+      Height = 20
+      Caption = #20986#21253#21787
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object MJFK: TEdit
       Left = 51
-      Top = 377
+      Top = 379
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1387,7 +1400,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object BTPrint: TButton
       Left = 10
-      Top = 460
+      Top = 462
       Width = 171
       Height = 93
       Caption = #25552#20132
@@ -1452,7 +1465,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJSJKZ: TEdit
       Left = 51
-      Top = 418
+      Top = 420
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1483,7 +1496,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object Edit6: TEdit
-      Left = 52
+      Left = 84
       Top = 333
       Width = 40
       Height = 43
@@ -1551,8 +1564,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJQty4KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 132
-      Top = 334
+      Left = 172
+      Top = 336
       Width = 45
       Height = 40
       Style = csDropDownList
@@ -1653,15 +1666,15 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object BaoID: TEdit
-      Left = 251
-      Top = 252
+      Left = 283
+      Top = 260
       Width = 121
       Height = 20
       TabOrder = 10
     end
     object Button7: TButton
       Left = 10
-      Top = 556
+      Top = 558
       Width = 171
       Height = 53
       Caption = #25171#21253#26631#31614
@@ -1674,9 +1687,26 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 20
       OnClick = Button7Click
     end
+    object Edit13: TEdit
+      Left = 172
+      Top = 245
+      Width = 40
+      Height = 43
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -35
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      ReadOnly = True
+      TabOrder = 21
+      Text = #8730
+      OnClick = Edit13Click
+      OnKeyPress = MJstr3KeyPress
+    end
   end
   object MovePanel1: TMovePanel
-    Left = 634
+    Left = 658
     Top = 91
     Width = 339
     Height = 236
@@ -1929,7 +1959,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 214
     Top = 87
     Width = 214
-    Height = 628
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1938,7 +1968,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 303
+      Height = 311
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2046,7 +2076,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 305
+      Top = 313
       Width = 210
       Height = 28
       Align = alBottom
@@ -2061,7 +2091,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 333
+      Top = 341
       Width = 210
       Height = 293
       Align = alBottom
@@ -2077,8 +2107,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object Panel3: TPanel
-    Left = 634
-    Top = 328
+    Left = 658
+    Top = 320
     Width = 353
     Height = 334
     BevelInner = bvRaised
@@ -2274,7 +2304,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1350
+    Width = 1358
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2462,7 +2492,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1350
+    Width = 1358
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index 7d84afa..28c85fd 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -10,7 +10,8 @@ uses
   cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
-  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI;
+  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI,
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
 
 type
   TfrmMJManageNewFDNewSF = class(TForm)
@@ -249,6 +250,8 @@ type
     RM3: TRMGridReport;
     Edit5: TEdit;
     Label43: TLabel;
+    Label53: TLabel;
+    Edit13: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -307,6 +310,7 @@ type
     procedure Timer1Timer(Sender: TObject);
     procedure TBCDClick(Sender: TObject);
     procedure Edit5Click(Sender: TObject);
+    procedure Edit13Click(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@@ -650,7 +654,7 @@ begin
     sql.Clear;
     sql.Add('select ZDYName from KH_Zdy where Type=''WFBCD'' order by ZDYNO ');
 //    showmessage(sql.text);
-    Open;                         
+    Open;
   end;
   if ADOTmp.IsEmpty then
   begin
@@ -1618,7 +1622,7 @@ begin
       Exit;
     end;
   end;
-  if Trim(Edit6.Text) <> '' then
+  if (Trim(Edit6.Text) <> '') or (Trim(Edit13.Text) <> '') then
   begin
     with ADOTmp do
     begin
@@ -1690,7 +1694,7 @@ begin
     PrtData(FFFMJID);
   end;
 
-  if Trim(Edit6.Text) = '��' then
+  if Trim(Edit13.Text) = '��' then
   begin
     if (fbaotype = '�ֶ����') or (fbaotype = '') then
     begin
@@ -1871,7 +1875,7 @@ begin
       RM2.PrintReport;
     end;
 
-    if MggCDFalg = '99' then       
+    if MggCDFalg = '99' then
     begin
       with ADOCmd do
       begin
@@ -2287,11 +2291,13 @@ begin
   if Trim(Edit6.Text) = '' then
   begin
     Edit6.Text := '��';
+    //Edit13.Text := '';
   end
   else
   begin
     Edit6.Text := '';
   end;
+
 end;
 
 procedure TfrmMJManageNewFDNewSF.MJstr3KeyPress(Sender: TObject; var Key: Char);
@@ -2718,7 +2724,7 @@ begin
   MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString);
   MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
   baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
-  baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);    
+  baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
   if Trim(ADOTmp.fieldbyname('MJType').AsString) = '��Ʒ' then
   begin
     Edit3.Text := '��';
@@ -2954,8 +2960,14 @@ begin
   if CDS_MJID.IsEmpty then
     Exit;
   MggCDFalg := '99';
-
-  PrtData(Trim(CDS_MJID.fieldbyname('MJID').AsString));
+  if Edit6.Text = '��' then
+  begin
+    PrtData(Trim(CDS_MJID.fieldbyname('MJID').AsString));
+  end;
+  if Edit13.Text = '��' then
+  begin
+    PrtBaoData(Trim(CDS_MJID.fieldbyname('baoid').AsString));
+  end;
   Label16.Caption := '';
   BTAdd.Click;
   MJLen.SetFocus;
@@ -2975,5 +2987,18 @@ begin
   end;
 end;
 
+procedure TfrmMJManageNewFDNewSF.Edit13Click(Sender: TObject);
+begin
+  if Trim(Edit13.Text) = '' then
+  begin
+    Edit13.Text := '��';
+    //Edit6.Text := '';
+  end
+  else
+  begin
+    Edit13.Text := '';
+  end;
+end;
+
 end.