From e1dbb26b92643e7d78ffa8548586af38e2f1dc11 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 09 一月 2025 09:34:26 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 2 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 38 ++++++++++++++++++--------------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 18 ++----------------
3 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index e963b96..1db896b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -101,14 +101,14 @@
//
this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "渚涘簲鍟咺D";
- this.gv_suppNo.FieldName = "suppId";
+ this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
+ this.gv_suppNo.FieldName = "suppNo";
this.gv_suppNo.MinWidth = 50;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.SUPP_NO";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 5;
+ this.gv_suppNo.VisibleIndex = 4;
this.gv_suppNo.Width = 94;
//
// lb_itemId
@@ -131,8 +131,6 @@
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.ITEM_ID";
- this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 2;
this.gv_itemId.Width = 94;
//
// lb_status
@@ -172,13 +170,13 @@
//
// txt_checkDate
//
- this.txt_checkDate.Enabled = false;
this.txt_checkDate.Location = new System.Drawing.Point(431, 46);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
this.txt_checkDate.Size = new System.Drawing.Size(157, 28);
this.txt_checkDate.TabIndex = 226;
+ this.txt_checkDate.Tag = "readOnly";
//
// gv_checkDate
//
@@ -191,7 +189,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 12;
+ this.gv_checkDate.VisibleIndex = 11;
this.gv_checkDate.Width = 120;
//
// lb_checkUser
@@ -206,13 +204,13 @@
//
// txt_checkUser
//
- this.txt_checkUser.Enabled = false;
this.txt_checkUser.Location = new System.Drawing.Point(431, 8);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
this.txt_checkUser.Size = new System.Drawing.Size(157, 28);
this.txt_checkUser.TabIndex = 222;
+ this.txt_checkUser.Tag = "readOnly";
//
// gv_checkUser
//
@@ -225,7 +223,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 11;
+ this.gv_checkUser.VisibleIndex = 10;
this.gv_checkUser.Width = 94;
//
// gv_lastupdateDate
@@ -239,7 +237,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 10;
+ this.gv_lastupdateDate.VisibleIndex = 9;
this.gv_lastupdateDate.Width = 180;
//
// gv_lastupdateBy
@@ -253,7 +251,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 9;
+ this.gv_lastupdateBy.VisibleIndex = 8;
this.gv_lastupdateBy.Width = 94;
//
// gv_createDate
@@ -267,7 +265,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 8;
+ this.gv_createDate.VisibleIndex = 7;
this.gv_createDate.Width = 180;
//
// gv_createBy
@@ -281,7 +279,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 7;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 94;
//
// lb_itemNo
@@ -296,13 +294,13 @@
//
// txt_itemNo
//
- this.txt_itemNo.Enabled = false;
this.txt_itemNo.Location = new System.Drawing.Point(100, 46);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(239, 28);
this.txt_itemNo.TabIndex = 211;
+ this.txt_itemNo.Tag = "readOnly";
//
// gv_itemNo
//
@@ -315,7 +313,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.ITEM_NO";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 4;
+ this.gv_itemNo.VisibleIndex = 3;
this.gv_itemNo.Width = 94;
//
// toolBarMenu1
@@ -391,7 +389,7 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_name";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 125;
//
// gridColumn3
@@ -403,7 +401,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "d.supp_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 125;
//
// xtraTabControl1
@@ -485,13 +483,13 @@
//
// txtGysNo
//
- this.txtGysNo.Enabled = false;
this.txtGysNo.Location = new System.Drawing.Point(100, 122);
this.txtGysNo.Name = "txtGysNo";
this.txtGysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtGysNo.Properties.Appearance.Options.UseFont = true;
this.txtGysNo.Size = new System.Drawing.Size(239, 28);
this.txtGysNo.TabIndex = 240;
+ this.txtGysNo.Tag = "readOnly";
//
// txt_suppId
//
@@ -541,13 +539,13 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Enabled = false;
this.txt_lastupdateDate.Location = new System.Drawing.Point(695, 46);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
this.txt_lastupdateDate.Size = new System.Drawing.Size(157, 28);
this.txt_lastupdateDate.TabIndex = 219;
+ this.txt_lastupdateDate.Tag = "readOnly";
//
// lb_lastupdateBy
//
@@ -561,13 +559,13 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Enabled = false;
this.txt_lastupdateBy.Location = new System.Drawing.Point(695, 8);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
this.txt_lastupdateBy.Size = new System.Drawing.Size(157, 28);
this.txt_lastupdateBy.TabIndex = 217;
+ this.txt_lastupdateBy.Tag = "readOnly";
//
// picCheckBox
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 6f38134..535bc2f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -242,8 +242,8 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ _sbSqlWhere += " and b.guid is not null";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f103276..3ae35d9 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -454,14 +454,7 @@
txt.Enabled = !isEdt;
continue;
}
- //if (colType is CheckEdit)
- //{
- // var txt = colType as CheckEdit;
- // if (txt != null)
- // txt.Checked = bool.Parse(strVal);
- // txt.ReadOnly = isEdt;
- // continue;
- //}
+
//鏃堕棿
if (colType is DateTimePicker)
{
@@ -772,14 +765,7 @@
txt.ReadOnly = isEdt;
continue;
}
- if (ctrl is MemoEdit)
- {
- var txt = ctrl as MemoEdit;
- if (txt != null)
- txt.Text = "";
- txt.ReadOnly = isEdt;
- continue;
- }
+
//鏃堕棿
if (ctrl is DateTimePicker)
{
--
Gitblit v1.9.3