合并冲突

Src/FrmMain.Designer.cs

@@ -102,10 +102,10 @@
             // 
             this.cbxFirstPage.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxFirstPage.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxFirstPage.Location = new System.Drawing.Point(5, 191);
-            this.cbxFirstPage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbxFirstPage.Location = new System.Drawing.Point(8, 286);
+            this.cbxFirstPage.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.cbxFirstPage.Name = "cbxFirstPage";
-            this.cbxFirstPage.Size = new System.Drawing.Size(226, 30);
+            this.cbxFirstPage.Size = new System.Drawing.Size(338, 45);
             this.cbxFirstPage.TabIndex = 33;
             this.cbxFirstPage.Text = "仅打印首页";
             this.cbxFirstPage.UseVisualStyleBackColor = true;
@@ -116,10 +116,10 @@
             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(111, 242);
-            this.btnChangeQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnChangeQuantity.Location = new System.Drawing.Point(166, 363);
+            this.btnChangeQuantity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnChangeQuantity.Name = "btnChangeQuantity";
-            this.btnChangeQuantity.Size = new System.Drawing.Size(100, 30);
+            this.btnChangeQuantity.Size = new System.Drawing.Size(150, 45);
             this.btnChangeQuantity.TabIndex = 32;
             this.btnChangeQuantity.Text = "批量修改";
             this.btnChangeQuantity.UseVisualStyleBackColor = false;
@@ -130,15 +130,15 @@
             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(5, 242);
-            this.nudQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.nudQuantity.Location = new System.Drawing.Point(8, 363);
+            this.nudQuantity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.nudQuantity.Maximum = new decimal(new int[] {
             1000,
             0,
             0,
             0});
             this.nudQuantity.Name = "nudQuantity";
-            this.nudQuantity.Size = new System.Drawing.Size(100, 28);
+            this.nudQuantity.Size = new System.Drawing.Size(150, 40);
             this.nudQuantity.TabIndex = 31;
             this.nudQuantity.Value = new decimal(new int[] {
             1,
@@ -151,10 +151,10 @@
             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(111, 206);
-            this.btnSelectCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSelectCancel.Location = new System.Drawing.Point(166, 309);
+            this.btnSelectCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnSelectCancel.Name = "btnSelectCancel";
-            this.btnSelectCancel.Size = new System.Drawing.Size(100, 30);
+            this.btnSelectCancel.Size = new System.Drawing.Size(150, 45);
             this.btnSelectCancel.TabIndex = 30;
             this.btnSelectCancel.Text = "取消选中";
             this.btnSelectCancel.UseVisualStyleBackColor = false;
@@ -165,10 +165,10 @@
             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(5, 206);
-            this.btnSelectAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSelectAll.Location = new System.Drawing.Point(8, 309);
+            this.btnSelectAll.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnSelectAll.Name = "btnSelectAll";
-            this.btnSelectAll.Size = new System.Drawing.Size(100, 30);
+            this.btnSelectAll.Size = new System.Drawing.Size(150, 45);
             this.btnSelectAll.TabIndex = 29;
             this.btnSelectAll.Text = "全部选中";
             this.btnSelectAll.UseVisualStyleBackColor = false;
@@ -178,19 +178,20 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 12F);
-            this.label6.Location = new System.Drawing.Point(22, 170);
+            this.label6.Location = new System.Drawing.Point(33, 255);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(71, 16);
+            this.label6.Size = new System.Drawing.Size(106, 24);
             this.label6.TabIndex = 21;
             this.label6.Text = "尚未打印";
             // 
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Green;
-            this.pictureBox1.Location = new System.Drawing.Point(7, 174);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox1.Location = new System.Drawing.Point(10, 261);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(10, 10);
+            this.pictureBox1.Size = new System.Drawing.Size(15, 15);
             this.pictureBox1.TabIndex = 20;
             this.pictureBox1.TabStop = false;
             // 
@@ -198,9 +199,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("宋体", 12F);
-            this.label5.Location = new System.Drawing.Point(22, 186);
+            this.label5.Location = new System.Drawing.Point(33, 279);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(87, 16);
+            this.label5.Size = new System.Drawing.Size(130, 24);
             this.label5.TabIndex = 19;
             this.label5.Text = "打印未标记";
             // 
@@ -208,29 +210,30 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 12F);
-            this.label3.Location = new System.Drawing.Point(111, 170);
+            this.label3.Location = new System.Drawing.Point(166, 255);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(87, 16);
+            this.label3.Size = new System.Drawing.Size(130, 24);
             this.label3.TabIndex = 18;
             this.label3.Text = "打印已标记";
             // 
             // pictureBox3
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Tomato;
-            this.pictureBox3.Location = new System.Drawing.Point(7, 190);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox3.Location = new System.Drawing.Point(10, 285);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(10, 10);
+            this.pictureBox3.Size = new System.Drawing.Size(15, 15);
             this.pictureBox3.TabIndex = 17;
             this.pictureBox3.TabStop = false;
             // 
             // pictureBox2
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.SteelBlue;
-            this.pictureBox2.Location = new System.Drawing.Point(96, 174);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox2.Location = new System.Drawing.Point(144, 261);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(10, 10);
+            this.pictureBox2.Size = new System.Drawing.Size(15, 15);
             this.pictureBox2.TabIndex = 16;
             this.pictureBox2.TabStop = false;
             // 
