From ddd9b50f12ac0bd6a4cd0870f3ea06f0ea579520 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 09:35:45 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs |  106 ++++++++-----------------
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs          |   28 +++++--
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs          |    3 
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs |   25 +++---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs             |   75 +++++++++++++++++-
 5 files changed, 138 insertions(+), 99 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
index 6fc3512..f27c9d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -70,9 +70,9 @@
             this.lb_remark.Appearance.Options.UseFont = true;
             this.lb_remark.Location = new System.Drawing.Point(70, 132);
             this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(39, 21);
+            this.lb_remark.Size = new System.Drawing.Size(40, 21);
             this.lb_remark.TabIndex = 217;
-            this.lb_remark.Text = "澶囨敞 ";
+            this.lb_remark.Text = "澶囨敞:";
             // 
             // txt_remark
             // 
@@ -80,7 +80,7 @@
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(150, 28);
+            this.txt_remark.Size = new System.Drawing.Size(178, 28);
             this.txt_remark.TabIndex = 217;
             // 
             // gv_remark
@@ -103,9 +103,9 @@
             this.lb_port.Appearance.Options.UseFont = true;
             this.lb_port.Location = new System.Drawing.Point(19, 94);
             this.lb_port.Name = "lb_port";
-            this.lb_port.Size = new System.Drawing.Size(90, 21);
+            this.lb_port.Size = new System.Drawing.Size(91, 21);
             this.lb_port.TabIndex = 216;
-            this.lb_port.Text = "鎵撳嵃鏈虹鍙� ";
+            this.lb_port.Text = "鎵撳嵃鏈虹鍙�:";
             // 
             // txt_port
             // 
@@ -113,8 +113,9 @@
             this.txt_port.Name = "txt_port";
             this.txt_port.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_port.Properties.Appearance.Options.UseFont = true;
-            this.txt_port.Size = new System.Drawing.Size(150, 28);
+            this.txt_port.Size = new System.Drawing.Size(178, 28);
             this.txt_port.TabIndex = 216;
+            this.txt_port.Tag = "moren.9100";
             // 
             // gv_port
             // 
@@ -136,9 +137,9 @@
             this.lb_ip.Appearance.Options.UseFont = true;
             this.lb_ip.Location = new System.Drawing.Point(38, 54);
             this.lb_ip.Name = "lb_ip";
-            this.lb_ip.Size = new System.Drawing.Size(71, 21);
+            this.lb_ip.Size = new System.Drawing.Size(72, 21);
             this.lb_ip.TabIndex = 213;
-            this.lb_ip.Text = "鎵撳嵃鏈篒P ";
+            this.lb_ip.Text = "鎵撳嵃鏈篒P:";
             // 
             // txt_ip
             // 
@@ -146,7 +147,7 @@
             this.txt_ip.Name = "txt_ip";
             this.txt_ip.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_ip.Properties.Appearance.Options.UseFont = true;
-            this.txt_ip.Size = new System.Drawing.Size(150, 28);
+            this.txt_ip.Size = new System.Drawing.Size(178, 28);
             this.txt_ip.TabIndex = 213;
             // 
             // gv_ip
@@ -169,9 +170,9 @@
             this.lb_printNo.Appearance.Options.UseFont = true;
             this.lb_printNo.Location = new System.Drawing.Point(19, 20);
             this.lb_printNo.Name = "lb_printNo";
-            this.lb_printNo.Size = new System.Drawing.Size(90, 21);
+            this.lb_printNo.Size = new System.Drawing.Size(91, 21);
             this.lb_printNo.TabIndex = 211;
-            this.lb_printNo.Text = "鎵撳嵃鏈虹紪鍙� ";
+            this.lb_printNo.Text = "鎵撳嵃鏈虹紪鍙�:";
             // 
             // txt_printNo
             // 
@@ -179,7 +180,7 @@
             this.txt_printNo.Name = "txt_printNo";
             this.txt_printNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_printNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_printNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_printNo.Size = new System.Drawing.Size(178, 28);
             this.txt_printNo.TabIndex = 211;
             // 
             // gv_printNo
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index 2ae8ef1..42c9cf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -100,7 +101,7 @@
         private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-           (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_printNo, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_printNo, gridView1);
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -157,7 +158,7 @@
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-           (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_printNo, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_printNo, gridView1);
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -194,21 +195,32 @@
             if (string.IsNullOrEmpty(txt_ip.Text.Trim()))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("IP涓嶈兘涓虹┖锛�");
