1

2025-11-27 14:51:21 +08:00 · 2025-11-27 14:51:21 +08:00 · 8bc3e8e84d
commit 8bc3e8e84d
parent 79d84f10cb
7 changed files with 107 additions and 95 deletions
--- a/打卷检验管理/ProjectGroup1.bpg
+++ b/打卷检验管理/ProjectGroup1.bpg
@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe
 default: $(PROJECTS)
 #------------------------------------------------------------------------------

-TradeManage.dll: ..\..\D7DJailisi\检验管理\TradeManage.dpr
+TradeManage.dll: TradeManage.dpr
  $(DCC)

-testDll.exe: ..\..\D7DJailisi\检验管理\testDll.dpr
+testDll.exe: testDll.dpr
  $(DCC)


--- a/打卷检验管理/ProjectGroup1.~bpg
+++ b/打卷检验管理/ProjectGroup1.~bpg
@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe
 default: $(PROJECTS)
 #------------------------------------------------------------------------------

-TradeManage.dll: TradeManage.dpr
+TradeManage.dll: ..\..\D7DJailisi\检验管理\TradeManage.dpr
  $(DCC)

-testDll.exe: testDll.dpr
+testDll.exe: ..\..\D7DJailisi\检验管理\testDll.dpr
  $(DCC)


--- a/打卷检验管理/TradeManage.skincfg
+++ b/打卷检验管理/TradeManage.skincfg
@ -1,50 +1,50 @@
 [ExpressSkins]
 Default=1
 ShowNotifications=1
-Enabled=0
-dxSkinBlack=1
-dxSkinBlue=1
-dxSkinBlueprint=1
-dxSkinCaramel=1
-dxSkinCoffee=1
-dxSkinDarkRoom=1
-dxSkinDarkSide=1
-dxSkinDevExpressDarkStyle=1
-dxSkinDevExpressStyle=1
-dxSkinFoggy=1
-dxSkinGlassOceans=1
-dxSkinHighContrast=1
-dxSkiniMaginary=1
-dxSkinLilian=1
-dxSkinLiquidSky=1
-dxSkinLondonLiquidSky=1
-dxSkinMcSkin=1
-dxSkinMetropolis=1
-dxSkinMetropolisDark=1
-dxSkinMoneyTwins=1
-dxSkinOffice2007Black=1
-dxSkinOffice2007Blue=1
-dxSkinOffice2007Green=1
-dxSkinOffice2007Pink=1
-dxSkinOffice2007Silver=1
-dxSkinOffice2010Black=1
-dxSkinOffice2010Blue=1
-dxSkinOffice2010Silver=1
-dxSkinOffice2013DarkGray=1
-dxSkinOffice2013LightGray=1
-dxSkinOffice2013White=1
-dxSkinPumpkin=1
-dxSkinSeven=1
-dxSkinSevenClassic=1
-dxSkinSharp=1
-dxSkinSharpPlus=1
-dxSkinSilver=1
-dxSkinSpringTime=1
-dxSkinStardust=1
-dxSkinSummer2008=1
-dxSkinTheAsphaltWorld=1
+Enabled=1
+dxSkinBlack=0
+dxSkinBlue=0
+dxSkinBlueprint=0
+dxSkinCaramel=0
+dxSkinCoffee=0
+dxSkinDarkRoom=0
+dxSkinDarkSide=0
+dxSkinDevExpressDarkStyle=0
+dxSkinDevExpressStyle=0
+dxSkinFoggy=0
+dxSkinGlassOceans=0
+dxSkinHighContrast=0
+dxSkiniMaginary=0
+dxSkinLilian=0
+dxSkinLiquidSky=0
+dxSkinLondonLiquidSky=0
+dxSkinMcSkin=0
+dxSkinMetropolis=0
+dxSkinMetropolisDark=0
+dxSkinMoneyTwins=0
+dxSkinOffice2007Black=0
+dxSkinOffice2007Blue=0
+dxSkinOffice2007Green=0
+dxSkinOffice2007Pink=0
+dxSkinOffice2007Silver=0
+dxSkinOffice2010Black=0
+dxSkinOffice2010Blue=0
+dxSkinOffice2010Silver=0
+dxSkinOffice2013DarkGray=0
+dxSkinOffice2013LightGray=0
+dxSkinOffice2013White=0
+dxSkinPumpkin=0
+dxSkinSeven=0
+dxSkinSevenClassic=0
+dxSkinSharp=0
+dxSkinSharpPlus=0
+dxSkinSilver=0
+dxSkinSpringTime=0
+dxSkinStardust=0
+dxSkinSummer2008=0
+dxSkinTheAsphaltWorld=0
 dxSkinsDefaultPainters=1
-dxSkinValentine=1
-dxSkinVS2010=1
-dxSkinWhiteprint=1
-dxSkinXmas2008Blue=1
+dxSkinValentine=0
+dxSkinVS2010=0
+dxSkinWhiteprint=0
+dxSkinXmas2008Blue=0
--- 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
--- a/打卷检验管理/U_GetDllForm.pas
+++ b/打卷检验管理/U_GetDllForm.pas
@ -70,21 +70,22 @@ begin
  SetLength(user, 255);
  SetLength(pswd, 255);

-   server := '101.132.143.144,7781';
+  server := '101.132.143.144,7781';
 //   server:='.';
  dtbase := 'jiazejydata';
  user := 'rtsa';
  pswd := 'rightsoft@5740';
  DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;

