布局优化

.gitignore

@@ -6,3 +6,5 @@
 /Src/bin/Debug
 /Src/obj/Debug
 /Src/packages
+/Src/.vs/Kivii.Client.Lims.ReportPrinter.V4.0/FileContentIndex
+/Src/obj/Release

Src/FrmMain.Designer.cs

@@ -102,10 +102,9 @@
             // 
             this.cbxFirstPage.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxFirstPage.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxFirstPage.Location = new System.Drawing.Point(8, 240);
-            this.cbxFirstPage.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxFirstPage.Location = new System.Drawing.Point(5, 190);
             this.cbxFirstPage.Name = "cbxFirstPage";
-            this.cbxFirstPage.Size = new System.Drawing.Size(338, 45);
+            this.cbxFirstPage.Size = new System.Drawing.Size(226, 30);
             this.cbxFirstPage.TabIndex = 33;
             this.cbxFirstPage.Text = "仅打印首页";
             this.cbxFirstPage.UseVisualStyleBackColor = true;
@@ -116,10 +115,9 @@
             this.btnChangeQuantity.BackColor = System.Drawing.Color.LightSteelBlue;
             this.btnChangeQuantity.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnChangeQuantity.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnChangeQuantity.Location = new System.Drawing.Point(177, 592);
-            this.btnChangeQuantity.Margin = new System.Windows.Forms.Padding(4);
+            this.btnChangeQuantity.Location = new System.Drawing.Point(111, 293);
             this.btnChangeQuantity.Name = "btnChangeQuantity";
-            this.btnChangeQuantity.Size = new System.Drawing.Size(150, 45);
+            this.btnChangeQuantity.Size = new System.Drawing.Size(100, 30);
             this.btnChangeQuantity.TabIndex = 32;
             this.btnChangeQuantity.Text = "批量修改";
             this.btnChangeQuantity.UseVisualStyleBackColor = false;
@@ -130,15 +128,14 @@
             this.nudQuantity.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.nudQuantity.Cursor = System.Windows.Forms.Cursors.Default;
             this.nudQuantity.DecimalPlaces = 1;
-            this.nudQuantity.Location = new System.Drawing.Point(12, 592);
-            this.nudQuantity.Margin = new System.Windows.Forms.Padding(4);
+            this.nudQuantity.Location = new System.Drawing.Point(5, 293);
             this.nudQuantity.Maximum = new decimal(new int[] {
             1000,
             0,
             0,
             0});
             this.nudQuantity.Name = "nudQuantity";