-                txt_printNo.Focus();
+                txt_ip.Focus();
                 return;
             }
             if (string.IsNullOrEmpty(txt_port.Text.Trim()))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("绔彛涓嶈兘涓虹┖锛�");
-                txt_printNo.Focus();
+                txt_port.Focus();
+                return;
+            }
+            try
+            {
+                IPAddress.Parse(txt_ip.Text);
+            }
+            catch
+            {
+                txt_ip.Text = "";
+                MessageBox.Show("璇疯緭鍏ユ纭殑IP鍦板潃");
+                txt_ip.Focus();
                 return;
             }
             var _obj = new PrintInfo
             {
                 Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                PrintNo= txt_printNo.Text.Trim(),
+                PrintNo = txt_printNo.Text.Trim(),
                 Ip = txt_ip.Text.Trim(),
-                Port= txt_port.Text.Trim(),
+                Port = txt_port.Text.Trim(),
                 Remark = txt_remark.Text.Trim(),
             };
             try
@@ -234,7 +246,7 @@
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private  void getPageList(int curPage)
+        private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.print_no",
@@ -242,7 +254,7 @@
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
-                var strReturn =  UtilityHelper.HttpPost("",
+                var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 if (dd.rtnCode > 0)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
index 0ff627b..3f65815 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
@@ -30,10 +30,7 @@
         private void InitializeComponent()
         {
             this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_isStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_sysParam = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remark2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_remark1 = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark1 = new DevExpress.XtraEditors.TextEdit();
             this.gv_remark1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -41,20 +38,20 @@
             this.gv_printId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_userId = new DevExpress.XtraEditors.LabelControl();
             this.gv_userId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_printId = new Gs.DevApp.UserControl.UcLookPrint();
             this.txt_userId = new Gs.DevApp.UserControl.UcLookUser();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -63,6 +60,7 @@
             this.xtraTabPage1.SuspendLayout();
             this.xtraTabPage2.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // lb_isStatus
@@ -75,15 +73,6 @@
             this.lb_isStatus.TabIndex = 222;
             this.lb_isStatus.Text = "鏄惁鍚敤:";
             // 
-            // txt_isStatus
-            // 
-            this.txt_isStatus.Location = new System.Drawing.Point(126, 97);
-            this.txt_isStatus.Name = "txt_isStatus";
-            this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_isStatus.Size = new System.Drawing.Size(194, 28);
-            this.txt_isStatus.TabIndex = 222;
-            // 
             // gv_isStatus
             // 
             this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -95,36 +84,8 @@
             this.gv_isStatus.OptionsColumn.AllowEdit = false;
             this.gv_isStatus.Tag = "query_a.is_status";
             this.gv_isStatus.Visible = true;
-            this.gv_isStatus.VisibleIndex = 6;
+            this.gv_isStatus.VisibleIndex = 4;
             this.gv_isStatus.Width = 94;
-            // 
-            // gv_sysParam
-            // 
-            this.gv_sysParam.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_sysParam.AppearanceCell.Options.UseFont = true;
-            this.gv_sysParam.Caption = "鏄惁绯荤粺鍙傛暟 ";
-            this.gv_sysParam.FieldName = "sysParam";
-            this.gv_sysParam.MinWidth = 50;
-            this.gv_sysParam.Name = "gv_sysParam";
-            this.gv_sysParam.OptionsColumn.AllowEdit = false;
-            this.gv_sysParam.Tag = "query_a.sys_param";
-            this.gv_sysParam.Visible = true;
-            this.gv_sysParam.VisibleIndex = 5;
-            this.gv_sysParam.Width = 94;
-            // 
-            // gv_remark2
-            // 
-            this.gv_remark2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remark2.AppearanceCell.Options.UseFont = true;
-            this.gv_remark2.Caption = "澶囨敞2 ";
-            this.gv_remark2.FieldName = "remark2";
-            this.gv_remark2.MinWidth = 50;
-            this.gv_remark2.Name = "gv_remark2";
-            this.gv_remark2.OptionsColumn.AllowEdit = false;
-            this.gv_remark2.Tag = "query_a.remark2";
-            this.gv_remark2.Visible = true;
-            this.gv_remark2.VisibleIndex = 4;
-            this.gv_remark2.Width = 94;
             // 
             // lb_remark1
             // 
@@ -173,8 +134,8 @@
             // 
             this.gv_printId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_printId.AppearanceCell.Options.UseFont = true;
-            this.gv_printId.Caption = "鎵撳嵃鏈篿d ";
-            this.gv_printId.FieldName = "printId";
+            this.gv_printId.Caption = "鎵撳嵃鏈虹紪鍙�";
+            this.gv_printId.FieldName = "printNo";
             this.gv_printId.MinWidth = 50;
             this.gv_printId.Name = "gv_printId";
             this.gv_printId.OptionsColumn.AllowEdit = false;
@@ -197,29 +158,15 @@
             // 
             this.gv_userId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_userId.AppearanceCell.Options.UseFont = true;
-            this.gv_userId.Caption = "鐢ㄦ埛id ";
-            this.gv_userId.FieldName = "userId";
+            this.gv_userId.Caption = "鐢ㄦ埛璐﹀彿";
+            this.gv_userId.FieldName = "account";
             this.gv_userId.MinWidth = 50;
             this.gv_userId.Name = "gv_userId";
             this.gv_userId.OptionsColumn.AllowEdit = false;
             this.gv_userId.Tag = "query_a.user_id";
             this.gv_userId.Visible = true;
-            this.gv_userId.VisibleIndex = 1;
+            this.gv_userId.VisibleIndex = 0;
             this.gv_userId.Width = 94;
-            // 
-            // gv_guid
-            // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "涓婚敭 ";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.guid";
-            this.gv_guid.Visible = true;
-            this.gv_guid.VisibleIndex = 0;
-            this.gv_guid.Width = 94;
             // 
             // toolBarMenu1
             // 
@@ -252,12 +199,10 @@
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_guid,
             this.gv_userId,
+            this.gridColumn1,
             this.gv_printId,
             this.gv_remark1,
-            this.gv_remark2,
-            this.gv_sysParam,
             this.gv_isStatus});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