@@ -238,10 +241,10 @@
             // 
             this.cbxJianDu.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxJianDu.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxJianDu.Location = new System.Drawing.Point(5, 161);
-            this.cbxJianDu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbxJianDu.Location = new System.Drawing.Point(8, 241);
+            this.cbxJianDu.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.cbxJianDu.Name = "cbxJianDu";
-            this.cbxJianDu.Size = new System.Drawing.Size(226, 30);
+            this.cbxJianDu.Size = new System.Drawing.Size(338, 45);
             this.cbxJianDu.TabIndex = 15;
             this.cbxJianDu.Text = "监督报告";
             this.cbxJianDu.UseVisualStyleBackColor = true;
@@ -253,11 +256,11 @@
             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(5, 342);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox3.Location = new System.Drawing.Point(8, 513);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox3.Size = new System.Drawing.Size(226, 72);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.groupBox3.Size = new System.Drawing.Size(338, 108);
             this.groupBox3.TabIndex = 14;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "信息窗口";
@@ -266,9 +269,10 @@
             // 
             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(16, 32);
+            this.label4.Location = new System.Drawing.Point(24, 48);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(95, 19);
+            this.label4.Size = new System.Drawing.Size(144, 29);
             this.label4.TabIndex = 1;
             this.label4.Text = "当前用户:";
             // 
@@ -277,9 +281,10 @@
             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(117, 32);
+            this.lblUserInfo.Location = new System.Drawing.Point(176, 48);
+            this.lblUserInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblUserInfo.Name = "lblUserInfo";
-            this.lblUserInfo.Size = new System.Drawing.Size(49, 19);
+            this.lblUserInfo.Size = new System.Drawing.Size(73, 29);
             this.lblUserInfo.TabIndex = 0;
             this.lblUserInfo.Text = "NULL";
             // 
@@ -295,11 +300,11 @@
             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(5, 414);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox2.Location = new System.Drawing.Point(8, 621);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox2.Size = new System.Drawing.Size(226, 258);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.groupBox2.Size = new System.Drawing.Size(338, 387);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "配置服务器";
@@ -310,19 +315,20 @@
             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, 238);
+            this.lblPrinterName.Location = new System.Drawing.Point(3, 357);
+            this.lblPrinterName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblPrinterName.Name = "lblPrinterName";
-            this.lblPrinterName.Size = new System.Drawing.Size(129, 20);
+            this.lblPrinterName.Size = new System.Drawing.Size(193, 30);
             this.lblPrinterName.TabIndex = 9;
             this.lblPrinterName.Text = "打印机未设置";
             // 
             // btnDisconnect
             // 
             this.btnDisconnect.Enabled = false;