-            this.nudQuantity.Size = new System.Drawing.Size(150, 40);
+            this.nudQuantity.Size = new System.Drawing.Size(100, 28);
             this.nudQuantity.TabIndex = 31;
             this.nudQuantity.Value = new decimal(new int[] {
             1,
@@ -151,10 +148,9 @@
             this.btnSelectCancel.BackColor = System.Drawing.Color.Pink;
             this.btnSelectCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSelectCancel.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectCancel.Location = new System.Drawing.Point(177, 510);
-            this.btnSelectCancel.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSelectCancel.Location = new System.Drawing.Point(111, 257);
             this.btnSelectCancel.Name = "btnSelectCancel";
-            this.btnSelectCancel.Size = new System.Drawing.Size(150, 45);
+            this.btnSelectCancel.Size = new System.Drawing.Size(100, 30);
             this.btnSelectCancel.TabIndex = 30;
             this.btnSelectCancel.Text = "取消选中";
             this.btnSelectCancel.UseVisualStyleBackColor = false;
@@ -165,10 +161,9 @@
             this.btnSelectAll.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.btnSelectAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSelectAll.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectAll.Location = new System.Drawing.Point(12, 510);
-            this.btnSelectAll.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSelectAll.Location = new System.Drawing.Point(5, 257);
             this.btnSelectAll.Name = "btnSelectAll";
-            this.btnSelectAll.Size = new System.Drawing.Size(150, 45);
+            this.btnSelectAll.Size = new System.Drawing.Size(100, 30);
             this.btnSelectAll.TabIndex = 29;
             this.btnSelectAll.Text = "全部选中";
             this.btnSelectAll.UseVisualStyleBackColor = false;
@@ -177,60 +172,57 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(62, 362);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Font = new System.Drawing.Font("宋体", 12F);
+            this.label6.Location = new System.Drawing.Point(22, 223);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(143, 33);
+            this.label6.Size = new System.Drawing.Size(71, 16);
             this.label6.TabIndex = 21;
             this.label6.Text = "尚未打印";
             // 
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Green;
-            this.pictureBox1.Location = new System.Drawing.Point(12, 362);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.pictureBox1.Location = new System.Drawing.Point(7, 226);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(30, 30);
+            this.pictureBox1.Size = new System.Drawing.Size(10, 10);
             this.pictureBox1.TabIndex = 20;
             this.pictureBox1.TabStop = false;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(62, 450);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Font = new System.Drawing.Font("宋体", 12F);
+            this.label5.Location = new System.Drawing.Point(22, 239);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(175, 33);
+            this.label5.Size = new System.Drawing.Size(87, 16);
             this.label5.TabIndex = 19;
             this.label5.Text = "打印未标记";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(62, 408);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Font = new System.Drawing.Font("宋体", 12F);
+            this.label3.Location = new System.Drawing.Point(111, 223);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(175, 33);
+            this.label3.Size = new System.Drawing.Size(87, 16);
             this.label3.TabIndex = 18;
             this.label3.Text = "打印已标记";
             // 
             // pictureBox3
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Tomato;
-            this.pictureBox3.Location = new System.Drawing.Point(12, 450);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.pictureBox3.Location = new System.Drawing.Point(7, 241);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(30, 30);
+            this.pictureBox3.Size = new System.Drawing.Size(10, 10);
             this.pictureBox3.TabIndex = 17;
             this.pictureBox3.TabStop = false;
             // 
             // pictureBox2
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.SteelBlue;
-            this.pictureBox2.Location = new System.Drawing.Point(12, 408);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.pictureBox2.Location = new System.Drawing.Point(96, 227);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(30, 30);
+            this.pictureBox2.Size = new System.Drawing.Size(10, 10);
             this.pictureBox2.TabIndex = 16;
             this.pictureBox2.TabStop = false;
             // 
@@ -238,10 +230,9 @@
             // 
             this.cbxJianDu.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxJianDu.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxJianDu.Location = new System.Drawing.Point(8, 195);
-            this.cbxJianDu.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxJianDu.Location = new System.Drawing.Point(5, 160);
             this.cbxJianDu.Name = "cbxJianDu";
-            this.cbxJianDu.Size = new System.Drawing.Size(338, 45);
+            this.cbxJianDu.Size = new System.Drawing.Size(226, 30);
             this.cbxJianDu.TabIndex = 15;
             this.cbxJianDu.Text = "监督报告";
             this.cbxJianDu.UseVisualStyleBackColor = true;
@@ -253,11 +244,9 @@
             this.groupBox3.Controls.Add(this.lblUserInfo);
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.groupBox3.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox3.Location = new System.Drawing.Point(8, 656);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox3.Location = new System.Drawing.Point(5, 343);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox3.Size = new System.Drawing.Size(338, 108);
+            this.groupBox3.Size = new System.Drawing.Size(226, 72);
             this.groupBox3.TabIndex = 14;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "信息窗口";
@@ -266,10 +255,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(24, 48);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(16, 32);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(144, 29);
+            this.label4.Size = new System.Drawing.Size(95, 19);
             this.label4.TabIndex = 1;
             this.label4.Text = "当前用户:";
             // 
@@ -278,10 +266,9 @@
             this.lblUserInfo.AutoSize = true;
             this.lblUserInfo.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblUserInfo.ForeColor = System.Drawing.Color.Blue;
-            this.lblUserInfo.Location = new System.Drawing.Point(176, 48);
-            this.lblUserInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblUserInfo.Location = new System.Drawing.Point(117, 32);
             this.lblUserInfo.Name = "lblUserInfo";
-            this.lblUserInfo.Size = new System.Drawing.Size(73, 29);
+            this.lblUserInfo.Size = new System.Drawing.Size(49, 19);
             this.lblUserInfo.TabIndex = 0;
             this.lblUserInfo.Text = "NULL";
             // 
@@ -297,11 +284,9 @@
             this.groupBox2.Controls.Add(this.tbxServiceName);
             this.groupBox2.Controls.Add(this.lblServiceName);
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.groupBox2.Location = new System.Drawing.Point(8, 764);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox2.Location = new System.Drawing.Point(5, 415);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox2.Size = new System.Drawing.Size(338, 388);
+            this.groupBox2.Size = new System.Drawing.Size(226, 259);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "配置服务器";
@@ -312,20 +297,18 @@
             this.lblPrinterName.BackColor = System.Drawing.Color.Red;
             this.lblPrinterName.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.lblPrinterName.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblPrinterName.Location = new System.Drawing.Point(2, 358);
-            this.lblPrinterName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblPrinterName.Location = new System.Drawing.Point(1, 239);
             this.lblPrinterName.Name = "lblPrinterName";
-            this.lblPrinterName.Size = new System.Drawing.Size(193, 30);
+            this.lblPrinterName.Size = new System.Drawing.Size(129, 20);
             this.lblPrinterName.TabIndex = 9;
             this.lblPrinterName.Text = "打印机未设置";
             // 
             // btnDisconnect
             // 
             this.btnDisconnect.Enabled = false;
-            this.btnDisconnect.Location = new System.Drawing.Point(182, 244);
-            this.btnDisconnect.Margin = new System.Windows.Forms.Padding(4);
+            this.btnDisconnect.Location = new System.Drawing.Point(121, 163);
             this.btnDisconnect.Name = "btnDisconnect";
-            this.btnDisconnect.Size = new System.Drawing.Size(147, 48);
+            this.btnDisconnect.Size = new System.Drawing.Size(98, 32);
             this.btnDisconnect.TabIndex = 7;
             this.btnDisconnect.Text = "退出";
             this.btnDisconnect.UseVisualStyleBackColor = true;
@@ -333,10 +316,9 @@
             // 
             // btnConnect
             // 
-            this.btnConnect.Location = new System.Drawing.Point(16, 244);
-            this.btnConnect.Margin = new System.Windows.Forms.Padding(4);
+            this.btnConnect.Location = new System.Drawing.Point(11, 163);
             this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(150, 48);
+            this.btnConnect.Size = new System.Drawing.Size(100, 32);
             this.btnConnect.TabIndex = 6;
             this.btnConnect.Text = "登录";
             this.btnConnect.UseVisualStyleBackColor = true;
@@ -345,11 +327,10 @@
             // tbxPassword
             // 
             this.tbxPassword.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbxPassword.Location = new System.Drawing.Point(99, 177);
-            this.tbxPassword.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxPassword.Location = new System.Drawing.Point(66, 118);
             this.tbxPassword.Name = "tbxPassword";
             this.tbxPassword.PasswordChar = '*';
-            this.tbxPassword.Size = new System.Drawing.Size(234, 31);
+            this.tbxPassword.Size = new System.Drawing.Size(157, 23);
             this.tbxPassword.TabIndex = 5;
             this.tbxPassword.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxPassword_KeyDown);
             // 
@@ -357,62 +338,57 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 11F);
-            this.label2.Location = new System.Drawing.Point(0, 180);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(0, 120);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 22);
+            this.label2.Size = new System.Drawing.Size(67, 15);
             this.label2.TabIndex = 4;
             this.label2.Text = "用户密码";
             // 
             // tbxUserName
             // 
             this.tbxUserName.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbxUserName.Location = new System.Drawing.Point(99, 120);
-            this.tbxUserName.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxUserName.Location = new System.Drawing.Point(66, 80);
             this.tbxUserName.Name = "tbxUserName";
-            this.tbxUserName.Size = new System.Drawing.Size(234, 31);
+            this.tbxUserName.Size = new System.Drawing.Size(157, 23);
             this.tbxUserName.TabIndex = 3;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 11F);
-            this.label1.Location = new System.Drawing.Point(12, 123);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(8, 82);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(76, 22);
+            this.label1.Size = new System.Drawing.Size(52, 15);
             this.label1.TabIndex = 2;
             this.label1.Text = "用户名";
             // 
             // tbxServiceName
             // 
             this.tbxServiceName.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbxServiceName.Location = new System.Drawing.Point(99, 57);
-            this.tbxServiceName.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxServiceName.Location = new System.Drawing.Point(66, 38);
             this.tbxServiceName.Name = "tbxServiceName";
-            this.tbxServiceName.Size = new System.Drawing.Size(234, 31);
+            this.tbxServiceName.Size = new System.Drawing.Size(157, 23);
             this.tbxServiceName.TabIndex = 1;
             // 
             // lblServiceName
             // 
             this.lblServiceName.AutoSize = true;
             this.lblServiceName.Font = new System.Drawing.Font("宋体", 11F);