@@ -265,6 +210,16 @@
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鐢ㄦ埛鍚嶇О";
+            this.gridColumn1.FieldName = "userName";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 1;
+            this.gridColumn1.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -309,12 +264,12 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_isStatus);
             this.panel1.Controls.Add(this.txt_printId);
             this.panel1.Controls.Add(this.txt_userId);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_isStatus);
-            this.panel1.Controls.Add(this.txt_isStatus);
             this.panel1.Controls.Add(this.lb_remark1);
             this.panel1.Controls.Add(this.txt_remark1);
             this.panel1.Controls.Add(this.lb_printId);
@@ -324,6 +279,15 @@
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(664, 264);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_isStatus
+            // 
+            this.txt_isStatus.Location = new System.Drawing.Point(126, 95);
+            this.txt_isStatus.Name = "txt_isStatus";
+            this.txt_isStatus.Properties.Caption = "";
+            this.txt_isStatus.Size = new System.Drawing.Size(94, 24);
+            this.txt_isStatus.TabIndex = 225;
+            this.txt_isStatus.Tag = "";
             // 
             // txt_printId
             // 
@@ -349,6 +313,7 @@
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
@@ -357,6 +322,7 @@
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            this.lbGuid.Visible = false;
             // 
             // Frm_PrintUser
             // 
@@ -366,7 +332,6 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_PrintUser";
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -376,6 +341,7 @@
             this.xtraTabPage2.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -392,10 +358,7 @@
         private DevExpress.XtraEditors.LabelControl labelControl11;
        //BQCreateConrolObejct
 private DevExpress.XtraEditors.LabelControl lb_isStatus;
-private DevExpress.XtraEditors.TextEdit txt_isStatus;
  private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_sysParam;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark2;
 
 private DevExpress.XtraEditors.LabelControl lb_remark1;
 private DevExpress.XtraEditors.TextEdit txt_remark1;
@@ -406,8 +369,9 @@
 
 private DevExpress.XtraEditors.LabelControl lb_userId;
  private DevExpress.XtraGrid.Columns.GridColumn gv_userId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
         private UserControl.UcLookUser txt_userId;
         private UserControl.UcLookPrint txt_printId;
+        private DevExpress.XtraEditors.CheckEdit txt_isStatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index 2a46dfa..971a113 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -203,7 +203,8 @@
                 Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 UserId = UtilityHelper.ToGuid(_userId),
                 PrintId = UtilityHelper.ToGuid(_printId),
-                Remark1 = txt_remark1.Text.Trim()
+                Remark1 = txt_remark1.Text.Trim(),
+                IsStatus = txt_isStatus.Checked, //鐘舵��
             };
             try
             {
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index a7fb76b..ae93d9e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -128,7 +128,7 @@
                 request.Timeout = 15000;
                 request.AllowAutoRedirect = false;
                 request.ServicePoint.Expect100Continue = false;
-                wdf.SetCaption(_caption+"锛�10/100锛�" + meth);
+                wdf.SetCaption(_caption + "锛�10/100锛�" + meth);
                 HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
                 request.CachePolicy = noCachePolicy;
                 wdf.SetCaption(_caption + "锛�20/100锛�" + meth);
@@ -604,7 +604,28 @@
                                 txt.Enabled = false;
                             continue;
                         }
-
+                        //鑷畾鐢ㄦ埛
+                        if (colType is UcLookUser)
+                        {
+                            var txt = colType as UcLookUser;
+                            txt.SetIdOrCode(strVal);
+                            if (txt.IsReadly == false)
+                                txt.Enabled = !isEdt;
+                            else
+                                txt.Enabled = false;
+                            continue;
+                        }
+                        //鑷畾鎵撳嵃鏈�
+                        if (colType is UcLookPrint)
+                        {
+                            var txt = colType as UcLookPrint;
+                            txt.SetIdOrCode(strVal);
+                            if (txt.IsReadly == false)
+                                txt.Enabled = !isEdt;
+                            else
+                                txt.Enabled = false;
+                            continue;
+                        }
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -683,7 +704,12 @@
                 if (ctrl is TextEdit)
                 {
                     var txt = ctrl as TextEdit;
-                    txt.Text = "";
+                    if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren"))
+                    {
+                        txt.Text = txt.Tag.ToString().Replace("moren.", "");
+                    }
+                    else
+                        txt.Text = "";
                     txt.ReadOnly = isEdt;
                     continue;
                 }
@@ -706,7 +732,7 @@
                 if (ctrl is CheckBox)
                 {
                     var txt = ctrl as CheckBox;
-                    txt.Checked = false;
+                    //txt.Checked = false;
                     txt.Enabled = !isEdt;
                 }
                 if (ctrl is CheckEdit)
@@ -784,6 +810,22 @@
                 if (ctrl is UcLookOrg)
                 {
                     var txt = ctrl as UcLookOrg;
+                    txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
+                //鑷畾鐢ㄦ埛
+                if (ctrl is UcLookUser)
+                {
+                    var txt = ctrl as UcLookUser;
+                    txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
+                //鑷畾鎵撳嵃鏈�
+                if (ctrl is UcLookPrint)
+                {
+                    var txt = ctrl as UcLookPrint;
                     txt.SetIdOrCode("-1");
                     txt.Enabled = !isEdt;
                     continue;
@@ -959,6 +1001,26 @@
                 if (ctrl is UcLookOrg)
                 {
                     var txt = ctrl as UcLookOrg;
+                    if (txt.IsReadly == false)
+                        txt.Enabled = !isEdt;
+                    else
+                        txt.Enabled = false;
+                    continue;
+                }
+                //鑷畾鐢ㄦ埛
+                if (ctrl is UcLookUser)
+                {
+                    var txt = ctrl as UcLookUser;
+                    if (txt.IsReadly == false)
+                        txt.Enabled = !isEdt;
+                    else
+                        txt.Enabled = false;
+                    continue;
+                }
+                //鑷畾鎵撳嵃
+                if (ctrl is UcLookPrint)
+                {
+                    var txt = ctrl as UcLookPrint;
                     if (txt.IsReadly == false)
                         txt.Enabled = !isEdt;
                     else
@@ -1362,8 +1424,7 @@
         /// <param name="icoName">鍥炬爣璺緞</param>
         public static void SetGridSear(GridView gridView1, PictureBox btnChkIco = null, Form fm = null, string fileName = "checkStatus", string icoName = "")
         {
-         //   gridView1.OptionsView.ColumnAutoWidth = false;鑷姩璋冩暣鍒楀
-
+            //   gridView1.OptionsView.ColumnAutoWidth = false;鑷姩璋冩暣鍒楀
             foreach (GridColumn column in gridView1.Columns)
             {
                 column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
@@ -1460,7 +1521,7 @@
             return regex.IsMatch(str);
         }
 
-      
+
 
     }
 

--
Gitblit v1.9.3