-  IF trim(DataBaseStr)<>''then
-  DConString := DataBaseStr;
+  if trim(DataBaseStr) <> '' then
+    DConString := DataBaseStr;

-   DParameters1:='高权限';
+  // DParameters1:='高权限';
   //DCode:='ADMIN';
   //DName:='ADMIN';
 //   DParameters2:='³ÉÆ·¹ÜÀí'; //12
 //   DParameters2:='¹ÜÀí';
+  DParameters2 := '打卷';
  if not ConnData() then
  begin
    result := 0;
@ -542,6 +543,7 @@ initialization
  CoInitialize(nil);
  dxUnitsLoader.Initialize;

+
 finalization
  DataLink_TradeManage.Free;
  application := NewDllApp;
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 1020
-  Top = 275
+  Left = 215
+  Top = 124
  Width = 1400
  Height = 757
  Caption = #26816#39564#25253#21578
@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    Left = 0
    Top = 0
    Width = 1392
-    Height = 92
+    Height = 62
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 119
@ -101,28 +101,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Top = 0
      Caption = #25209#37327#20462#25913#32568#21495
      ImageIndex = 54
-      Wrap = True
      OnClick = ToolButton11Click
    end
    object TBDW: TToolButton
-      Left = 0
-      Top = 30
+      Left = 608
+      Top = 0
      AutoSize = True
      Caption = #20462#25913#25968#37327#21333#20301
      ImageIndex = 54
      OnClick = TBDWClick
    end
    object ToolButton4: TToolButton
-      Left = 111
-      Top = 30
+      Left = 719
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#35843#25972#31859#25968
      ImageIndex = 54
      OnClick = ToolButton4Click
    end
    object ToolButton13: TToolButton
-      Left = 222
-      Top = 30
+      Left = 830
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#20928#37325#36716#38271#24230
      ImageIndex = 54
@ -130,15 +129,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton13Click
    end
    object ToolButton8: TToolButton
-      Left = 345
-      Top = 30
+      Left = 953
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#20462#25913#30382#37325
      ImageIndex = 54
+      Wrap = True
      OnClick = ToolButton8Click
    end
    object ToolButton1: TToolButton
-      Left = 456
+      Left = 0
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26631#31614
@ -146,7 +146,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton1Click
    end
    object TCPDB: TToolButton
-      Left = 543
+      Left = 87
      Top = 30
      AutoSize = True
      Caption = #25104#21697#25171#21253
@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = TCPDBClick
    end
    object ToolButton3: TToolButton
-      Left = 630
+      Left = 174
      Top = 30
      AutoSize = True
      Caption = #25171#21360#21253#26631#31614
@ -163,25 +163,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton3Click
    end
    object ToolButton2: TToolButton
-      Left = 729
+      Left = 273
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26816#39564#25253#21578
      ImageIndex = 12
-      Wrap = True
      OnClick = ToolButton2Click
    end
    object ToolButton5: TToolButton
-      Left = 0
-      Top = 60
+      Left = 384
+      Top = 30
      AutoSize = True
      Caption = #25171#21360
      ImageIndex = 12
      OnClick = ToolButton5Click
    end
    object Edit3: TEdit
-      Left = 63
-      Top = 60
+      Left = 447
+      Top = 30
      Width = 68
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -195,8 +194,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnKeyPress = Edit3KeyPress
    end
    object ComboBox1: TComboBox
-      Left = 131
-      Top = 63
+      Left = 515
+      Top = 33
      Width = 149
      Height = 24
      Style = csDropDownList
@ -219,8 +218,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        '')
    end
    object Edit4: TEdit
-      Left = 280
-      Top = 60
+      Left = 664
+      Top = 30
      Width = 121
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -233,32 +232,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Visible = False
    end
    object ToolButton12: TToolButton
-      Left = 401
-      Top = 60
+      Left = 785
+      Top = 30
      Caption = #20462#25913#30721#21333
      ImageIndex = 54
      Visible = False
      OnClick = ToolButton12Click
    end
    object ToolButton9: TToolButton
-      Left = 520
-      Top = 60
+      Left = 904
+      Top = 30
      AutoSize = True
      Caption = #24322#24120#25968#25454
      ImageIndex = 2
      OnClick = ToolButton9Click
    end
    object TBExport: TToolButton
-      Left = 607
-      Top = 60
+      Left = 991
+      Top = 30
      AutoSize = True
      Caption = #23548#20986
      ImageIndex = 75
      OnClick = TBExportClick
    end
    object TBClose: TToolButton
-      Left = 670
-      Top = 60
+      Left = 1054
+      Top = 30
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 55
@ -267,7 +266,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object Panel1: TPanel
    Left = 0
-    Top = 92
+    Top = 62
    Width = 1392
    Height = 88
    Align = alTop
@ -782,9 +781,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 180
+    Top = 150
    Width = 1392
-    Height = 546
+    Height = 576
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@ -548,6 +548,16 @@ begin
    TCPDB.Visible := True;
    ToolButton3.Visible := True;
  end;
+  if Trim(DParameters2) = '´ò¾í' then
+  begin
+    TBZF.Visible := false;
+    TBManage.Visible := True;
+    v1Column22.visible := True;
+    v1Column15.Options.Focusing := True;
+    ToolButton1.Visible := True;
+    TCPDB.Visible := True;
+    ToolButton3.Visible := True;
+  end;
  if Trim(DParameters2) = '成品管理' then
  begin
    v1Column22.visible := False;