-            this.lblServiceName.Location = new System.Drawing.Point(3, 60);
-            this.lblServiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblServiceName.Location = new System.Drawing.Point(2, 40);
             this.lblServiceName.Name = "lblServiceName";
-            this.lblServiceName.Size = new System.Drawing.Size(98, 22);
+            this.lblServiceName.Size = new System.Drawing.Size(67, 15);
             this.lblServiceName.TabIndex = 0;
             this.lblServiceName.Text = "服务地址";
             // 
             // btnCompletePrintJob
             // 
             this.btnCompletePrintJob.BackColor = System.Drawing.SystemColors.Highlight;
+            this.btnCompletePrintJob.Dock = System.Windows.Forms.DockStyle.Top;
             this.btnCompletePrintJob.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnCompletePrintJob.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCompletePrintJob.Location = new System.Drawing.Point(12, 296);
-            this.btnCompletePrintJob.Margin = new System.Windows.Forms.Padding(4);
+            this.btnCompletePrintJob.Location = new System.Drawing.Point(5, 130);
             this.btnCompletePrintJob.Name = "btnCompletePrintJob";
-            this.btnCompletePrintJob.Size = new System.Drawing.Size(314, 45);
+            this.btnCompletePrintJob.Size = new System.Drawing.Size(226, 30);
             this.btnCompletePrintJob.TabIndex = 12;
             this.btnCompletePrintJob.Text = "标记打印任务";
             this.btnCompletePrintJob.UseVisualStyleBackColor = false;
@@ -440,11 +416,10 @@
             this.groupBox1.Controls.Add(this.panel4);
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
             this.groupBox1.Font = new System.Drawing.Font("宋体", 16F);
-            this.groupBox1.Location = new System.Drawing.Point(1784, 0);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Location = new System.Drawing.Point(1189, 0);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(8);
-            this.groupBox1.Size = new System.Drawing.Size(354, 1160);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.groupBox1.Size = new System.Drawing.Size(236, 679);
             this.groupBox1.TabIndex = 11;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "打印设置区域";
@@ -455,10 +430,9 @@
             this.cbxPrintAutoComplete.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbxPrintAutoComplete.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxPrintAutoComplete.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxPrintAutoComplete.Location = new System.Drawing.Point(8, 150);
-            this.cbxPrintAutoComplete.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxPrintAutoComplete.Location = new System.Drawing.Point(5, 100);
             this.cbxPrintAutoComplete.Name = "cbxPrintAutoComplete";
-            this.cbxPrintAutoComplete.Size = new System.Drawing.Size(338, 45);
+            this.cbxPrintAutoComplete.Size = new System.Drawing.Size(226, 30);
             this.cbxPrintAutoComplete.TabIndex = 11;
             this.cbxPrintAutoComplete.Text = "自动标记为已打印";
             this.cbxPrintAutoComplete.UseVisualStyleBackColor = true;