-            this.btnDisconnect.Location = new System.Drawing.Point(122, 162);
-            this.btnDisconnect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnDisconnect.Location = new System.Drawing.Point(183, 243);
+            this.btnDisconnect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnDisconnect.Name = "btnDisconnect";
-            this.btnDisconnect.Size = new System.Drawing.Size(98, 32);
+            this.btnDisconnect.Size = new System.Drawing.Size(147, 48);
             this.btnDisconnect.TabIndex = 7;
             this.btnDisconnect.Text = "退出";
             this.btnDisconnect.UseVisualStyleBackColor = true;
@@ -330,10 +336,10 @@
             // 
             // btnConnect
             // 
-            this.btnConnect.Location = new System.Drawing.Point(10, 162);
-            this.btnConnect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnConnect.Location = new System.Drawing.Point(15, 243);
+            this.btnConnect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(100, 32);
+            this.btnConnect.Size = new System.Drawing.Size(150, 48);
             this.btnConnect.TabIndex = 6;
             this.btnConnect.Text = "登录";
             this.btnConnect.UseVisualStyleBackColor = true;
@@ -342,11 +348,11 @@
             // 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(66, 118);
-            this.tbxPassword.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tbxPassword.Location = new System.Drawing.Point(99, 177);
+            this.tbxPassword.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tbxPassword.Name = "tbxPassword";
             this.tbxPassword.PasswordChar = '*';
-            this.tbxPassword.Size = new System.Drawing.Size(157, 23);
+            this.tbxPassword.Size = new System.Drawing.Size(234, 31);
             this.tbxPassword.TabIndex = 5;
             this.tbxPassword.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxPassword_KeyDown);
             // 
@@ -354,47 +360,50 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 11F);
-            this.label2.Location = new System.Drawing.Point(0, 120);
+            this.label2.Location = new System.Drawing.Point(0, 180);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(67, 15);
+            this.label2.Size = new System.Drawing.Size(98, 22);
             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(66, 80);
-            this.tbxUserName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tbxUserName.Location = new System.Drawing.Point(99, 120);
+            this.tbxUserName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tbxUserName.Name = "tbxUserName";
-            this.tbxUserName.Size = new System.Drawing.Size(157, 23);
+            this.tbxUserName.Size = new System.Drawing.Size(234, 31);
             this.tbxUserName.TabIndex = 3;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 11F);
-            this.label1.Location = new System.Drawing.Point(8, 82);
+            this.label1.Location = new System.Drawing.Point(12, 123);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(52, 15);
+            this.label1.Size = new System.Drawing.Size(76, 22);
             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(66, 38);
-            this.tbxServiceName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tbxServiceName.Location = new System.Drawing.Point(99, 57);
+            this.tbxServiceName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tbxServiceName.Name = "tbxServiceName";
-            this.tbxServiceName.Size = new System.Drawing.Size(157, 23);
+            this.tbxServiceName.Size = new System.Drawing.Size(234, 31);
             this.tbxServiceName.TabIndex = 1;
             // 
             // lblServiceName
             // 
             this.lblServiceName.AutoSize = true;
             this.lblServiceName.Font = new System.Drawing.Font("宋体", 11F);
-            this.lblServiceName.Location = new System.Drawing.Point(2, 40);
+            this.lblServiceName.Location = new System.Drawing.Point(3, 60);
+            this.lblServiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblServiceName.Name = "lblServiceName";
-            this.lblServiceName.Size = new System.Drawing.Size(67, 15);
+            this.lblServiceName.Size = new System.Drawing.Size(98, 22);
             this.lblServiceName.TabIndex = 0;
             this.lblServiceName.Text = "服务地址";
             // 
@@ -404,10 +413,10 @@
             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(5, 131);
