Skip to content

K
Kivii.Client.Lims.ReportPrinter
Commit e77f27a1 by Neo Turing
Options

优化

parent 98c050ef
Showing with 209 additions and 203 deletions
Src/Entities/PrintPool.cs
......@@ -97,6 +97,20 @@ namespace Kivii.Client.Lims.ReportPrinter.Entities
public bool IsSearch { get; set; }
public string Judgement
{
get
{
var rtns = Summary.Contains("不合格") ? "不符合" : (Summary.Contains("合格") ? "符合" : "/");// Metadata.ContainsKey("OperatorName") ? Metadata["OperatorName"] : string.Empty;
return rtns;
}
set
{
var result= Summary.Contains("不合格") ? "不符合" : (Summary.Contains("合格") ? "符合" : "/");
value = result;
}
}
public string AccepterName
{
get
......
Src/FrmMain.Designer.cs
......@@ -66,6 +66,11 @@
this.lblMessage = new System.Windows.Forms.Label();
this.groupReport = new System.Windows.Forms.GroupBox();
this.gridPrintJobs = new System.Windows.Forms.DataGridView();
this.panel2 = new System.Windows.Forms.Panel();
this.tbSearch = new System.Windows.Forms.TextBox();
this.btnSearch = new System.Windows.Forms.Button();
this.btnPrint = new System.Windows.Forms.Button();
this.btnRefresh = new System.Windows.Forms.Button();
this.Column6 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.IsPrint = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsSearch = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -75,16 +80,11 @@
this.OperateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.AccepterName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.OperatorName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Summary = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Judgement = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsPasteSample = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PrintStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PrintTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel2 = new System.Windows.Forms.Panel();
this.tbSearch = new System.Windows.Forms.TextBox();
this.btnSearch = new System.Windows.Forms.Button();
this.btnPrint = new System.Windows.Forms.Button();
this.btnRefresh = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.nudQuantity)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
......@@ -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(7, 240);
this.cbxFirstPage.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cbxFirstPage.Location = new System.Drawing.Point(5, 191);
this.cbxFirstPage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbxFirstPage.Name = "cbxFirstPage";
this.cbxFirstPage.Size = new System.Drawing.Size(301, 38);
this.cbxFirstPage.Size = new System.Drawing.Size(226, 30);
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(148, 302);
this.btnChangeQuantity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnChangeQuantity.Location = new System.Drawing.Point(111, 242);
this.btnChangeQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnChangeQuantity.Name = "btnChangeQuantity";
this.btnChangeQuantity.Size = new System.Drawing.Size(133, 38);
this.btnChangeQuantity.Size = new System.Drawing.Size(100, 30);
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(7, 302);
this.nudQuantity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.nudQuantity.Location = new System.Drawing.Point(5, 242);
this.nudQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.nudQuantity.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.nudQuantity.Name = "nudQuantity";
this.nudQuantity.Size = new System.Drawing.Size(133, 34);
this.nudQuantity.Size = new System.Drawing.Size(100, 28);
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(148, 257);
this.btnSelectCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnSelectCancel.Location = new System.Drawing.Point(111, 206);
this.btnSelectCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSelectCancel.Name = "btnSelectCancel";
this.btnSelectCancel.Size = new System.Drawing.Size(133, 38);
this.btnSelectCancel.Size = new System.Drawing.Size(100, 30);
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(7, 257);
this.btnSelectAll.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnSelectAll.Location = new System.Drawing.Point(5, 206);
this.btnSelectAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSelectAll.Name = "btnSelectAll";
this.btnSelectAll.Size = new System.Drawing.Size(133, 38);
this.btnSelectAll.Size = new System.Drawing.Size(100, 30);
this.btnSelectAll.TabIndex = 29;
this.btnSelectAll.Text = "全部选中";
this.btnSelectAll.UseVisualStyleBackColor = false;
......@@ -178,20 +178,19 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 12F);
this.label6.Location = new System.Drawing.Point(29, 213);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Location = new System.Drawing.Point(22, 170);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(89, 20);
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(9, 218);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.pictureBox1.Location = new System.Drawing.Point(7, 174);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(13, 12);
this.pictureBox1.Size = new System.Drawing.Size(10, 10);
this.pictureBox1.TabIndex = 20;
this.pictureBox1.TabStop = false;
//
......@@ -199,10 +198,9 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 12F);
this.label5.Location = new System.Drawing.Point(29, 233);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Location = new System.Drawing.Point(22, 186);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 20);
this.label5.Size = new System.Drawing.Size(87, 16);
this.label5.TabIndex = 19;
this.label5.Text = "打印未标记";
//
......@@ -210,30 +208,29 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 12F);
this.label3.Location = new System.Drawing.Point(148, 213);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Location = new System.Drawing.Point(111, 170);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 20);
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(9, 237);
this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.pictureBox3.Location = new System.Drawing.Point(7, 190);
this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(13, 12);
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(128, 218);
this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.pictureBox2.Location = new System.Drawing.Point(96, 174);
this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(13, 12);
this.pictureBox2.Size = new System.Drawing.Size(10, 10);
this.pictureBox2.TabIndex = 16;
this.pictureBox2.TabStop = false;
//
......@@ -241,10 +238,10 @@
//
this.cbxJianDu.Dock = System.Windows.Forms.DockStyle.Top;
this.cbxJianDu.Font = new System.Drawing.Font("宋体", 11F);
this.cbxJianDu.Location = new System.Drawing.Point(7, 202);
this.cbxJianDu.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cbxJianDu.Location = new System.Drawing.Point(5, 161);
this.cbxJianDu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbxJianDu.Name = "cbxJianDu";
this.cbxJianDu.Size = new System.Drawing.Size(301, 38);
this.cbxJianDu.Size = new System.Drawing.Size(226, 30);
this.cbxJianDu.TabIndex = 15;
this.cbxJianDu.Text = "监督报告";
this.cbxJianDu.UseVisualStyleBackColor = true;
......@@ -256,11 +253,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(7, 428);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox3.Location = new System.Drawing.Point(5, 342);
this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox3.Size = new System.Drawing.Size(301, 90);
this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox3.Size = new System.Drawing.Size(226, 72);
this.groupBox3.TabIndex = 14;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "信息窗口";
......@@ -269,10 +266,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(21, 40);
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(118, 24);
this.label4.Size = new System.Drawing.Size(95, 19);
this.label4.TabIndex = 1;
this.label4.Text = "当前用户:";
//
......@@ -281,10 +277,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(156, 40);
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(58, 24);
this.lblUserInfo.Size = new System.Drawing.Size(49, 19);
this.lblUserInfo.TabIndex = 0;
this.lblUserInfo.Text = "NULL";
//
......@@ -300,11 +295,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(7, 518);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox2.Location = new System.Drawing.Point(5, 414);
this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox2.Size = new System.Drawing.Size(301, 323);
this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox2.Size = new System.Drawing.Size(226, 258);
this.groupBox2.TabIndex = 13;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "配置服务器";
......@@ -315,20 +310,19 @@
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, 298);
this.lblPrinterName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPrinterName.Location = new System.Drawing.Point(2, 238);
this.lblPrinterName.Name = "lblPrinterName";
this.lblPrinterName.Size = new System.Drawing.Size(162, 25);
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(162, 203);
this.btnDisconnect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnDisconnect.Location = new System.Drawing.Point(122, 162);
this.btnDisconnect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnDisconnect.Name = "btnDisconnect";
this.btnDisconnect.Size = new System.Drawing.Size(131, 40);
this.btnDisconnect.Size = new System.Drawing.Size(98, 32);
this.btnDisconnect.TabIndex = 7;
this.btnDisconnect.Text = "退出";
this.btnDisconnect.UseVisualStyleBackColor = true;
......@@ -336,10 +330,10 @@
//
// btnConnect
//
this.btnConnect.Location = new System.Drawing.Point(14, 203);
this.btnConnect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnConnect.Location = new System.Drawing.Point(10, 162);
this.btnConnect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnConnect.Name = "btnConnect";
this.btnConnect.Size = new System.Drawing.Size(133, 40);
this.btnConnect.Size = new System.Drawing.Size(100, 32);
this.btnConnect.TabIndex = 6;
this.btnConnect.Text = "登录";
this.btnConnect.UseVisualStyleBackColor = true;
......@@ -348,11 +342,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(88, 148);
this.tbxPassword.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tbxPassword.Location = new System.Drawing.Point(66, 118);
this.tbxPassword.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbxPassword.Name = "tbxPassword";
this.tbxPassword.PasswordChar = '*';
this.tbxPassword.Size = new System.Drawing.Size(208, 27);
this.tbxPassword.Size = new System.Drawing.Size(157, 23);
this.tbxPassword.TabIndex = 5;
this.tbxPassword.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxPassword_KeyDown);
//
......@@ -360,50 +354,47 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 11F);
this.label2.Location = new System.Drawing.Point(0, 150);
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(85, 19);
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(88, 100);
this.tbxUserName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tbxUserName.Location = new System.Drawing.Point(66, 80);
this.tbxUserName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbxUserName.Name = "tbxUserName";
this.tbxUserName.Size = new System.Drawing.Size(208, 27);
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(11, 102);
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(66, 19);
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(88, 48);
this.tbxServiceName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tbxServiceName.Location = new System.Drawing.Point(66, 38);
this.tbxServiceName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbxServiceName.Name = "tbxServiceName";
this.tbxServiceName.Size = new System.Drawing.Size(208, 27);
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, 50);
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(85, 19);
this.lblServiceName.Size = new System.Drawing.Size(67, 15);
this.lblServiceName.TabIndex = 0;
this.lblServiceName.Text = "服务地址";
//
......@@ -413,10 +404,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(7, 164);
this.btnCompletePrintJob.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnCompletePrintJob.Location = new System.Drawing.Point(5, 131);
this.btnCompletePrintJob.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnCompletePrintJob.Name = "btnCompletePrintJob";
this.btnCompletePrintJob.Size = new System.Drawing.Size(301, 38);
this.btnCompletePrintJob.Size = new System.Drawing.Size(226, 30);
this.btnCompletePrintJob.TabIndex = 12;
this.btnCompletePrintJob.Text = "标记打印任务";
this.btnCompletePrintJob.UseVisualStyleBackColor = false;
......@@ -444,11 +435,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(1585, 0);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox1.Location = new System.Drawing.Point(1189, 0);
this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(7);
this.groupBox1.Size = new System.Drawing.Size(315, 848);
this.groupBox1.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.groupBox1.Size = new System.Drawing.Size(236, 678);
this.groupBox1.TabIndex = 11;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "打印设置区域";
......@@ -459,10 +450,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(7, 126);
this.cbxPrintAutoComplete.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cbxPrintAutoComplete.Location = new System.Drawing.Point(5, 101);
this.cbxPrintAutoComplete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbxPrintAutoComplete.Name = "cbxPrintAutoComplete";
this.cbxPrintAutoComplete.Size = new System.Drawing.Size(301, 38);
this.cbxPrintAutoComplete.Size = new System.Drawing.Size(226, 30);
this.cbxPrintAutoComplete.TabIndex = 11;
this.cbxPrintAutoComplete.Text = "自动标记为已打印";
this.cbxPrintAutoComplete.UseVisualStyleBackColor = true;
......@@ -471,10 +462,10 @@
//
this.cbxPdfRemoveHeader.Dock = System.Windows.Forms.DockStyle.Top;
this.cbxPdfRemoveHeader.Font = new System.Drawing.Font("宋体", 11F);
this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(7, 88);
this.cbxPdfRemoveHeader.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cbxPdfRemoveHeader.Location = new System.Drawing.Point(5, 71);
this.cbxPdfRemoveHeader.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbxPdfRemoveHeader.Name = "cbxPdfRemoveHeader";
this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(301, 38);
this.cbxPdfRemoveHeader.Size = new System.Drawing.Size(226, 30);
this.cbxPdfRemoveHeader.TabIndex = 10;
this.cbxPdfRemoveHeader.Text = "不打印抬头图片";
this.cbxPdfRemoveHeader.UseVisualStyleBackColor = true;
......@@ -483,11 +474,11 @@
//
this.panel4.Controls.Add(this.cbxPrinter);
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
this.panel4.Location = new System.Drawing.Point(7, 38);
this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel4.Location = new System.Drawing.Point(5, 31);
this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel4.Name = "panel4";
this.panel4.Padding = new System.Windows.Forms.Padding(7);
this.panel4.Size = new System.Drawing.Size(301, 50);
this.panel4.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.panel4.Size = new System.Drawing.Size(226, 40);
this.panel4.TabIndex = 0;
//
// cbxPrinter
......@@ -495,10 +486,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(7, 7);
this.cbxPrinter.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cbxPrinter.Location = new System.Drawing.Point(5, 6);
this.cbxPrinter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbxPrinter.Name = "cbxPrinter";
this.cbxPrinter.Size = new System.Drawing.Size(287, 26);
this.cbxPrinter.Size = new System.Drawing.Size(216, 23);
this.cbxPrinter.TabIndex = 10;
this.cbxPrinter.SelectedValueChanged += new System.EventHandler(this.cbxPrinter_SelectedValueChanged);
//
......@@ -507,10 +498,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, 848);
this.lblMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMessage.Location = new System.Drawing.Point(0, 678);
this.lblMessage.Name = "lblMessage";
this.lblMessage.Size = new System.Drawing.Size(1900, 35);
this.lblMessage.Size = new System.Drawing.Size(1425, 28);
this.lblMessage.TabIndex = 12;
this.lblMessage.Text = "消息:";
//
......@@ -521,10 +511,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(4, 3, 4, 3);
this.groupReport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupReport.Name = "groupReport";
this.groupReport.Padding = new System.Windows.Forms.Padding(7);
this.groupReport.Size = new System.Drawing.Size(1585, 848);
this.groupReport.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.groupReport.Size = new System.Drawing.Size(1189, 678);
this.groupReport.TabIndex = 14;
this.groupReport.TabStop = false;
this.groupReport.Text = "打印队列";
......@@ -546,24 +536,94 @@
this.OperateTime,
this.AccepterName,
this.OperatorName,
this.Summary,
this.Judgement,
this.Remark,
this.IsPasteSample,
this.PrintStatus,
this.PrintTime});
this.gridPrintJobs.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridPrintJobs.Location = new System.Drawing.Point(7, 88);
this.gridPrintJobs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.gridPrintJobs.Location = new System.Drawing.Point(5, 71);
this.gridPrintJobs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(1571, 753);
this.gridPrintJobs.Size = new System.Drawing.Size(1179, 601);
this.gridPrintJobs.TabIndex = 7;
this.gridPrintJobs.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.gridPrintJobs_RowPrePaint);
//
// panel2
//
this.panel2.Controls.Add(this.tbSearch);
this.panel2.Controls.Add(this.btnSearch);
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.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.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.Name = "tbSearch";
this.tbSearch.Size = new System.Drawing.Size(869, 32);
this.tbSearch.TabIndex = 17;
this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown);
//
// btnSearch
//
this.btnSearch.Dock = System.Windows.Forms.DockStyle.Right;
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.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(100, 28);
this.btnSearch.TabIndex = 16;
this.btnSearch.Text = "搜索";
this.btnSearch.UseVisualStyleBackColor = false;
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// btnPrint
//
this.btnPrint.BackColor = System.Drawing.SystemColors.Highlight;
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.Name = "btnPrint";
this.btnPrint.Size = new System.Drawing.Size(100, 28);
this.btnPrint.TabIndex = 11;
this.btnPrint.Text = "开始打印";
this.btnPrint.UseVisualStyleBackColor = false;
this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
//
// btnRefresh
//
this.btnRefresh.BackColor = System.Drawing.Color.LightGreen;
this.btnRefresh.Dock = System.Windows.Forms.DockStyle.Left;
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.Name = "btnRefresh";
this.btnRefresh.Size = new System.Drawing.Size(100, 28);
this.btnRefresh.TabIndex = 10;
this.btnRefresh.Text = "刷新数据";
this.btnRefresh.UseVisualStyleBackColor = false;
this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
//
// Column6
//
this.Column6.DataPropertyName = "IsSelected";
......@@ -644,6 +704,7 @@
this.AccepterName.MinimumWidth = 8;
this.AccepterName.Name = "AccepterName";
this.AccepterName.ReadOnly = true;
this.AccepterName.Visible = false;
this.AccepterName.Width = 150;
//
// OperatorName
......@@ -656,14 +717,14 @@
this.OperatorName.ReadOnly = true;
this.OperatorName.Width = 80;
//
// Summary
// Judgement
//
this.Summary.DataPropertyName = "Summary";
this.Summary.HeaderText = "判定";
this.Summary.MinimumWidth = 80;
this.Summary.Name = "Summary";
this.Summary.ReadOnly = true;
this.Summary.Width = 80;
this.Judgement.DataPropertyName = "Judgement";
this.Judgement.HeaderText = "判定";
this.Judgement.MinimumWidth = 80;
this.Judgement.Name = "Judgement";
this.Judgement.ReadOnly = true;
this.Judgement.Width = 80;
//
// Remark
//
......@@ -681,6 +742,7 @@
this.IsPasteSample.MinimumWidth = 60;
this.IsPasteSample.Name = "IsPasteSample";
this.IsPasteSample.ReadOnly = true;
this.IsPasteSample.Visible = false;
this.IsPasteSample.Width = 60;
//
// PrintStatus
......@@ -702,88 +764,18 @@
this.PrintTime.Name = "PrintTime";
this.PrintTime.Width = 150;
//
// panel2
//
this.panel2.Controls.Add(this.tbSearch);
this.panel2.Controls.Add(this.btnSearch);
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(7, 38);
this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel2.Name = "panel2";
this.panel2.Padding = new System.Windows.Forms.Padding(7);
this.panel2.Size = new System.Drawing.Size(1571, 50);
this.panel2.TabIndex = 5;
//
// tbSearch
//
this.tbSearch.Dock = System.Windows.Forms.DockStyle.Fill;
this.tbSearch.Location = new System.Drawing.Point(140, 7);
this.tbSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tbSearch.Name = "tbSearch";
this.tbSearch.Size = new System.Drawing.Size(1158, 38);
this.tbSearch.TabIndex = 17;
this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown);
//
// btnSearch
//
this.btnSearch.Dock = System.Windows.Forms.DockStyle.Right;
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(1298, 7);
this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(133, 36);
this.btnSearch.TabIndex = 16;
this.btnSearch.Text = "搜索";
this.btnSearch.UseVisualStyleBackColor = false;
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// btnPrint
//
this.btnPrint.BackColor = System.Drawing.SystemColors.Highlight;
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(1431, 7);
this.btnPrint.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnPrint.Name = "btnPrint";
this.btnPrint.Size = new System.Drawing.Size(133, 36);
this.btnPrint.TabIndex = 11;
this.btnPrint.Text = "开始打印";
this.btnPrint.UseVisualStyleBackColor = false;
this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
//
// btnRefresh
//
this.btnRefresh.BackColor = System.Drawing.Color.LightGreen;
this.btnRefresh.Dock = System.Windows.Forms.DockStyle.Left;
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(7, 7);
this.btnRefresh.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnRefresh.Name = "btnRefresh";
this.btnRefresh.Size = new System.Drawing.Size(133, 36);
this.btnRefresh.TabIndex = 10;
this.btnRefresh.Text = "刷新数据";
this.btnRefresh.UseVisualStyleBackColor = false;
this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
//
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1900, 883);
this.ClientSize = new System.Drawing.Size(1425, 706);
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(3, 2, 3, 2);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FrmMain";
this.Text = "K5报告打印客户端V4.3_24.3060";
this.Text = "K5报告打印客户端V4.3_24.9050";
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);
......@@ -841,6 +833,11 @@
private System.Windows.Forms.Label lblMessage;
private System.Windows.Forms.GroupBox groupReport;
private System.Windows.Forms.DataGridView gridPrintJobs;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.TextBox tbSearch;
private System.Windows.Forms.Button btnSearch;
private System.Windows.Forms.Button btnPrint;
private System.Windows.Forms.Button btnRefresh;
private System.Windows.Forms.DataGridViewCheckBoxColumn Column6;
private System.Windows.Forms.DataGridViewTextBoxColumn IsPrint;
private System.Windows.Forms.DataGridViewTextBoxColumn IsSearch;
......@@ -850,16 +847,11 @@
private System.Windows.Forms.DataGridViewTextBoxColumn OperateTime;
private System.Windows.Forms.DataGridViewTextBoxColumn AccepterName;
private System.Windows.Forms.DataGridViewTextBoxColumn OperatorName;
private System.Windows.Forms.DataGridViewTextBoxColumn Summary;
private System.Windows.Forms.DataGridViewTextBoxColumn Judgement;
private System.Windows.Forms.DataGridViewTextBoxColumn Remark;
private System.Windows.Forms.DataGridViewTextBoxColumn IsPasteSample;
private System.Windows.Forms.DataGridViewTextBoxColumn PrintStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn PrintTime;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.TextBox tbSearch;
private System.Windows.Forms.Button btnSearch;
private System.Windows.Forms.Button btnPrint;
private System.Windows.Forms.Button btnRefresh;
}
}
Src/FrmMain.resx
......@@ -144,7 +144,7 @@
<metadata name="OperatorName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Summary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Judgement.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
......
Src/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.3060")]
[assembly: AssemblyFileVersion("5.4.2024.3060")]
[assembly: AssemblyVersion("5.4.2024.9050")]
[assembly: AssemblyFileVersion("5.4.2024.9050")]
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