Skip to content

J
Jst.Client.Report.Download
Commit 35f1994f by 任天宇
Options

优化

parent 6c3add07
Showing with 101 additions and 72 deletions
.gitignore
......@@ -4,3 +4,7 @@
/Src/bin/Debug
/Src/obj/Debug
/Src/packages/Kivii.Common.5.6.2021.7000/lib/net45/Kivii.Common.V4.5.dll
/Src/packages/Kivii.Common.5.6.2021.7000/lib/net40/Kivii.Common.V4.0.dll
/Src/.vs/Jst.Client.Report.Download.V4.0/v16/.suo
/Src/packages/Kivii.Common.5.6.2021.7000/Kivii.Common.5.6.2021.7000.nupkg
Src/FrmMain.Designer.cs
......@@ -62,6 +62,12 @@ namespace Jst.Report.Download
this.btnPreviewPage = new System.Windows.Forms.Button();
this.btnSearch = new System.Windows.Forms.Button();
this.gbConfig = new System.Windows.Forms.GroupBox();
this.btnLogout = new System.Windows.Forms.Button();
this.btnLogin = new System.Windows.Forms.Button();
this.lblUser = new System.Windows.Forms.Label();
this.lblPassword = new System.Windows.Forms.Label();
this.tbxPassword = new System.Windows.Forms.TextBox();
this.tbxUserName = new System.Windows.Forms.TextBox();
this.lblUrlBase = new System.Windows.Forms.Label();
this.tbxUrlBase = new System.Windows.Forms.TextBox();
this.splitter1 = new System.Windows.Forms.Splitter();
......@@ -77,7 +83,6 @@ namespace Jst.Report.Download
this.tbxFileSaveDirectory = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.dgvReports = new System.Windows.Forms.DataGridView();
this.lblMessage = new System.Windows.Forms.Label();
this.colReportId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colPlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCustomerOrgName = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -88,12 +93,7 @@ namespace Jst.Report.Download
this.colBatchNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDealDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colProductJudgement = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lblUser = new System.Windows.Forms.Label();
this.lblPassword = new System.Windows.Forms.Label();
this.tbxPassword = new System.Windows.Forms.TextBox();
this.tbxUserName = new System.Windows.Forms.TextBox();
this.btnLogout = new System.Windows.Forms.Button();
this.btnLogin = new System.Windows.Forms.Button();
this.lblMessage = new System.Windows.Forms.Label();
this.pnlLeft.SuspendLayout();
this.gbQuery.SuspendLayout();
this.pnlCommands.SuspendLayout();
......@@ -469,6 +469,59 @@ namespace Jst.Report.Download
this.gbConfig.TabStop = false;
this.gbConfig.Text = "服务器配置";
//
// btnLogout
//
this.btnLogout.Location = new System.Drawing.Point(199, 133);
this.btnLogout.Name = "btnLogout";
this.btnLogout.Size = new System.Drawing.Size(75, 36);
this.btnLogout.TabIndex = 18;
this.btnLogout.Text = "退出";
this.btnLogout.UseVisualStyleBackColor = true;
this.btnLogout.Click += new System.EventHandler(this.btnLogout_Click);
//
// btnLogin
//
this.btnLogin.Location = new System.Drawing.Point(16, 133);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(75, 36);
this.btnLogin.TabIndex = 17;
this.btnLogin.Text = "登录";
this.btnLogin.UseVisualStyleBackColor = true;
this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
//
// lblUser
//
this.lblUser.AutoSize = true;
this.lblUser.Location = new System.Drawing.Point(12, 58);
this.lblUser.Name = "lblUser";
this.lblUser.Size = new System.Drawing.Size(79, 20);
this.lblUser.TabIndex = 1;
this.lblUser.Text = "用户名:";
//
// lblPassword
//
this.lblPassword.AutoSize = true;
this.lblPassword.Location = new System.Drawing.Point(10, 94);
this.lblPassword.Name = "lblPassword";
this.lblPassword.Size = new System.Drawing.Size(79, 20);
this.lblPassword.TabIndex = 14;
this.lblPassword.Text = "密 码:";
//
// tbxPassword
//
this.tbxPassword.Location = new System.Drawing.Point(103, 91);
this.tbxPassword.Name = "tbxPassword";
this.tbxPassword.PasswordChar = '*';
this.tbxPassword.Size = new System.Drawing.Size(182, 30);
this.tbxPassword.TabIndex = 16;
//
// tbxUserName
//
this.tbxUserName.Location = new System.Drawing.Point(103, 55);
this.tbxUserName.Name = "tbxUserName";
this.tbxUserName.Size = new System.Drawing.Size(182, 30);
this.tbxUserName.TabIndex = 15;
//
// lblUrlBase
//
this.lblUrlBase.AutoSize = true;
......@@ -646,17 +699,6 @@ namespace Jst.Report.Download
this.dgvReports.Size = new System.Drawing.Size(942, 489);
this.dgvReports.TabIndex = 11;
//
// lblMessage
//
this.lblMessage.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.lblMessage.Dock = System.Windows.Forms.DockStyle.Bottom;
this.lblMessage.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMessage.Location = new System.Drawing.Point(0, 489);
this.lblMessage.Name = "lblMessage";
this.lblMessage.Size = new System.Drawing.Size(942, 42);
this.lblMessage.TabIndex = 8;
this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// colReportId
//
this.colReportId.DataPropertyName = "ReportId";
......@@ -728,58 +770,16 @@ namespace Jst.Report.Download
this.colProductJudgement.Name = "colProductJudgement";
this.colProductJudgement.ReadOnly = true;
//
// lblUser
//
this.lblUser.AutoSize = true;
this.lblUser.Location = new System.Drawing.Point(12, 58);
this.lblUser.Name = "lblUser";
this.lblUser.Size = new System.Drawing.Size(79, 20);
this.lblUser.TabIndex = 1;
this.lblUser.Text = "用户名:";
//
// lblPassword
//
this.lblPassword.AutoSize = true;
this.lblPassword.Location = new System.Drawing.Point(10, 94);
this.lblPassword.Name = "lblPassword";
this.lblPassword.Size = new System.Drawing.Size(79, 20);
this.lblPassword.TabIndex = 14;
this.lblPassword.Text = "密 码:";
//
// tbxPassword
//
this.tbxPassword.Location = new System.Drawing.Point(103, 91);
this.tbxPassword.Name = "tbxPassword";
this.tbxPassword.PasswordChar = '*';
this.tbxPassword.Size = new System.Drawing.Size(182, 30);
this.tbxPassword.TabIndex = 16;
//
// tbxUserName
//
this.tbxUserName.Location = new System.Drawing.Point(103, 55);
this.tbxUserName.Name = "tbxUserName";
this.tbxUserName.Size = new System.Drawing.Size(182, 30);
this.tbxUserName.TabIndex = 15;
//
// btnLogout
//
this.btnLogout.Location = new System.Drawing.Point(199, 133);
this.btnLogout.Name = "btnLogout";
this.btnLogout.Size = new System.Drawing.Size(75, 36);
this.btnLogout.TabIndex = 18;
this.btnLogout.Text = "退出";
this.btnLogout.UseVisualStyleBackColor = true;
this.btnLogout.Click += new System.EventHandler(this.btnLogout_Click);
//
// btnLogin
// lblMessage
//
this.btnLogin.Location = new System.Drawing.Point(16, 133);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(75, 36);
this.btnLogin.TabIndex = 17;
this.btnLogin.Text = "登录";
this.btnLogin.UseVisualStyleBackColor = true;
this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
this.lblMessage.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.lblMessage.Dock = System.Windows.Forms.DockStyle.Bottom;
this.lblMessage.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMessage.Location = new System.Drawing.Point(0, 489);
this.lblMessage.Name = "lblMessage";
this.lblMessage.Size = new System.Drawing.Size(942, 42);
this.lblMessage.TabIndex = 8;
this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// FrmMain
//
......@@ -792,7 +792,7 @@ namespace Jst.Report.Download
this.Controls.Add(this.pnlLeft);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmMain";
this.Text = "江苏纺检院电子报告下载客户端V2.0";
this.Text = "江苏纺检院电子报告下载客户端V2.01";
this.Load += new System.EventHandler(this.FrmMain_Load);
this.pnlLeft.ResumeLayout(false);
this.gbQuery.ResumeLayout(false);
......
Src/FrmMain.cs
......@@ -361,7 +361,7 @@ namespace Jst.Report.Download
string text = $"{result.ReportId}.pdf";
if (_renameFileByBatchNumber)
{
string text2 = result.SampleSourceBatchNumber.Trim();
string text2 = result.SampleBatchNumber.Trim();
if (!text2.IsNullOrEmpty())
{
text = $"{result.ReportId}({text2}).pdf";
......
Src/Jst.Client.Report.Download.V4.0.csproj
......@@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Kivii.Common.V4.0, Version=5.6.2021.7000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Kivii.Common.5.6.2021.7000\lib\net40\Kivii.Common.V4.0.dll</HintPath>
<HintPath>packages\Kivii.Common.5.6.2021.7000\lib\net40\Kivii.Common.V4.0.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
Src/Jst.Client.Report.Download.V4.0.sln 0 → 100644

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30517.126
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jst.Client.Report.Download.V4.0", "Jst.Client.Report.Download.V4.0.csproj", "{5E50F389-FAA7-4EE2-81F8-730A4942776B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5E50F389-FAA7-4EE2-81F8-730A4942776B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E50F389-FAA7-4EE2-81F8-730A4942776B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E50F389-FAA7-4EE2-81F8-730A4942776B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E50F389-FAA7-4EE2-81F8-730A4942776B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {437D692E-6334-421A-93A7-050C17F707A8}
EndGlobalSection
EndGlobal
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment