From a7feb4c13e6f83f7adf8510dc7cb5c1323c87de5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 16 一月 2025 13:36:14 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/UserControl/UcLookUser.cs | 2 +
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs | 22 +++++-----
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 4 +
DevApp/Gs.DevApp/UserControl/UcLookPrint.cs | 2 +
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs | 12 +++---
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 24 ++++++-----
DevApp/Gs.DevApp/App.config | 4 +-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 7 +++
8 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 48985a7..a645fe4 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
index 7faf962..9e52a55 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -68,7 +68,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(70, 132);
+ this.lb_remark.Location = new System.Drawing.Point(70, 129);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(40, 21);
this.lb_remark.TabIndex = 217;
@@ -76,7 +76,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(117, 132);
+ this.txt_remark.Location = new System.Drawing.Point(117, 125);
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;
@@ -101,7 +101,7 @@
//
this.lb_port.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_port.Appearance.Options.UseFont = true;
- this.lb_port.Location = new System.Drawing.Point(19, 94);
+ this.lb_port.Location = new System.Drawing.Point(19, 91);
this.lb_port.Name = "lb_port";
this.lb_port.Size = new System.Drawing.Size(91, 21);
this.lb_port.TabIndex = 216;
@@ -109,7 +109,7 @@
//
// txt_port
//
- this.txt_port.Location = new System.Drawing.Point(117, 94);
+ this.txt_port.Location = new System.Drawing.Point(117, 87);
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;
@@ -145,7 +145,7 @@
//
// txt_ip
//
- this.txt_ip.Location = new System.Drawing.Point(117, 54);
+ this.txt_ip.Location = new System.Drawing.Point(117, 50);
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;
@@ -178,7 +178,7 @@
//
// txt_printNo
//
- this.txt_printNo.Location = new System.Drawing.Point(117, 20);
+ this.txt_printNo.Location = new System.Drawing.Point(117, 16);
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;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
index 342a861..684c882 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
@@ -67,7 +67,7 @@
//
this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(32, 97);
+ this.lb_isStatus.Location = new System.Drawing.Point(44, 125);
this.lb_isStatus.Name = "lb_isStatus";
this.lb_isStatus.Size = new System.Drawing.Size(74, 21);
this.lb_isStatus.TabIndex = 222;
@@ -91,7 +91,7 @@
//
this.lb_remark1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark1.Appearance.Options.UseFont = true;
- this.lb_remark1.Location = new System.Drawing.Point(66, 131);
+ this.lb_remark1.Location = new System.Drawing.Point(78, 91);
this.lb_remark1.Name = "lb_remark1";
this.lb_remark1.Size = new System.Drawing.Size(40, 21);
this.lb_remark1.TabIndex = 216;
@@ -99,7 +99,7 @@
//
// txt_remark1
//
- this.txt_remark1.Location = new System.Drawing.Point(126, 131);
+ this.txt_remark1.Location = new System.Drawing.Point(126, 91);
this.txt_remark1.Name = "txt_remark1";
this.txt_remark1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark1.Properties.Appearance.Options.UseFont = true;
@@ -124,11 +124,11 @@
//
this.lb_printId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_printId.Appearance.Options.UseFont = true;
- this.lb_printId.Location = new System.Drawing.Point(49, 61);
+ this.lb_printId.Location = new System.Drawing.Point(44, 61);
this.lb_printId.Name = "lb_printId";
- this.lb_printId.Size = new System.Drawing.Size(57, 21);
+ this.lb_printId.Size = new System.Drawing.Size(74, 21);
this.lb_printId.TabIndex = 213;
- this.lb_printId.Text = "鎵撳嵃鏈�:";
+ this.lb_printId.Text = "閫夋墦鍗版満:";
//
// gv_printId
//
@@ -148,11 +148,11 @@
//
this.lb_userId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_userId.Appearance.Options.UseFont = true;
- this.lb_userId.Location = new System.Drawing.Point(66, 20);
+ this.lb_userId.Location = new System.Drawing.Point(44, 20);
this.lb_userId.Name = "lb_userId";
- this.lb_userId.Size = new System.Drawing.Size(40, 21);
+ this.lb_userId.Size = new System.Drawing.Size(74, 21);
this.lb_userId.TabIndex = 211;
- this.lb_userId.Text = "鐢ㄦ埛:";
+ this.lb_userId.Text = "閫夋嫨鐢ㄦ埛:";
//
// gv_userId
//
@@ -282,12 +282,12 @@
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(126, 95);
+ this.txt_isStatus.Location = new System.Drawing.Point(126, 123);
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 = "";
+ this.txt_isStatus.Tag = "moren.true";
//
// txt_printId
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index 2014572..12cd36e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -236,7 +236,8 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.user_id",
+ _sbSqlWhere += " and c.GUID is not null";
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "c.ACCOUNT",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -253,6 +254,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index dadd91c..65a6fba 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -49,7 +49,6 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_roleName = new DevExpress.XtraEditors.TextEdit();
@@ -59,6 +58,7 @@
this.lbGuid = new System.Windows.Forms.Label();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -69,6 +69,7 @@
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -256,15 +257,6 @@
this.panel1.Size = new System.Drawing.Size(507, 293);
this.panel1.TabIndex = 1;
//
- // txt_isStatus
- //
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(123, 151);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 132;
- this.txt_isStatus.UseVisualStyleBackColor = true;
- //
// labelControl1
//
this.labelControl1.Location = new System.Drawing.Point(61, 226);
@@ -360,6 +352,15 @@
this.labelControl5.TabIndex = 101;
this.labelControl5.Text = "鍚敤鐘舵�侊細";
//
+ // txt_isStatus
+ //
+ this.txt_isStatus.Location = new System.Drawing.Point(123, 148);
+ 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 = 226;
+ this.txt_isStatus.Tag = "moren.true";
+ //
// Role
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -380,6 +381,7 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -407,8 +409,8 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.Columns.GridColumn createDate;
private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy;
- private System.Windows.Forms.CheckBox txt_isStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.CheckEdit txt_isStatus;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0794fe4..3ab67e7 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -785,7 +785,12 @@
{
var txt = ctrl as CheckEdit;
txt.ReadOnly = isEdt;
- txt.Checked = false;
+ if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren"))
+ {
+ txt.Checked = bool.Parse(txt.Tag.ToString().Replace("moren.", ""));
+ }
+ else
+ txt.Checked = false;
continue;
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
index ef42a89..afe9eb4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
@@ -51,6 +51,8 @@
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "printNo";
lookSearchSupplier.Properties.ValueMember = "guid";
+ lookSearchSupplier.ForceInitialize();
+ lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
index 9ad337d..d4c968c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
@@ -44,6 +44,8 @@
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "userName";
lookSearchSupplier.Properties.ValueMember = "guid";
+ lookSearchSupplier.ForceInitialize();
+ lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
--
Gitblit v1.9.3