@@ -469,10 +443,9 @@
             this.cbxPdfRemoveHeader.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbxPdfRemoveHeader.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxPdfRemoveHeader.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(8, 105);
-            this.cbxPdfRemoveHeader.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(5, 70);
             this.cbxPdfRemoveHeader.Name = "cbxPdfRemoveHeader";
-            this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(338, 45);
+            this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(226, 30);
             this.cbxPdfRemoveHeader.TabIndex = 10;
             this.cbxPdfRemoveHeader.Text = "不打印抬头图片";
             this.cbxPdfRemoveHeader.UseVisualStyleBackColor = true;
@@ -481,11 +454,10 @@
             // 
             this.panel4.Controls.Add(this.cbxPrinter);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel4.Location = new System.Drawing.Point(8, 45);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4);
+            this.panel4.Location = new System.Drawing.Point(5, 30);
             this.panel4.Name = "panel4";
-            this.panel4.Padding = new System.Windows.Forms.Padding(8);
-            this.panel4.Size = new System.Drawing.Size(338, 60);
+            this.panel4.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.panel4.Size = new System.Drawing.Size(226, 40);
             this.panel4.TabIndex = 0;
             // 
             // cbxPrinter
@@ -493,10 +465,9 @@
             this.cbxPrinter.Dock = System.Windows.Forms.DockStyle.Fill;
             this.cbxPrinter.Font = new System.Drawing.Font("宋体", 11F);
             this.cbxPrinter.FormattingEnabled = true;
-            this.cbxPrinter.Location = new System.Drawing.Point(8, 8);
-            this.cbxPrinter.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxPrinter.Location = new System.Drawing.Point(5, 5);
             this.cbxPrinter.Name = "cbxPrinter";
-            this.cbxPrinter.Size = new System.Drawing.Size(322, 30);
+            this.cbxPrinter.Size = new System.Drawing.Size(216, 23);
             this.cbxPrinter.TabIndex = 10;
             this.cbxPrinter.SelectedValueChanged += new System.EventHandler(this.cbxPrinter_SelectedValueChanged);
             // 
@@ -505,10 +476,9 @@
             this.lblMessage.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lblMessage.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblMessage.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblMessage.Location = new System.Drawing.Point(0, 1160);
-            this.lblMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblMessage.Location = new System.Drawing.Point(0, 679);
             this.lblMessage.Name = "lblMessage";
-            this.lblMessage.Size = new System.Drawing.Size(2138, 42);
+            this.lblMessage.Size = new System.Drawing.Size(1425, 28);
             this.lblMessage.TabIndex = 12;
             this.lblMessage.Text = "消息:";
             // 
@@ -519,10 +489,9 @@
             this.groupReport.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupReport.Font = new System.Drawing.Font("宋体", 16F);
             this.groupReport.Location = new System.Drawing.Point(0, 0);
-            this.groupReport.Margin = new System.Windows.Forms.Padding(4);
             this.groupReport.Name = "groupReport";
-            this.groupReport.Padding = new System.Windows.Forms.Padding(8);
-            this.groupReport.Size = new System.Drawing.Size(1784, 1160);
+            this.groupReport.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.groupReport.Size = new System.Drawing.Size(1189, 679);
             this.groupReport.TabIndex = 14;
             this.groupReport.TabStop = false;
             this.groupReport.Text = "打印队列";
@@ -550,15 +519,14 @@
             this.PrintStatus,
             this.PrintTime});
             this.gridPrintJobs.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridPrintJobs.Location = new System.Drawing.Point(8, 105);
-            this.gridPrintJobs.Margin = new System.Windows.Forms.Padding(4);
+            this.gridPrintJobs.Location = new System.Drawing.Point(5, 70);
             this.gridPrintJobs.Name = "gridPrintJobs";
             this.gridPrintJobs.RowHeadersVisible = false;
             this.gridPrintJobs.RowHeadersWidth = 65;
             dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gridPrintJobs.RowsDefaultCellStyle = dataGridViewCellStyle3;
             this.gridPrintJobs.RowTemplate.Height = 40;