-            this.btnCompletePrintJob.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnCompletePrintJob.Location = new System.Drawing.Point(8, 196);
+            this.btnCompletePrintJob.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnCompletePrintJob.Name = "btnCompletePrintJob";
-            this.btnCompletePrintJob.Size = new System.Drawing.Size(226, 30);
+            this.btnCompletePrintJob.Size = new System.Drawing.Size(338, 45);
             this.btnCompletePrintJob.TabIndex = 12;
             this.btnCompletePrintJob.Text = "标记打印任务";
             this.btnCompletePrintJob.UseVisualStyleBackColor = false;
@@ -435,11 +444,11 @@
             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(1189, 0);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox1.Location = new System.Drawing.Point(1784, 0);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.groupBox1.Size = new System.Drawing.Size(236, 678);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.groupBox1.Size = new System.Drawing.Size(354, 1017);
             this.groupBox1.TabIndex = 11;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "打印设置区域";
@@ -450,10 +459,10 @@
             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(5, 101);
-            this.cbxPrintAutoComplete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbxPrintAutoComplete.Location = new System.Drawing.Point(8, 151);
+            this.cbxPrintAutoComplete.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.cbxPrintAutoComplete.Name = "cbxPrintAutoComplete";
-            this.cbxPrintAutoComplete.Size = new System.Drawing.Size(226, 30);
+            this.cbxPrintAutoComplete.Size = new System.Drawing.Size(338, 45);
             this.cbxPrintAutoComplete.TabIndex = 11;
             this.cbxPrintAutoComplete.Text = "自动标记为已打印";
             this.cbxPrintAutoComplete.UseVisualStyleBackColor = true;
@@ -462,10 +471,10 @@
             // 
             this.cbxPdfRemoveHeader.Dock = System.Windows.Forms.DockStyle.Top;
             this.cbxPdfRemoveHeader.Font = new System.Drawing.Font("宋体", 11F);
-            this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(5, 71);
-            this.cbxPdfRemoveHeader.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(8, 106);
+            this.cbxPdfRemoveHeader.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.cbxPdfRemoveHeader.Name = "cbxPdfRemoveHeader";
-            this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(226, 30);
+            this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(338, 45);
             this.cbxPdfRemoveHeader.TabIndex = 10;
             this.cbxPdfRemoveHeader.Text = "不打印抬头图片";
             this.cbxPdfRemoveHeader.UseVisualStyleBackColor = true;
@@ -474,11 +483,11 @@
             // 
             this.panel4.Controls.Add(this.cbxPrinter);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel4.Location = new System.Drawing.Point(5, 31);
-            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel4.Location = new System.Drawing.Point(8, 46);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel4.Name = "panel4";
-            this.panel4.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.panel4.Size = new System.Drawing.Size(226, 40);
+            this.panel4.Padding = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.panel4.Size = new System.Drawing.Size(338, 60);
             this.panel4.TabIndex = 0;
             // 
             // cbxPrinter
@@ -486,10 +495,10 @@
             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(5, 6);
-            this.cbxPrinter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbxPrinter.Location = new System.Drawing.Point(8, 9);
+            this.cbxPrinter.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.cbxPrinter.Name = "cbxPrinter";
-            this.cbxPrinter.Size = new System.Drawing.Size(216, 23);
+            this.cbxPrinter.Size = new System.Drawing.Size(322, 30);
             this.cbxPrinter.TabIndex = 10;
             this.cbxPrinter.SelectedValueChanged += new System.EventHandler(this.cbxPrinter_SelectedValueChanged);
             // 
@@ -498,9 +507,10 @@
             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, 678);
+            this.lblMessage.Location = new System.Drawing.Point(0, 1017);
+            this.lblMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMessage.Name = "lblMessage";
-            this.lblMessage.Size = new System.Drawing.Size(1425, 28);
+            this.lblMessage.Size = new System.Drawing.Size(2138, 42);
             this.lblMessage.TabIndex = 12;
             this.lblMessage.Text = "消息:";
             // 
@@ -511,10 +521,10 @@
             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(3, 2, 3, 2);
