From 2576d7c9c25031a7478dfc4795cc1c02019f7368 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 四月 2025 16:57:53 +0800
Subject: [PATCH] 现场
---
DevApp/Gs.DevApp/Resources/zoom100_16x161.png | 0
DevApp/Gs.DevApp/DevFrm/Work/textSelect.resx | 0
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 110 ++++
DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.resx | 0
DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.Designer.cs | 179 ++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 456 +++++++++++---------
DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.cs | 97 ++++
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/textSelect.Designer.cs | 74 +++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 13
/dev/null | 68 ---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 122 ++++-
DevApp/Gs.DevApp/DevFrm/Work/textSelect.cs | 69 +++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/Properties/licenses.licx | 27
DevApp/Gs.DevApp/XtraForm1.cs | 74 +++
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx | 3
18 files changed, 968 insertions(+), 348 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index e31c7da..a05a993 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -39,7 +40,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -50,7 +50,14 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -58,17 +65,15 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.textSelect3 = new Gs.DevApp.DevFrm.Work.textSelect();
- this.textSelect2 = new Gs.DevApp.DevFrm.Work.textSelect();
- this.textSelect1 = new Gs.DevApp.DevFrm.Work.textSelect();
+ this.txt_badReson = new Gs.DevApp.DevFrm.Work.textSelect();
+ this.txt_remark = new Gs.DevApp.DevFrm.Work.textSelect();
+ this.txt_repairMethd = new Gs.DevApp.DevFrm.Work.textSelect();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_gx = new DevExpress.XtraEditors.TextEdit();
this.txt_czz = new DevExpress.XtraEditors.TextEdit();
this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
- this.txt_gwm = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_bc = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_sjXt = new DevExpress.XtraEditors.TextEdit();
@@ -83,13 +88,11 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
@@ -141,6 +144,7 @@
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -172,9 +176,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit();
@@ -189,13 +191,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit();
this.panel2.SuspendLayout();
@@ -288,7 +288,14 @@
this.gv_userName,
this.gv_operationTable,
this.gridColumn1,
- this.gv_msg});
+ this.gridColumn22,
+ this.gridColumn11,
+ this.gridColumn13,
+ this.gridColumn18,
+ this.gridColumn19,
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn23});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -298,8 +305,8 @@
// gv_operationTime
//
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
- this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
- this.gv_operationTime.FieldName = "operationTime";
+ this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
+ this.gv_operationTime.FieldName = "sjXt";
this.gv_operationTime.Name = "gv_operationTime";
this.gv_operationTime.OptionsColumn.AllowEdit = false;
this.gv_operationTime.Tag = "query_OPERATION_TIME";
@@ -310,8 +317,8 @@
// gv_userName
//
this.gv_userName.AppearanceCell.Options.UseFont = true;
- this.gv_userName.Caption = "鎿嶄綔浜哄憳";
- this.gv_userName.FieldName = "userName";
+ this.gv_userName.Caption = "鐢熶骇鐘舵��";
+ this.gv_userName.FieldName = "daaStatus";
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
@@ -322,35 +329,104 @@
// gv_operationTable
//
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
- this.gv_operationTable.Caption = "鐩稿叧琛�";
- this.gv_operationTable.FieldName = "operationTable";
+ this.gv_operationTable.Caption = "宸ュ崟鍙�";
+ this.gv_operationTable.FieldName = "daaNo";
this.gv_operationTable.Name = "gv_operationTable";
this.gv_operationTable.OptionsColumn.AllowEdit = false;
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 2;
this.gv_operationTable.Width = 100;
//
// gridColumn1
//
- this.gridColumn1.Caption = "鐩稿叧鍗曞彿";
- this.gridColumn1.FieldName = "abtHno";
+ this.gridColumn1.Caption = "寮傚父鎻愪氦鏃ユ湡";
+ this.gridColumn1.FieldName = "createDate";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 94;
//
- // gv_msg
+ // gridColumn22
//
- this.gv_msg.AppearanceCell.Options.UseFont = true;
- this.gv_msg.Caption = "鎿嶄綔璇︽儏";
- this.gv_msg.FieldName = "msg";
- this.gv_msg.MaxWidth = 800;
- this.gv_msg.Name = "gv_msg";
- this.gv_msg.OptionsColumn.AllowEdit = false;
- this.gv_msg.Tag = "query_MSG";
- this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 3;
- this.gv_msg.Width = 20;
+ this.gridColumn22.Caption = "浜у搧ID";
+ this.gridColumn22.FieldName = "itemId";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 4;
+ this.gridColumn22.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "浜у搧缂栫爜";
+ this.gridColumn11.FieldName = "itemNo";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 5;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "浜у搧鍚嶇О";
+ this.gridColumn13.FieldName = "itemName";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 6;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "浜у搧瑙勬牸";
+ this.gridColumn18.FieldName = "itemModel";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 7;
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "棰勮浜ч噺";
+ this.gridColumn19.FieldName = "daaCl";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 8;
+ this.gridColumn19.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "棰勮寮�宸ユ棩";
+ this.gridColumn20.FieldName = "mesStartProd";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 9;
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "涓嶈壇澶囨敞";
+ this.gridColumn21.FieldName = "remark";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 10;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "宸ュ簭鐐�";
+ this.gridColumn23.FieldName = "processNo";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 11;
+ this.gridColumn23.Width = 94;
//
// repositoryItemMemoEdit1
//
@@ -397,7 +473,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1251, 570);
- this.splitMx1.SplitterPosition = 245;
+ this.splitMx1.SplitterPosition = 220;
this.splitMx1.TabIndex = 1;
//
// splitTop1
@@ -427,23 +503,21 @@
this.splitTop1.Panel2.Controls.Add(this.btnBad);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1251, 245);
+ this.splitTop1.Size = new System.Drawing.Size(1251, 220);
this.splitTop1.SplitterPosition = 390;
this.splitTop1.TabIndex = 0;
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.textSelect3);
- this.layoutMx1.Controls.Add(this.textSelect2);
- this.layoutMx1.Controls.Add(this.textSelect1);
+ this.layoutMx1.Controls.Add(this.txt_badReson);
+ this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_repairMethd);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_gx);
this.layoutMx1.Controls.Add(this.txt_czz);
this.layoutMx1.Controls.Add(this.txt_barCode);
- this.layoutMx1.Controls.Add(this.txt_gwm);
this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Controls.Add(this.txt_bc);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_sjXt);
@@ -456,33 +530,37 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(849, 245);
+ this.layoutMx1.Size = new System.Drawing.Size(849, 220);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
- // textSelect3
+ // txt_badReson
//
- this.textSelect3.BtnTxt = "涓嶈壇鍘熷洜";
- this.textSelect3.Location = new System.Drawing.Point(12, 180);
- this.textSelect3.Name = "textSelect3";
- this.textSelect3.Size = new System.Drawing.Size(410, 53);
- this.textSelect3.TabIndex = 26;
+ this.txt_badReson.BtnTxt = "涓嶈壇鍘熷洜";
+ this.txt_badReson.Location = new System.Drawing.Point(12, 154);
+ this.txt_badReson.Name = "txt_badReson";
+ this.txt_badReson.Size = new System.Drawing.Size(410, 54);
+ this.txt_badReson.TabIndex = 26;
+ this.txt_badReson.TextTxt = "";
//
- // textSelect2
+ // txt_remark
//
- this.textSelect2.BtnTxt = "涓嶈壇鐜板儚";
- this.textSelect2.Location = new System.Drawing.Point(12, 124);
- this.textSelect2.Name = "textSelect2";
- this.textSelect2.Size = new System.Drawing.Size(410, 52);
- this.textSelect2.TabIndex = 25;
+ this.txt_remark.BtnTxt = "涓嶈壇鐜板儚";
+ this.txt_remark.Location = new System.Drawing.Point(12, 96);
+ this.txt_remark.Name = "txt_remark";
+ this.txt_remark.Size = new System.Drawing.Size(410, 54);
+ this.txt_remark.TabIndex = 25;
+ this.txt_remark.TextTxt = "";
//
- // textSelect1
+ // txt_repairMethd
//
- this.textSelect1.BtnTxt = "涓嶈壇瀵圭瓥";
- this.textSelect1.Location = new System.Drawing.Point(426, 124);
- this.textSelect1.Name = "textSelect1";
- this.textSelect1.Size = new System.Drawing.Size(411, 109);
- this.textSelect1.TabIndex = 24;
+ this.txt_repairMethd.BtnTxt = "涓嶈壇瀵圭瓥";
+ this.txt_repairMethd.Location = new System.Drawing.Point(426, 96);
+ this.txt_repairMethd.Name = "txt_repairMethd";
+ this.txt_repairMethd.Size = new System.Drawing.Size(411, 112);
+ this.txt_repairMethd.TabIndex = 24;
+ this.txt_repairMethd.TextTxt = "";
+
//
// lbGuid
//
@@ -503,7 +581,7 @@
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(84, 68);
+ this.txt_gx.Location = new System.Drawing.Point(498, 68);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
this.txt_gx.Size = new System.Drawing.Size(131, 24);
@@ -512,29 +590,20 @@
//
// txt_czz
//
- this.txt_czz.Location = new System.Drawing.Point(291, 12);
+ this.txt_czz.Location = new System.Drawing.Point(705, 68);
this.txt_czz.Name = "txt_czz";
this.txt_czz.Properties.ReadOnly = true;
- this.txt_czz.Size = new System.Drawing.Size(131, 24);
+ this.txt_czz.Size = new System.Drawing.Size(132, 24);
this.txt_czz.StyleController = this.layoutMx1;
this.txt_czz.TabIndex = 6;
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(84, 96);
+ this.txt_barCode.Location = new System.Drawing.Point(84, 68);
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Size = new System.Drawing.Size(338, 24);
this.txt_barCode.StyleController = this.layoutMx1;
this.txt_barCode.TabIndex = 7;
- //
- // txt_gwm
- //
- this.txt_gwm.Location = new System.Drawing.Point(705, 68);
- this.txt_gwm.Name = "txt_gwm";
- this.txt_gwm.Properties.ReadOnly = true;
- this.txt_gwm.Size = new System.Drawing.Size(132, 24);
- this.txt_gwm.StyleController = this.layoutMx1;
- this.txt_gwm.TabIndex = 9;
//
// txt_itemNo
//
@@ -544,15 +613,6 @@
this.txt_itemNo.Size = new System.Drawing.Size(131, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 10;
- //
- // txt_bc
- //
- this.txt_bc.Location = new System.Drawing.Point(705, 12);
- this.txt_bc.Name = "txt_bc";
- this.txt_bc.Properties.ReadOnly = true;
- this.txt_bc.Size = new System.Drawing.Size(132, 24);
- this.txt_bc.StyleController = this.layoutMx1;
- this.txt_bc.TabIndex = 11;
//
// txt_itemName
//
@@ -574,7 +634,7 @@
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(498, 12);
+ this.txt_sjXt.Location = new System.Drawing.Point(291, 12);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
this.txt_sjXt.Size = new System.Drawing.Size(131, 24);
@@ -583,7 +643,7 @@
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(291, 68);
+ this.txt_yjDate.Location = new System.Drawing.Point(498, 12);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
this.txt_yjDate.Size = new System.Drawing.Size(131, 24);
@@ -592,10 +652,10 @@
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(498, 68);
+ this.txt_sjDate.Location = new System.Drawing.Point(705, 12);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
- this.txt_sjDate.Size = new System.Drawing.Size(131, 24);
+ this.txt_sjDate.Size = new System.Drawing.Size(132, 24);
this.txt_sjDate.StyleController = this.layoutMx1;
this.txt_sjDate.TabIndex = 18;
//
@@ -622,13 +682,11 @@
this.layoutControlItem7,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem14,
- this.layoutControlItem15,
- this.layoutControlItem6,
this.layoutControlItem9,
- this.layoutControlItem8,
this.layoutControlItem2,
this.layoutControlItem13,
+ this.layoutControlItem14,
+ this.layoutControlItem15,
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -659,8 +717,6 @@
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition7.Height = 100D;
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -668,9 +724,8 @@
rowDefinition4,
rowDefinition5,
rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(849, 245);
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(849, 220);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -685,37 +740,37 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_barCode;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem4.Size = new System.Drawing.Size(414, 28);
this.layoutControlItem4.Text = "鎵拷婧爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
- this.layoutControlItem18.Control = this.textSelect1;
- this.layoutControlItem18.Location = new System.Drawing.Point(414, 112);
+ this.layoutControlItem18.Control = this.txt_repairMethd;
+ this.layoutControlItem18.Location = new System.Drawing.Point(414, 84);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(415, 113);
+ this.layoutControlItem18.Size = new System.Drawing.Size(415, 116);
this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
//
// layoutControlItem16
//
- this.layoutControlItem16.Control = this.textSelect2;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem16.Control = this.txt_remark;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(414, 56);
+ this.layoutControlItem16.Size = new System.Drawing.Size(414, 58);
this.layoutControlItem16.Text = "涓嶈壇鐜板儚";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
@@ -753,13 +808,46 @@
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_badReson;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 142);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(414, 58);
+ this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_gx;
+ this.layoutControlItem2.Location = new System.Drawing.Point(414, 56);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(207, 28);
+ this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_sjXt;
+ this.layoutControlItem13.Location = new System.Drawing.Point(207, 0);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.Size = new System.Drawing.Size(207, 28);
+ this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_yjDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(207, 56);
+ this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.Size = new System.Drawing.Size(207, 28);
this.layoutControlItem14.Text = "璁″垝鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
@@ -767,83 +855,29 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_sjDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(414, 56);
+ this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(207, 28);
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(208, 28);
this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_gwm;
- this.layoutControlItem6.Location = new System.Drawing.Point(621, 56);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(208, 28);
- this.layoutControlItem6.Text = "閫佷慨宀椾綅";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.textSelect3;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 168);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(414, 57);
- this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_bc;
- this.layoutControlItem8.Location = new System.Drawing.Point(621, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(208, 28);
- this.layoutControlItem8.Text = "鐝";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_gx;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(207, 28);
- this.layoutControlItem2.Text = "鎿嶄綔宸ュ簭";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_sjXt;
- this.layoutControlItem13.Location = new System.Drawing.Point(414, 0);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(207, 28);
- this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_czz;
- this.layoutControlItem3.Location = new System.Drawing.Point(207, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(621, 56);
this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(207, 28);
- this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(208, 28);
+ this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton7.Appearance.Options.UseBackColor = true;
- this.simpleButton7.Location = new System.Drawing.Point(95, 117);
+ this.simpleButton7.Location = new System.Drawing.Point(95, 109);
this.simpleButton7.Name = "simpleButton7";
this.simpleButton7.Size = new System.Drawing.Size(61, 43);
this.simpleButton7.TabIndex = 10;
@@ -853,7 +887,7 @@
//
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton6.Appearance.Options.UseBackColor = true;
- this.simpleButton6.Location = new System.Drawing.Point(317, 118);
+ this.simpleButton6.Location = new System.Drawing.Point(317, 110);
this.simpleButton6.Name = "simpleButton6";
this.simpleButton6.Size = new System.Drawing.Size(61, 43);
this.simpleButton6.TabIndex = 9;
@@ -863,7 +897,7 @@
//
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton5.Appearance.Options.UseBackColor = true;
- this.simpleButton5.Location = new System.Drawing.Point(169, 117);
+ this.simpleButton5.Location = new System.Drawing.Point(169, 109);
this.simpleButton5.Name = "simpleButton5";
this.simpleButton5.Size = new System.Drawing.Size(61, 43);
this.simpleButton5.TabIndex = 8;
@@ -873,7 +907,7 @@
//
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton4.Appearance.Options.UseBackColor = true;
- this.simpleButton4.Location = new System.Drawing.Point(243, 117);
+ this.simpleButton4.Location = new System.Drawing.Point(243, 109);
this.simpleButton4.Name = "simpleButton4";
this.simpleButton4.Size = new System.Drawing.Size(61, 43);
this.simpleButton4.TabIndex = 7;
@@ -883,7 +917,7 @@
//
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton3.Appearance.Options.UseBackColor = true;
- this.simpleButton3.Location = new System.Drawing.Point(21, 117);
+ this.simpleButton3.Location = new System.Drawing.Point(21, 109);
this.simpleButton3.Name = "simpleButton3";
this.simpleButton3.Size = new System.Drawing.Size(61, 43);
this.simpleButton3.TabIndex = 6;
@@ -891,7 +925,7 @@
//
// progressBarControl1
//
- this.progressBarControl1.Location = new System.Drawing.Point(21, 87);
+ this.progressBarControl1.Location = new System.Drawing.Point(21, 79);
this.progressBarControl1.Name = "progressBarControl1";
this.progressBarControl1.Size = new System.Drawing.Size(359, 22);
this.progressBarControl1.TabIndex = 5;
@@ -903,13 +937,13 @@
this.panel2.Controls.Add(this.label4);
this.panel2.Location = new System.Drawing.Point(281, 7);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(99, 71);
+ this.panel2.Size = new System.Drawing.Size(99, 64);
this.panel2.TabIndex = 3;
//
// lbSum3
//
this.lbSum3.AutoSize = true;
- this.lbSum3.Location = new System.Drawing.Point(45, 46);
+ this.lbSum3.Location = new System.Drawing.Point(45, 37);
this.lbSum3.Name = "lbSum3";
this.lbSum3.Size = new System.Drawing.Size(16, 18);
this.lbSum3.TabIndex = 1;
@@ -931,13 +965,13 @@
this.panel4.Controls.Add(this.label8);
this.panel4.Location = new System.Drawing.Point(151, 7);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(99, 71);
+ this.panel4.Size = new System.Drawing.Size(99, 64);
this.panel4.TabIndex = 2;
//
// lbSum2
//
this.lbSum2.AutoSize = true;
- this.lbSum2.Location = new System.Drawing.Point(45, 46);
+ this.lbSum2.Location = new System.Drawing.Point(45, 37);
this.lbSum2.Name = "lbSum2";
this.lbSum2.Size = new System.Drawing.Size(16, 18);
this.lbSum2.TabIndex = 1;
@@ -959,13 +993,13 @@
this.panel1.Controls.Add(this.label1);
this.panel1.Location = new System.Drawing.Point(21, 7);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(99, 71);
+ this.panel1.Size = new System.Drawing.Size(99, 64);
this.panel1.TabIndex = 0;
//
// lbSum1
//
this.lbSum1.AutoSize = true;
- this.lbSum1.Location = new System.Drawing.Point(45, 46);
+ this.lbSum1.Location = new System.Drawing.Point(45, 37);
this.lbSum1.Name = "lbSum1";
this.lbSum1.Size = new System.Drawing.Size(16, 18);
this.lbSum1.TabIndex = 1;
@@ -984,9 +1018,9 @@
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(21, 167);
+ this.btnGood.Location = new System.Drawing.Point(21, 159);
this.btnGood.Name = "btnGood";
- this.btnGood.Size = new System.Drawing.Size(166, 75);
+ this.btnGood.Size = new System.Drawing.Size(166, 58);
this.btnGood.TabIndex = 19;
this.btnGood.Text = "OK";
//
@@ -994,9 +1028,9 @@
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(212, 167);
+ this.btnBad.Location = new System.Drawing.Point(212, 159);
this.btnBad.Name = "btnBad";
- this.btnBad.Size = new System.Drawing.Size(166, 75);
+ this.btnBad.Size = new System.Drawing.Size(166, 58);
this.btnBad.TabIndex = 20;
this.btnBad.Text = "NG";
//
@@ -1006,7 +1040,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1251, 313);
+ this.tabMx.Size = new System.Drawing.Size(1251, 338);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1016,7 +1050,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1249, 281);
+ this.tabMxPage1.Size = new System.Drawing.Size(1249, 306);
this.tabMxPage1.Text = "宸蹭慨鐞嗘槑缁�";
//
// gcMx1
@@ -1025,7 +1059,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1249, 281);
+ this.gcMx1.Size = new System.Drawing.Size(1249, 306);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1195,7 +1229,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1249, 281);
+ this.tabMxPage2.Size = new System.Drawing.Size(1249, 306);
this.tabMxPage2.Text = "鏈慨鐞嗘槑缁�";
//
// gcMx2
@@ -1204,7 +1238,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1249, 281);
+ this.gcMx2.Size = new System.Drawing.Size(1249, 306);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1408,9 +1442,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit();
@@ -1425,13 +1457,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit();
this.panel2.ResumeLayout(false);
@@ -1462,7 +1492,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
private UserControls.Data.UcPageBar pageBar1;
@@ -1474,9 +1503,7 @@
private DevExpress.XtraEditors.TextEdit txt_gx;
private DevExpress.XtraEditors.TextEdit txt_czz;
private DevExpress.XtraEditors.TextEdit txt_barCode;
- private DevExpress.XtraEditors.TextEdit txt_gwm;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraEditors.TextEdit txt_bc;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraEditors.TextEdit txt_sjXt;
@@ -1537,21 +1564,28 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private textSelect textSelect1;
+ private textSelect txt_repairMethd;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private textSelect textSelect3;
- private textSelect textSelect2;
+ private textSelect txt_badReson;
+ private textSelect txt_remark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraBars.Alerter.AlertControl alertControl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 008ed43..32bfb97 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -1,16 +1,11 @@
-锘縰sing DevExpress.Utils.Extensions;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -18,7 +13,7 @@
{
public partial class Frm_Repair : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "SysLog/";
+ string _webServiceName = "WorkRepair/";
private List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_Repair()
{
@@ -32,23 +27,27 @@
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
- getModel(value);
+ txt_barCode.Text = "";
+ getModel(value, "", "","","");
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
});
- getPageList(1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
- Button button1 = new Button();
- button1.Text = "Button 1";
- Button button2 = new Button();
- button2.Text = "Button 2";
- layoutControlItem16.Control.AddControl(button1);
- layoutControlItem16.Control.AddControl(button2);
+ txt_barCode.Focus();
+ txt_barCode.KeyDown += (s, e) =>
+ {
+ if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "","","",""); };
+ };
+ btnGood.Click += (s, e) =>
+ {
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "鈭�");
+ };
+ btnBad.Click += (s, e) => {
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "脳");
+ };
}
-
-
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -99,7 +98,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
+ getModel(lbGuid.Text.Trim(), "", "","","");
else
{
//_filterList.Clear();
@@ -122,7 +121,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME", "desc,ABT_HNO desc", "", _sbSqlWhere.ToString());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -156,19 +155,25 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
- private void getModel(string strGuid)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="strGuid"></param>
+ /// <param name="_badXx"></param>
+ /// <param name="_badYy"></param>
+ /// <param name="_badDc"></param>
+ /// <param name="_checkResult"></param>
+ private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
- bool isEdit = false;
- if (toolBarMenu1.currentAction == "add") return;
- if (toolBarMenu1.currentAction == "edit") isEdit = true;
- if (string.IsNullOrEmpty(strGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ string _barCode = txt_barCode.Text.Trim();
var _obj = new
{
guid = strGuid,//涓诲缓
+ barCode = _barCode,
+ badXx = _badXx,//涓嶈壇鐜板儚
+ badYy = _badYy, //涓嶈壇鍘熷洜
+ badDc = _badDc, //涓嶈壇瀵圭瓥
+ checkResult = _checkResult, //妫�娴嬬粨鏋�
};
try
{
@@ -178,15 +183,66 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
+ txt_barCode.ReadOnly = false;
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+ string _msg = _rtn.rtnMsg;
+ if (!string.IsNullOrEmpty(_msg))
+ {
+ //璁剧疆鍗曠獥鍙ｅ嚭鐜板脊鍑虹殑閫熷害
+ this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
+ //璁剧疆鏄剧ず澶氬皯鏃堕棿绐楀彛浼氳嚜鍔ㄥ叧闂� 浠ユ绉掍负鍗曚綅
+ this.alertControl1.AutoFormDelay = 3000;
+ //璁剧疆鎻愬嚭绐楀彛鐨勬樉绀虹殑浣嶇疆
+ this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.BottomLeft;
+ this.alertControl1.Show(this, "鎻愮ず!", _msg);
+ };
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
index 1af7de1..fc44dd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.Designer.cs
new file mode 100644
index 0000000..8dd0c86
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.Designer.cs
@@ -0,0 +1,179 @@
+锘縩amespace Gs.DevApp.DevFrm.Work
+{
+ partial class SelectDictionary
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.tlMenu = new DevExpress.XtraTreeList.TreeList();
+ this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcParentMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // tlMenu
+ //
+ this.tlMenu.Appearance.Row.Options.UseFont = true;
+ this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+ this.tlcModuleID,
+ this.tlcMenuName,
+ this.tlcMenuCaption,
+ this.tlcActions,
+ this.tlcParentMenuName,
+ this.tlcMenuType});
+ this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
+ this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tlMenu.Location = new System.Drawing.Point(0, 0);
+ this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tlMenu.MinWidth = 23;
+ this.tlMenu.Name = "tlMenu";
+ this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
+ this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.None;
+ this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
+ this.tlMenu.Size = new System.Drawing.Size(561, 464);
+ this.tlMenu.TabIndex = 5;
+ this.tlMenu.TreeLevelWidth = 21;
+ //
+ // tlcModuleID
+ //
+ this.tlcModuleID.Caption = "guid";
+ this.tlcModuleID.FieldName = "guid";
+ this.tlcModuleID.MinWidth = 23;
+ this.tlcModuleID.Name = "tlcModuleID";
+ this.tlcModuleID.Visible = true;
+ this.tlcModuleID.VisibleIndex = 0;
+ this.tlcModuleID.Width = 103;
+ //
+ // tlcMenuName
+ //
+ this.tlcMenuName.Caption = "鑿滃崟鍚嶇О";
+ this.tlcMenuName.FieldName = "name";
+ this.tlcMenuName.MinWidth = 38;
+ this.tlcMenuName.Name = "tlcMenuName";
+ this.tlcMenuName.Visible = true;
+ this.tlcMenuName.VisibleIndex = 1;
+ this.tlcMenuName.Width = 215;
+ //
+ // tlcMenuCaption
+ //
+ this.tlcMenuCaption.Caption = "鑿滃崟璺緞";
+ this.tlcMenuCaption.FieldName = "formPath";
+ this.tlcMenuCaption.MinWidth = 23;
+ this.tlcMenuCaption.Name = "tlcMenuCaption";
+ this.tlcMenuCaption.Visible = true;
+ this.tlcMenuCaption.VisibleIndex = 2;
+ this.tlcMenuCaption.Width = 139;
+ //
+ // tlcActions
+ //
+ this.tlcActions.Caption = "鑿滃崟绫诲瀷";
+ this.tlcActions.FieldName = "category";
+ this.tlcActions.MinWidth = 23;
+ this.tlcActions.Name = "tlcActions";
+ this.tlcActions.Visible = true;
+ this.tlcActions.VisibleIndex = 3;
+ this.tlcActions.Width = 50;
+ //
+ // tlcParentMenuName
+ //
+ this.tlcParentMenuName.Caption = "鐘舵��";
+ this.tlcParentMenuName.FieldName = "isStatus";
+ this.tlcParentMenuName.MinWidth = 23;
+ this.tlcParentMenuName.Name = "tlcParentMenuName";
+ this.tlcParentMenuName.Visible = true;
+ this.tlcParentMenuName.VisibleIndex = 4;
+ this.tlcParentMenuName.Width = 64;
+ //
+ // tlcMenuType
+ //
+ this.tlcMenuType.Caption = "鎺掑簭鍙�";
+ this.tlcMenuType.FieldName = "idx";
+ this.tlcMenuType.MinWidth = 23;
+ this.tlcMenuType.Name = "tlcMenuType";
+ this.tlcMenuType.Visible = true;
+ this.tlcMenuType.VisibleIndex = 5;
+ this.tlcMenuType.Width = 50;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnIn);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 464);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(561, 56);
+ this.panel1.TabIndex = 6;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnIn.Location = new System.Drawing.Point(467, 0);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 56);
+ this.btnIn.TabIndex = 5;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // SelectDictionary
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(561, 520);
+ this.Controls.Add(this.tlMenu);
+ this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectDictionary";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "璇烽�夋嫨";
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraTreeList.TreeList tlMenu;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcModuleID;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcParentMenuName;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuType;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.cs
new file mode 100644
index 0000000..82d7a24
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.cs
@@ -0,0 +1,97 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraTreeList;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+
+namespace Gs.DevApp.DevFrm.Work
+{
+ public partial class SelectDictionary : DevExpress.XtraEditors.XtraForm
+ {
+ string strTitle = "";
+ string strWhere = "";
+ public SelectDictionary(string _strTitle, string _strWhere)
+ {
+ InitializeComponent();
+ tlMenu.CustomDrawNodeCheckBox += TreeList1_CustomDrawNodeCheckBox;
+ getTree();
+ tlMenu.OptionsBehavior.Editable = true;
+ tlMenu.OptionsSelection.EnableAppearanceFocusedCell = false;
+ tlMenu.OptionsSelection.MultiSelect = true;
+ tlMenu.OptionsSelection.MultiSelectMode = TreeListMultiSelectMode.CellSelect;
+ this.strTitle = _strTitle;
+ this.strWhere = _strWhere;
+ this.Text = _strTitle;
+
+ btnIn.Click += (s, e) =>
+ {
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ dicCode = "001",
+ dicTxt = "test1"
+ });
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+
+ private void TreeList1_CustomDrawNodeCheckBox(object sender, DevExpress.XtraTreeList.CustomDrawNodeCheckBoxEventArgs e)
+ {
+ // 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓哄彾瀛愯妭鐐癸紙鏃犲瓙鑺傜偣锛�
+ if (e.Node.Nodes.Count == 0)
+ {
+ // 鍏佽缁樺埗澶嶉�夋锛堥粯璁よ涓猴級
+ }
+ else
+ {
+ // 鍙栨秷缁樺埗澶嶉�夋
+ e.Handled = true;
+ }
+ }
+
+ // 鍙�夛細澶勭悊鑺傜偣灞曞紑浜嬩欢锛岀‘淇濆姩鎬佸姞杞界殑瀛愯妭鐐圭敓鏁�
+ private void treeList1_BeforeExpand(object sender, BeforeExpandEventArgs e)
+ {
+ // 鑻ュ瓙鑺傜偣鏄姩鎬佸姞杞界殑锛屽湪姝ゅ鍔犺浇鏁版嵁
+ // LoadChildNodes(e.Node);
+ }
+ /// <summary>
+ /// 璇诲彇鍒楄〃
+ /// </summary>
+ private void getTree()
+ {
+ var pgq = new PageQueryModel(1, 999999, "a.idx");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ tlMenu.DataSource = dt;
+ tlMenu.KeyFieldName = "guid";
+ tlMenu.ParentFieldName = "upGuid";
+ tlMenu.Tag = "name";
+ tlMenu.EndUpdate();
+ this.tlMenu.CollapseAll();
+ // tlMenu.OptionsBehavior.Editable = true;
+ tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.resx b/DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.resx
similarity index 100%
copy from DevApp/Gs.DevApp/DevFrm/XtraForm2.resx
copy to DevApp/Gs.DevApp/DevFrm/Work/SelectDictionary.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/textSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/textSelect.Designer.cs
new file mode 100644
index 0000000..faff3af
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Work/textSelect.Designer.cs
@@ -0,0 +1,74 @@
+锘縩amespace Gs.DevApp.DevFrm.Work
+{
+ partial class textSelect
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.memoEdit1 = new DevExpress.XtraEditors.MemoEdit();
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.memoEdit1.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // memoEdit1
+ //
+ this.memoEdit1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.memoEdit1.Location = new System.Drawing.Point(67, 0);
+ this.memoEdit1.Name = "memoEdit1";
+ this.memoEdit1.Size = new System.Drawing.Size(399, 115);
+ this.memoEdit1.TabIndex = 0;
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x161;
+ this.simpleButton1.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
+ this.simpleButton1.Location = new System.Drawing.Point(0, 0);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(67, 115);
+ this.simpleButton1.TabIndex = 1;
+ this.simpleButton1.Text = "涓嶈壇瀵圭瓥";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ //
+ // textSelect
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.memoEdit1);
+ this.Controls.Add(this.simpleButton1);
+ this.Name = "textSelect";
+ this.Size = new System.Drawing.Size(466, 115);
+ ((System.ComponentModel.ISupportInitialize)(this.memoEdit1.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.MemoEdit memoEdit1;
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/textSelect.cs b/DevApp/Gs.DevApp/DevFrm/Work/textSelect.cs
new file mode 100644
index 0000000..f71be29
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Work/textSelect.cs
@@ -0,0 +1,69 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Work
+{
+ public partial class textSelect : DevExpress.XtraEditors.XtraUserControl
+ {
+ public textSelect()
+ {
+ InitializeComponent();
+ }
+
+
+
+ /// <summary>
+ /// 鎬昏褰曟暟
+ /// </summary>
+ public string BtnTxt
+ {
+ get { return this.simpleButton1.Text.Trim(); }
+ set
+ {
+ this.simpleButton1.Text = value;
+ }
+ }
+
+
+ /// <summary>
+ /// 鎬昏褰曟暟
+ /// </summary>
+ public string TextTxt
+ {
+ get { return memoEdit1.Text.Trim(); }
+ set
+ {
+ this.memoEdit1.Text = value;
+ }
+ }
+
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ SelectDictionary frm = new SelectDictionary(this.BtnTxt, "");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ this.TextTxt = stringBuilder.ToString();
+ };
+ frm.ShowDialog();
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.resx b/DevApp/Gs.DevApp/DevFrm/Work/textSelect.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/XtraForm2.resx
rename to DevApp/Gs.DevApp/DevFrm/Work/textSelect.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
deleted file mode 100644
index eb6b4af..0000000
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm
-{
- partial class XtraForm2
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.gcMain1 = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- this.SuspendLayout();
- //
- // panelControl1
- //
- this.panelControl1.Controls.Add(this.labelControl3);
- this.panelControl1.Controls.Add(this.labelControl2);
- this.panelControl1.Controls.Add(this.labelControl1);
- this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelControl1.Location = new System.Drawing.Point(0, 0);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1046, 59);
- this.panelControl1.TabIndex = 0;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(88, 12);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(30, 18);
- this.labelControl1.TabIndex = 0;
- this.labelControl1.Text = "浣犲ソ";
- //
- // gcMain1
- //
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Location = new System.Drawing.Point(0, 0);
- this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1044, 563);
- this.gcMain1.TabIndex = 1;
- this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.GridControl = this.gcMain1;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsView.RowAutoHeight = true;
- this.gridView1.RowHeight = 50;
- //
- // labelControl2
- //
- this.labelControl2.Location = new System.Drawing.Point(217, 12);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(112, 18);
- this.labelControl2.TabIndex = 1;
- this.labelControl2.Text = "浣犲ソ锛宧ello锛�123";
- //
- // labelControl3
- //
- this.labelControl3.Location = new System.Drawing.Point(412, 13);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(24, 18);
- this.labelControl3.TabIndex = 2;
- this.labelControl3.Text = "123";
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 59);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1046, 595);
- this.xtraTabControl1.TabIndex = 2;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1044, 563);
- this.xtraTabPage1.Text = "xtraTabPage1";
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(298, 268);
- this.xtraTabPage2.Text = "xtraTabPage2";
- //
- // XtraForm2
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1046, 654);
- this.Controls.Add(this.xtraTabControl1);
- this.Controls.Add(this.panelControl1);
- this.Name = "XtraForm2";
- this.Text = "XtraForm2";
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
- this.panelControl1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraGrid.GridControl gcMain1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
deleted file mode 100644
index d78979b..0000000
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-
-namespace Gs.DevApp.DevFrm
-{
- public partial class XtraForm2 : DevExpress.XtraEditors.XtraForm
- {
- private readonly string _webServiceName = "MesItemsManager/";
- public XtraForm2()
- {
- InitializeComponent();
- gridView1.RowHeight = 50; // 鎮ㄥ彲浠ユ牴鎹渶瑕佽皟鏁磋繖涓��
- gridView1.OptionsView.RowAutoHeight = true;
- getPageList(1);
- }
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
-
- var pgq = new PageQueryModel(curPage,999999, "doc_Code");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- "DocNoRule/GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain1.BindingContext = new BindingContext();
-
- if (dt.Rows.Count > 0)
- {
- gcMain1.DataSource = dt;
- gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain1, gridView1);
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7e6d943..14ee3eb 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -743,6 +743,12 @@
<Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Work\SelectDictionary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\SelectDictionary.Designer.cs">
+ <DependentUpon>SelectDictionary.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\SelectProcess.cs">
<SubType>Form</SubType>
</Compile>
@@ -856,12 +862,6 @@
</Compile>
<Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
<DependentUpon>WwBlclDj.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\XtraForm2.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\XtraForm2.Designer.cs">
- <DependentUpon>XtraForm2.cs</DependentUpon>
</Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
@@ -1408,6 +1408,9 @@
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\SelectDictionary.resx">
+ <DependentUpon>SelectDictionary.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\SelectProcess.resx">
<DependentUpon>SelectProcess.cs</DependentUpon>
</EmbeddedResource>
@@ -1464,9 +1467,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
<DependentUpon>WwBlclDj.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\XtraForm2.resx">
- <DependentUpon>XtraForm2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 79509cc..b0361c8 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -39,10 +39,10 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(RibbonForm1());
+ //Application.Run(new XtraForm1());
//return;
-
+
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index d499cde..b7a26fc 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,18 +1,21 @@
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/Resources/zoom100_16x161.png b/DevApp/Gs.DevApp/Resources/zoom100_16x161.png
new file mode 100644
index 0000000..5cd84ec
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/zoom100_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e2dae72..9d365b1 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -22,6 +22,7 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraTab;
using DevExpress.XtraTreeList;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -668,6 +669,18 @@
txt.Enabled = !isEdt;
continue;
}
+
+ //鑷畾涓嶈壇
+ if (colType is textSelect)
+ {
+ var txt = colType as textSelect;
+ txt.TextTxt=(strVal);
+ //if (txt.IsReadly == false)
+ // txt.Enabled = !isEdt;
+ //else
+ // txt.Enabled = false;
+ continue;
+ }
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index feb746a..66d5c5b 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -112,8 +112,6 @@
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
}
-
-
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index 0df2520..a8e7467 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -28,32 +28,120 @@
/// </summary>
private void InitializeComponent()
{
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.tlMenu = new DevExpress.XtraTreeList.TreeList();
+ this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcParentMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
this.SuspendLayout();
//
- // simpleButton1
+ // tlMenu
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
- this.simpleButton1.Location = new System.Drawing.Point(343, 110);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(247, 29);
- this.simpleButton1.TabIndex = 0;
- this.simpleButton1.Text = "simpleButton1";
+ this.tlMenu.Appearance.Row.Options.UseFont = true;
+ this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+ this.tlcModuleID,
+ this.tlcMenuName,
+ this.tlcMenuCaption,
+ this.tlcActions,
+ this.tlcParentMenuName,
+ this.tlcMenuType});
+ this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
+ this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tlMenu.Location = new System.Drawing.Point(0, 0);
+ this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tlMenu.MinWidth = 23;
+ this.tlMenu.Name = "tlMenu";
+ this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
+ this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.None;
+ this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
+ this.tlMenu.Size = new System.Drawing.Size(887, 659);
+ this.tlMenu.TabIndex = 4;
+ this.tlMenu.TreeLevelWidth = 21;
+ //
+ // tlcModuleID
+ //
+ this.tlcModuleID.Caption = "guid";
+ this.tlcModuleID.FieldName = "guid";
+ this.tlcModuleID.MinWidth = 23;
+ this.tlcModuleID.Name = "tlcModuleID";
+ this.tlcModuleID.Visible = true;
+ this.tlcModuleID.VisibleIndex = 0;
+ this.tlcModuleID.Width = 103;
+ //
+ // tlcMenuName
+ //
+ this.tlcMenuName.Caption = "鑿滃崟鍚嶇О";
+ this.tlcMenuName.FieldName = "name";
+ this.tlcMenuName.MinWidth = 38;
+ this.tlcMenuName.Name = "tlcMenuName";
+ this.tlcMenuName.Visible = true;
+ this.tlcMenuName.VisibleIndex = 1;
+ this.tlcMenuName.Width = 215;
+ //
+ // tlcMenuCaption
+ //
+ this.tlcMenuCaption.Caption = "鑿滃崟璺緞";
+ this.tlcMenuCaption.FieldName = "formPath";
+ this.tlcMenuCaption.MinWidth = 23;
+ this.tlcMenuCaption.Name = "tlcMenuCaption";
+ this.tlcMenuCaption.Visible = true;
+ this.tlcMenuCaption.VisibleIndex = 2;
+ this.tlcMenuCaption.Width = 139;
+ //
+ // tlcActions
+ //
+ this.tlcActions.Caption = "鑿滃崟绫诲瀷";
+ this.tlcActions.FieldName = "category";
+ this.tlcActions.MinWidth = 23;
+ this.tlcActions.Name = "tlcActions";
+ this.tlcActions.Visible = true;
+ this.tlcActions.VisibleIndex = 3;
+ this.tlcActions.Width = 50;
+ //
+ // tlcParentMenuName
+ //
+ this.tlcParentMenuName.Caption = "鐘舵��";
+ this.tlcParentMenuName.FieldName = "isStatus";
+ this.tlcParentMenuName.MinWidth = 23;
+ this.tlcParentMenuName.Name = "tlcParentMenuName";
+ this.tlcParentMenuName.Visible = true;
+ this.tlcParentMenuName.VisibleIndex = 4;
+ this.tlcParentMenuName.Width = 64;
+ //
+ // tlcMenuType
+ //
+ this.tlcMenuType.Caption = "鎺掑簭鍙�";
+ this.tlcMenuType.FieldName = "idx";
+ this.tlcMenuType.MinWidth = 23;
+ this.tlcMenuType.Name = "tlcMenuType";
+ this.tlcMenuType.Visible = true;
+ this.tlcMenuType.VisibleIndex = 5;
+ this.tlcMenuType.Width = 50;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(767, 418);
- this.Controls.Add(this.simpleButton1);
+ this.ClientSize = new System.Drawing.Size(887, 659);
+ this.Controls.Add(this.tlMenu);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ private DevExpress.XtraTreeList.TreeList tlMenu;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcModuleID;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcParentMenuName;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuType;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index bf6b785..a31ec54 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -1,4 +1,8 @@
锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraTreeList;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -16,6 +20,76 @@
public XtraForm1()
{
InitializeComponent();
+ tlMenu.CustomDrawNodeCheckBox += TreeList1_CustomDrawNodeCheckBox;
+ getTree();
+
+ // 鍒濆鍖朤reeList
+
+ //tlMenu.BestFitColumns();
+ //tlMenu.EndInit();
+
+ //// 璁剧疆澶嶉�夋鏄剧ず妯″紡
+ //tlMenu.OptionsBehavior.Editable = true;
+ //this.tlMenu.OptionsView.ShowCheckBoxes = true;
+ //tlMenu.OptionsSelection.MultiSelect = true;
+ ////tlMenu.OptionsSelection.MultiSelectMode = TreeListMultiSelectMode.;
+
+ // 娣诲姞GetShowCheckBox浜嬩欢澶勭悊鍣�
+
+ tlMenu.OptionsBehavior.Editable = true;
+ tlMenu.OptionsSelection.EnableAppearanceFocusedCell = false;
+ tlMenu.OptionsSelection.MultiSelect = true;
+ tlMenu.OptionsSelection.MultiSelectMode = TreeListMultiSelectMode.CellSelect;
+ // this.tlMenu.GetChildAtPoint += new DevExpress.XtraTreeList.GetChildNodeCheckBoxEventHandler(this.treeList_GetChildNodeCheckBox)
+ }
+ private void TreeList1_CustomDrawNodeCheckBox(object sender, DevExpress.XtraTreeList.CustomDrawNodeCheckBoxEventArgs e)
+ {
+ // 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓哄彾瀛愯妭鐐癸紙鏃犲瓙鑺傜偣锛�
+ if (e.Node.Nodes.Count == 0)
+ {
+ // 鍏佽缁樺埗澶嶉�夋锛堥粯璁よ涓猴級
+ }
+ else
+ {
+ // 鍙栨秷缁樺埗澶嶉�夋
+ e.Handled = true;
+ }
+ }
+
+ // 鍙�夛細澶勭悊鑺傜偣灞曞紑浜嬩欢锛岀‘淇濆姩鎬佸姞杞界殑瀛愯妭鐐圭敓鏁�
+ private void treeList1_BeforeExpand(object sender, BeforeExpandEventArgs e)
+ {
+ // 鑻ュ瓙鑺傜偣鏄姩鎬佸姞杞界殑锛屽湪姝ゅ鍔犺浇鏁版嵁
+ // LoadChildNodes(e.Node);
+ }
+ /// <summary>
+ /// 璇诲彇鍒楄〃
+ /// </summary>
+ private void getTree()
+ {
+ var pgq = new PageQueryModel(1, 999999, "a.idx");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ tlMenu.DataSource = dt;
+ tlMenu.KeyFieldName = "guid";
+ tlMenu.ParentFieldName = "upGuid";
+ tlMenu.Tag = "name";
+ tlMenu.EndUpdate();
+ this.tlMenu.CollapseAll();
+
+
+ tlMenu.OptionsBehavior.Editable = true;
+ tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3