-            this.gridPrintJobs.Size = new System.Drawing.Size(1768, 1047);
+            this.gridPrintJobs.Size = new System.Drawing.Size(1179, 604);
             this.gridPrintJobs.TabIndex = 7;
             this.gridPrintJobs.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.gridPrintJobs_RowPrePaint);
             // 
@@ -707,20 +675,18 @@
             this.panel2.Controls.Add(this.btnPrint);
             this.panel2.Controls.Add(this.btnRefresh);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel2.Location = new System.Drawing.Point(8, 45);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.panel2.Location = new System.Drawing.Point(5, 30);
             this.panel2.Name = "panel2";
-            this.panel2.Padding = new System.Windows.Forms.Padding(8);
-            this.panel2.Size = new System.Drawing.Size(1768, 60);
+            this.panel2.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.panel2.Size = new System.Drawing.Size(1179, 40);
             this.panel2.TabIndex = 5;
             // 
             // tbSearch
             // 
             this.tbSearch.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbSearch.Location = new System.Drawing.Point(158, 8);
-            this.tbSearch.Margin = new System.Windows.Forms.Padding(4);
+            this.tbSearch.Location = new System.Drawing.Point(105, 5);
             this.tbSearch.Name = "tbSearch";
-            this.tbSearch.Size = new System.Drawing.Size(1302, 44);
+            this.tbSearch.Size = new System.Drawing.Size(869, 32);
             this.tbSearch.TabIndex = 17;
             this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown);
             // 
@@ -730,10 +696,9 @@
             this.btnSearch.Enabled = false;
             this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSearch.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold);
-            this.btnSearch.Location = new System.Drawing.Point(1460, 8);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSearch.Location = new System.Drawing.Point(974, 5);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(150, 44);
+            this.btnSearch.Size = new System.Drawing.Size(100, 30);
             this.btnSearch.TabIndex = 16;
             this.btnSearch.Text = "搜索";
             this.btnSearch.UseVisualStyleBackColor = false;
@@ -745,10 +710,9 @@
             this.btnPrint.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnPrint.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPrint.Location = new System.Drawing.Point(1610, 8);
-            this.btnPrint.Margin = new System.Windows.Forms.Padding(4);
+            this.btnPrint.Location = new System.Drawing.Point(1074, 5);
             this.btnPrint.Name = "btnPrint";
-            this.btnPrint.Size = new System.Drawing.Size(150, 44);
+            this.btnPrint.Size = new System.Drawing.Size(100, 30);
             this.btnPrint.TabIndex = 11;
             this.btnPrint.Text = "开始打印";
             this.btnPrint.UseVisualStyleBackColor = false;
@@ -761,10 +725,9 @@
             this.btnRefresh.Enabled = false;
             this.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnRefresh.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefresh.Location = new System.Drawing.Point(8, 8);
-            this.btnRefresh.Margin = new System.Windows.Forms.Padding(4);
+            this.btnRefresh.Location = new System.Drawing.Point(5, 5);
             this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(150, 44);
+            this.btnRefresh.Size = new System.Drawing.Size(100, 30);
             this.btnRefresh.TabIndex = 10;
             this.btnRefresh.Text = "刷新数据";
             this.btnRefresh.UseVisualStyleBackColor = false;
@@ -772,15 +735,16 @@
             // 
             // FrmMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(2138, 1202);
+            this.ClientSize = new System.Drawing.Size(1425, 707);
             this.Controls.Add(this.groupReport);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.lblMessage);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "FrmMain";
-            this.Text = "K5报告打印客户端V4.2_24.3050";
+            this.Text = "K5报告打印客户端V4.2_24.3060";
             this.Activated += new System.EventHandler(this.FrmMain_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
             this.Load += new System.EventHandler(this.FrmMain_Load);

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.3050")]
-[assembly: AssemblyFileVersion("5.4.2024.3050")]
+[assembly: AssemblyVersion("5.4.2024.3060")]
+[assembly: AssemblyFileVersion("5.4.2024.3060")]