+            this.groupReport.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.groupReport.Name = "groupReport";
-            this.groupReport.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.groupReport.Size = new System.Drawing.Size(1189, 678);
+            this.groupReport.Padding = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.groupReport.Size = new System.Drawing.Size(1784, 1017);
             this.groupReport.TabIndex = 14;
             this.groupReport.TabStop = false;
             this.groupReport.Text = "打印队列";
@@ -542,15 +552,15 @@
             this.PrintStatus,
             this.PrintTime});
             this.gridPrintJobs.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridPrintJobs.Location = new System.Drawing.Point(5, 71);
-            this.gridPrintJobs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gridPrintJobs.Location = new System.Drawing.Point(8, 106);
+            this.gridPrintJobs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             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(1179, 601);
+            this.gridPrintJobs.Size = new System.Drawing.Size(1768, 902);
             this.gridPrintJobs.TabIndex = 7;
             this.gridPrintJobs.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.gridPrintJobs_RowPrePaint);
             // 
@@ -701,20 +711,20 @@
             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(5, 31);
-            this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel2.Location = new System.Drawing.Point(8, 46);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.panel2.Size = new System.Drawing.Size(1179, 40);
+            this.panel2.Padding = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.panel2.Size = new System.Drawing.Size(1768, 60);
             this.panel2.TabIndex = 5;
             // 
             // tbSearch
             // 
             this.tbSearch.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbSearch.Location = new System.Drawing.Point(105, 6);
-            this.tbSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tbSearch.Location = new System.Drawing.Point(158, 9);
+            this.tbSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tbSearch.Name = "tbSearch";
-            this.tbSearch.Size = new System.Drawing.Size(869, 32);
+            this.tbSearch.Size = new System.Drawing.Size(1302, 44);
             this.tbSearch.TabIndex = 17;
             this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown);
             // 
@@ -724,10 +734,10 @@
             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(974, 6);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSearch.Location = new System.Drawing.Point(1460, 9);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(100, 28);
+            this.btnSearch.Size = new System.Drawing.Size(150, 42);
             this.btnSearch.TabIndex = 16;
             this.btnSearch.Text = "搜索";
             this.btnSearch.UseVisualStyleBackColor = false;
@@ -739,10 +749,10 @@
             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(1074, 6);
-            this.btnPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnPrint.Location = new System.Drawing.Point(1610, 9);
+            this.btnPrint.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnPrint.Name = "btnPrint";
-            this.btnPrint.Size = new System.Drawing.Size(100, 28);
+            this.btnPrint.Size = new System.Drawing.Size(150, 42);
             this.btnPrint.TabIndex = 11;
             this.btnPrint.Text = "开始打印";
             this.btnPrint.UseVisualStyleBackColor = false;
@@ -755,10 +765,10 @@
             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(5, 6);
-            this.btnRefresh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnRefresh.Location = new System.Drawing.Point(8, 9);
+            this.btnRefresh.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(100, 28);
+            this.btnRefresh.Size = new System.Drawing.Size(150, 42);
             this.btnRefresh.TabIndex = 10;
             this.btnRefresh.Text = "刷新数据";
             this.btnRefresh.UseVisualStyleBackColor = false;
@@ -766,16 +776,15 @@
             // 
             // FrmMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1425, 706);
+            this.ClientSize = new System.Drawing.Size(2138, 1059);
             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);
             this.Name = "FrmMain";
-            this.Text = "K5报告打印客户端V4.3_24.9050";
+            this.Text = "K5报告打印客户端V4.3_24.9140";
             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/Kivii.Client.Lims.ReportPrinter.V4.0.csproj

@@ -34,6 +34,15 @@
   <PropertyGroup>
     <ApplicationIcon>F.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>false</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Kivii.Common.V4.0, Version=5.6.2024.1160, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Kivii.Common.5.6.2024.1160\lib\net40\Kivii.Common.V4.0.dll</HintPath>
@@ -92,6 +101,7 @@
     </Compile>
     <None Include="App.config" />
     <None Include="packages.config" />
+    <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Src/Properties/AssemblyInfo.cs

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

Src/Properties/app.manifest

+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
+            元素。
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
+       
+       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
\ No newline at end of file