lu
2024-11-12 ab5c615d5b278660d0a3d5f471d4f4a818099b66
各种细节
已修改8个文件
508 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs 227 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -39,7 +39,7 @@
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lookupTypeName = new DevExpress.XtraEditors.LabelControl();
@@ -83,7 +83,7 @@
            // 
            this.gvMx1lookupName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lookupName.AppearanceCell.Options.UseFont = true;
            this.gvMx1lookupName.Caption = "系统快码显示值 ";
            this.gvMx1lookupName.Caption = "系统快码显示值";
            this.gvMx1lookupName.FieldName = "lookupName";
            this.gvMx1lookupName.MinWidth = 50;
            this.gvMx1lookupName.Name = "gvMx1lookupName";
@@ -96,7 +96,7 @@
            // 
            this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
            this.gvMx1lookupValue.Caption = "系统快码值 ";
            this.gvMx1lookupValue.Caption = "系统快码值";
            this.gvMx1lookupValue.FieldName = "lookupValue";
            this.gvMx1lookupValue.MinWidth = 50;
            this.gvMx1lookupValue.Name = "gvMx1lookupValue";
@@ -130,7 +130,7 @@
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1lookupValue,
            this.gvMx1lookupName,
            this.gridColumn3,
            this.gvMxDel,
            this.gridColumn2});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
@@ -139,15 +139,15 @@
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn3
            // gvMxDel
            // 
            this.gridColumn3.Caption = "删除";
            this.gridColumn3.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 80;
            this.gvMxDel.Caption = "删除";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 2;
            this.gvMxDel.Width = 80;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -448,7 +448,7 @@
        private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -23,7 +23,6 @@
        public Frm_IQCLookups()
        {
            InitializeComponent();
            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -140,23 +139,6 @@
                return;
            }
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        ///     新增事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            var gridViews =
                new List<GridView>();
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(panel1.Controls, true,
                gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
        }
        /// <summary>
@@ -321,6 +303,8 @@
        private void repositoryItemButtonEdit1_ButtonClick(object sender,
            ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -29,6 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx2aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2aql00065 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2aql00040 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,6 +74,8 @@
            this.gvMx1flevelIi = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1flevelIii = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
@@ -125,6 +132,7 @@
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
@@ -505,6 +513,8 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 384);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -524,7 +534,8 @@
            this.gvMx1flevelI,
            this.gvMx1flevelIi,
            this.gvMx1flevelIii,
            this.gvMx1memo});
            this.gvMx1memo,
            this.gridColumn1});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -536,7 +547,7 @@
            // 
            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid ";
            this.gvMx1guid.Caption = "guid";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 50;
            this.gvMx1guid.Name = "gvMx1guid";
@@ -547,7 +558,7 @@
            // 
            this.gvMx1aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1aql1Id.AppearanceCell.Options.UseFont = true;
            this.gvMx1aql1Id.Caption = "AQL抽样基准ID ";
            this.gvMx1aql1Id.Caption = "AQL抽样基准ID";
            this.gvMx1aql1Id.FieldName = "aql1Id";
            this.gvMx1aql1Id.MinWidth = 50;
            this.gvMx1aql1Id.Name = "gvMx1aql1Id";
@@ -558,131 +569,152 @@
            // 
            this.gvMx1lotFrom.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
            this.gvMx1lotFrom.Caption = "批量开始 ";
            this.gvMx1lotFrom.Caption = "批量开始";
            this.gvMx1lotFrom.FieldName = "lotFrom";
            this.gvMx1lotFrom.MinWidth = 50;
            this.gvMx1lotFrom.Name = "gvMx1lotFrom";
            this.gvMx1lotFrom.Tag = "query_a.LOT_FROM";
            this.gvMx1lotFrom.Visible = true;
            this.gvMx1lotFrom.VisibleIndex = 0;
            this.gvMx1lotFrom.Width = 94;
            this.gvMx1lotFrom.Width = 99;
            // 
            // gvMx1lotTo
            // 
            this.gvMx1lotTo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
            this.gvMx1lotTo.Caption = "批量结束 ";
            this.gvMx1lotTo.Caption = "批量结束";
            this.gvMx1lotTo.FieldName = "lotTo";
            this.gvMx1lotTo.MinWidth = 50;
            this.gvMx1lotTo.Name = "gvMx1lotTo";
            this.gvMx1lotTo.Tag = "query_a.LOT_TO";
            this.gvMx1lotTo.Visible = true;
            this.gvMx1lotTo.VisibleIndex = 1;
            this.gvMx1lotTo.Width = 94;
            this.gvMx1lotTo.Width = 99;
            // 
            // gvMx1flevelS1
            // 
            this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelS1.Caption = "特殊检验水平|S-1 ";
            this.gvMx1flevelS1.Caption = "特殊检验水平|S-1";
            this.gvMx1flevelS1.FieldName = "flevelS1";
            this.gvMx1flevelS1.MinWidth = 50;
            this.gvMx1flevelS1.Name = "gvMx1flevelS1";
            this.gvMx1flevelS1.Tag = "query_a.FLEVEL_S1";
            this.gvMx1flevelS1.Visible = true;
            this.gvMx1flevelS1.VisibleIndex = 2;
            this.gvMx1flevelS1.Width = 94;
            this.gvMx1flevelS1.Width = 99;
            // 
            // gvMx1flevelS2
            // 
            this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelS2.Caption = "特殊检验水平|S-2 ";
            this.gvMx1flevelS2.Caption = "特殊检验水平|S-2";
            this.gvMx1flevelS2.FieldName = "flevelS2";
            this.gvMx1flevelS2.MinWidth = 50;
            this.gvMx1flevelS2.Name = "gvMx1flevelS2";
            this.gvMx1flevelS2.Tag = "query_a.FLEVEL_S2";
            this.gvMx1flevelS2.Visible = true;
            this.gvMx1flevelS2.VisibleIndex = 3;
            this.gvMx1flevelS2.Width = 94;
            this.gvMx1flevelS2.Width = 99;
            // 
            // gvMx1flevelS3
            // 
            this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelS3.Caption = "特殊检验水平|S-3 ";
            this.gvMx1flevelS3.Caption = "特殊检验水平|S-3";
            this.gvMx1flevelS3.FieldName = "flevelS3";
            this.gvMx1flevelS3.MinWidth = 50;
            this.gvMx1flevelS3.Name = "gvMx1flevelS3";
            this.gvMx1flevelS3.Tag = "query_a.FLEVEL_S3";
            this.gvMx1flevelS3.Visible = true;
            this.gvMx1flevelS3.VisibleIndex = 4;
            this.gvMx1flevelS3.Width = 94;
            this.gvMx1flevelS3.Width = 99;
            // 
            // gvMx1flevelS4
            // 
            this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelS4.Caption = "特殊检验水平|S-4 ";
            this.gvMx1flevelS4.Caption = "特殊检验水平|S-4";
            this.gvMx1flevelS4.FieldName = "flevelS4";
            this.gvMx1flevelS4.MinWidth = 50;
            this.gvMx1flevelS4.Name = "gvMx1flevelS4";
            this.gvMx1flevelS4.Tag = "query_a.FLEVEL_S4";
            this.gvMx1flevelS4.Visible = true;
            this.gvMx1flevelS4.VisibleIndex = 5;
            this.gvMx1flevelS4.Width = 94;
            this.gvMx1flevelS4.Width = 99;
            // 
            // gvMx1flevelI
            // 
            this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelI.Caption = "一般检验水平|I ";
            this.gvMx1flevelI.Caption = "一般检验水平|I";
            this.gvMx1flevelI.FieldName = "flevelI";
            this.gvMx1flevelI.MinWidth = 50;
            this.gvMx1flevelI.Name = "gvMx1flevelI";
            this.gvMx1flevelI.Tag = "query_a.FLEVEL_I";
            this.gvMx1flevelI.Visible = true;
            this.gvMx1flevelI.VisibleIndex = 6;
            this.gvMx1flevelI.Width = 94;
            this.gvMx1flevelI.Width = 99;
            // 
            // gvMx1flevelIi
            // 
            this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelIi.Caption = "一般检验水平|II ";
            this.gvMx1flevelIi.Caption = "一般检验水平|II";
            this.gvMx1flevelIi.FieldName = "flevelIi";
            this.gvMx1flevelIi.MinWidth = 50;
            this.gvMx1flevelIi.Name = "gvMx1flevelIi";
            this.gvMx1flevelIi.Tag = "query_a.FLEVEL_II";
            this.gvMx1flevelIi.Visible = true;
            this.gvMx1flevelIi.VisibleIndex = 7;
            this.gvMx1flevelIi.Width = 94;
            this.gvMx1flevelIi.Width = 99;
            // 
            // gvMx1flevelIii
            // 
            this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
            this.gvMx1flevelIii.Caption = "一般检验水平|III ";
            this.gvMx1flevelIii.Caption = "一般检验水平|III";
            this.gvMx1flevelIii.FieldName = "flevelIii";
            this.gvMx1flevelIii.MinWidth = 50;
            this.gvMx1flevelIii.Name = "gvMx1flevelIii";
            this.gvMx1flevelIii.Tag = "query_a.FLEVEL_III";
            this.gvMx1flevelIii.Visible = true;
            this.gvMx1flevelIii.VisibleIndex = 8;
            this.gvMx1flevelIii.Width = 94;
            this.gvMx1flevelIii.Width = 99;
            // 
            // gvMx1memo
            // 
            this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
            this.gvMx1memo.Caption = "备注 ";
            this.gvMx1memo.Caption = "备注";
            this.gvMx1memo.FieldName = "memo";
            this.gvMx1memo.MinWidth = 50;
            this.gvMx1memo.Name = "gvMx1memo";
            this.gvMx1memo.Tag = "query_a.MEMO";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 9;
            this.gvMx1memo.Width = 94;
            this.gvMx1memo.Width = 99;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "移出";
            this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 50;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // lb_isenabled
            // 
@@ -1281,6 +1313,7 @@
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
@@ -1412,5 +1445,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIii;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -454,6 +454,43 @@
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx",
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -39,9 +39,9 @@
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_lookupTypeName = new DevExpress.XtraEditors.LabelControl();
            this.txt_lookupTypeName = new DevExpress.XtraEditors.TextEdit();
            this.gv_lookupTypeName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -83,7 +83,7 @@
            // 
            this.gvMx1lookupName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lookupName.AppearanceCell.Options.UseFont = true;
            this.gvMx1lookupName.Caption = "系统快码显示值 ";
            this.gvMx1lookupName.Caption = "系统快码显示值";
            this.gvMx1lookupName.FieldName = "lookupName";
            this.gvMx1lookupName.MinWidth = 50;
            this.gvMx1lookupName.Name = "gvMx1lookupName";
@@ -96,7 +96,7 @@
            // 
            this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
            this.gvMx1lookupValue.Caption = "系统快码值 ";
            this.gvMx1lookupValue.Caption = "系统快码值";
            this.gvMx1lookupValue.FieldName = "lookupValue";
            this.gvMx1lookupValue.MinWidth = 50;
            this.gvMx1lookupValue.Name = "gvMx1lookupValue";
@@ -128,10 +128,10 @@
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn2,
            this.gvMx1lookupValue,
            this.gvMx1lookupName,
            this.gridColumn3,
            this.gridColumn2});
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -139,15 +139,23 @@
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn3
            // gridColumn2
            // 
            this.gridColumn3.Caption = "删除";
            this.gridColumn3.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 80;
            this.gridColumn2.Caption = "gridColumn2";
            this.gridColumn2.FieldName = "guid";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            //
            // gvMxDel
            //
            this.gvMxDel.Caption = "删除";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 2;
            this.gvMxDel.Width = 80;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -159,14 +167,6 @@
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "gridColumn2";
            this.gridColumn2.FieldName = "guid";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            // 
            // lb_lookupTypeName
            // 
@@ -192,7 +192,7 @@
            // 
            this.gv_lookupTypeName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lookupTypeName.AppearanceCell.Options.UseFont = true;
            this.gv_lookupTypeName.Caption = "系统快码类型名称 ";
            this.gv_lookupTypeName.Caption = "系统快码类型名称";
            this.gv_lookupTypeName.FieldName = "lookupTypeName";
            this.gv_lookupTypeName.MinWidth = 50;
            this.gv_lookupTypeName.Name = "gv_lookupTypeName";
@@ -226,7 +226,7 @@
            // 
            this.gv_lookupTypeCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lookupTypeCode.AppearanceCell.Options.UseFont = true;
            this.gv_lookupTypeCode.Caption = "系统快码类型编码 ";
            this.gv_lookupTypeCode.Caption = "系统快码类型编码";
            this.gv_lookupTypeCode.FieldName = "lookupTypeCode";
            this.gv_lookupTypeCode.MinWidth = 50;
            this.gv_lookupTypeCode.Name = "gv_lookupTypeCode";
@@ -448,7 +448,7 @@
private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -302,6 +302,8 @@
        private void repositoryItemButtonEdit1_ButtonClick(object sender,
            ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -32,17 +32,13 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.tlMenu = new System.Windows.Forms.TreeView();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_checkStatus = new System.Windows.Forms.Label();
            this.labelControl15 = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_fid = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.txt_fNumber = new DevExpress.XtraEditors.TextEdit();
            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.label1 = new System.Windows.Forms.Label();
@@ -60,15 +56,13 @@
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.tlMenu = new System.Windows.Forms.TreeView();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fNumber.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
@@ -83,7 +77,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(772, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1074, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -94,48 +88,28 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(772, 410);
            this.xtraTabControl1.Size = new System.Drawing.Size(1074, 616);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            this.xtraTabPage1});
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.panel1);
            this.xtraTabPage1.Controls.Add(this.tlMenu);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(770, 378);
            this.xtraTabPage1.Size = new System.Drawing.Size(1072, 584);
            this.xtraTabPage1.Text = "数据查询";
            //
            // tlMenu
            //
            this.tlMenu.Dock = System.Windows.Forms.DockStyle.Left;
            this.tlMenu.Font = new System.Drawing.Font("Tahoma", 10F);
            this.tlMenu.Location = new System.Drawing.Point(0, 0);
            this.tlMenu.Name = "tlMenu";
            this.tlMenu.Size = new System.Drawing.Size(207, 378);
            this.tlMenu.TabIndex = 2;
            //
            // xtraTabPage2
            //
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(770, 378);
            this.xtraTabPage2.Text = "数据编辑";
            // 
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_checkStatus);
            this.panel1.Controls.Add(this.labelControl15);
            this.panel1.Controls.Add(this.txt_checkDate);
            this.panel1.Controls.Add(this.txt_checkBy);
            this.panel1.Controls.Add(this.labelControl14);
            this.panel1.Controls.Add(this.txt_fid);
            this.panel1.Controls.Add(this.labelControl13);
            this.panel1.Controls.Add(this.txt_isStatus);
            this.panel1.Controls.Add(this.labelControl10);
            this.panel1.Controls.Add(this.txt_factory);
            this.panel1.Controls.Add(this.txt_fNumber);
            this.panel1.Controls.Add(this.labelControl9);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.label1);
@@ -154,94 +128,76 @@
            this.panel1.Controls.Add(this.txt_name);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(21, 17);
            this.panel1.Location = new System.Drawing.Point(370, 16);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(710, 324);
            this.panel1.TabIndex = 1;
            //
            // txt_checkStatus
            //
            this.txt_checkStatus.AutoSize = true;
            this.txt_checkStatus.Location = new System.Drawing.Point(484, 207);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Size = new System.Drawing.Size(0, 21);
            this.txt_checkStatus.TabIndex = 146;
            //
            // labelControl15
            //
            this.labelControl15.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl15.Appearance.Options.UseFont = true;
            this.labelControl15.Location = new System.Drawing.Point(395, 204);
            this.labelControl15.Name = "labelControl15";
            this.labelControl15.Size = new System.Drawing.Size(85, 21);
            this.labelControl15.TabIndex = 145;
            this.labelControl15.Text = "审核状态:";
            //
            // txt_checkDate
            //
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(488, 160);
            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(200, 28);
            this.txt_checkDate.TabIndex = 144;
            //
            // txt_checkBy
            //
            this.txt_checkBy.Enabled = false;
            this.txt_checkBy.Location = new System.Drawing.Point(488, 118);
            this.txt_checkBy.Name = "txt_checkBy";
            this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
            this.txt_checkBy.Size = new System.Drawing.Size(200, 28);
            this.txt_checkBy.TabIndex = 143;
            this.panel1.Size = new System.Drawing.Size(560, 373);
            this.panel1.TabIndex = 3;
            // 
            // labelControl14
            // 
            this.labelControl14.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl14.Appearance.Options.UseFont = true;
            this.labelControl14.Location = new System.Drawing.Point(395, 164);
            this.labelControl14.Appearance.ForeColor = System.Drawing.Color.Red;
            this.labelControl14.Appearance.Options.UseForeColor = true;
            this.labelControl14.Location = new System.Drawing.Point(362, 115);
            this.labelControl14.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(85, 21);
            this.labelControl14.TabIndex = 140;
            this.labelControl14.Text = "审核时间:";
            this.labelControl14.Size = new System.Drawing.Size(8, 18);
            this.labelControl14.TabIndex = 141;
            this.labelControl14.Text = "*";
            //
            // txt_fid
            //
            this.txt_fid.Location = new System.Drawing.Point(134, 67);
            this.txt_fid.Name = "txt_fid";
            this.txt_fid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fid.Properties.Appearance.Options.UseFont = true;
            this.txt_fid.Size = new System.Drawing.Size(220, 28);
            this.txt_fid.TabIndex = 140;
            // 
            // labelControl13
            // 
            this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl13.Appearance.Options.UseFont = true;
            this.labelControl13.Location = new System.Drawing.Point(412, 122);
            this.labelControl13.Location = new System.Drawing.Point(41, 71);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(68, 21);
            this.labelControl13.Size = new System.Drawing.Size(69, 21);
            this.labelControl13.TabIndex = 139;
            this.labelControl13.Text = "审核人:";
            this.labelControl13.Text = "组织ID:";
            // 
            // txt_isStatus
            // 
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Checked = true;
            this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
            this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
            this.txt_isStatus.Location = new System.Drawing.Point(134, 279);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 138;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            // 
            // txt_factory
            // labelControl10
            // 
            this.txt_factory.Location = new System.Drawing.Point(134, 76);
            this.txt_factory.Name = "txt_factory";
            this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_factory.Properties.Appearance.Options.UseFont = true;
            this.txt_factory.Size = new System.Drawing.Size(220, 28);
            this.txt_factory.TabIndex = 135;
            this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl10.Appearance.Options.UseFont = true;
            this.labelControl10.Location = new System.Drawing.Point(362, 70);
            this.labelControl10.Name = "labelControl10";
            this.labelControl10.Size = new System.Drawing.Size(145, 21);
            this.labelControl10.TabIndex = 137;
            this.labelControl10.Text = "(根组织编号为1)";
            //
            // txt_fNumber
            //
            this.txt_fNumber.Location = new System.Drawing.Point(134, 105);
            this.txt_fNumber.Name = "txt_fNumber";
            this.txt_fNumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fNumber.Properties.Appearance.Options.UseFont = true;
            this.txt_fNumber.Size = new System.Drawing.Size(220, 28);
            this.txt_fNumber.TabIndex = 135;
            // 
            // labelControl9
            // 
            this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl9.Appearance.Options.UseFont = true;
            this.labelControl9.Location = new System.Drawing.Point(41, 80);
            this.labelControl9.Location = new System.Drawing.Point(41, 109);
            this.labelControl9.Name = "labelControl9";
            this.labelControl9.Size = new System.Drawing.Size(85, 21);
            this.labelControl9.TabIndex = 134;
@@ -249,7 +205,7 @@
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(81, 290);
            this.labelControl11.Location = new System.Drawing.Point(81, 319);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -260,7 +216,7 @@
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(119, 285);
            this.label1.Location = new System.Drawing.Point(119, 314);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(0, 21);
            this.label1.TabIndex = 132;
@@ -270,7 +226,7 @@
            // 
            this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl8.Appearance.Options.UseFont = true;
            this.labelControl8.Location = new System.Drawing.Point(359, 38);
            this.labelControl8.Location = new System.Drawing.Point(359, 29);
            this.labelControl8.Name = "labelControl8";
            this.labelControl8.Size = new System.Drawing.Size(136, 21);
            this.labelControl8.TabIndex = 120;
@@ -280,7 +236,7 @@
            // 
            this.txt_upGuid.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.txt_upGuid.FormattingEnabled = true;
            this.txt_upGuid.Location = new System.Drawing.Point(134, 34);
            this.txt_upGuid.Location = new System.Drawing.Point(134, 25);
            this.txt_upGuid.Name = "txt_upGuid";
            this.txt_upGuid.Size = new System.Drawing.Size(220, 29);
            this.txt_upGuid.TabIndex = 119;
@@ -289,7 +245,7 @@
            // 
            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl6.Appearance.Options.UseFont = true;
            this.labelControl6.Location = new System.Drawing.Point(41, 38);
            this.labelControl6.Location = new System.Drawing.Point(41, 29);
            this.labelControl6.Name = "labelControl6";
            this.labelControl6.Size = new System.Drawing.Size(85, 21);
            this.labelControl6.TabIndex = 118;
@@ -299,7 +255,7 @@
            // 
            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl7.Appearance.Options.UseFont = true;
            this.labelControl7.Location = new System.Drawing.Point(41, 248);
            this.labelControl7.Location = new System.Drawing.Point(41, 277);
            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl7.Name = "labelControl7";
            this.labelControl7.Size = new System.Drawing.Size(85, 21);
@@ -309,7 +265,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(134, 295);
            this.lbGuid.Location = new System.Drawing.Point(134, 324);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 111;
@@ -319,7 +275,7 @@
            // 
            this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Red;
            this.labelControl5.Appearance.Options.UseForeColor = true;
            this.labelControl5.Location = new System.Drawing.Point(362, 207);
            this.labelControl5.Location = new System.Drawing.Point(362, 236);
            this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl5.Name = "labelControl5";
            this.labelControl5.Size = new System.Drawing.Size(8, 18);
@@ -330,7 +286,7 @@
            // 
            this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Red;
            this.labelControl1.Appearance.Options.UseForeColor = true;
            this.labelControl1.Location = new System.Drawing.Point(362, 165);
            this.labelControl1.Location = new System.Drawing.Point(362, 194);
            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(8, 18);
@@ -341,7 +297,7 @@
            // 
            this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
            this.labelControl12.Appearance.Options.UseForeColor = true;
            this.labelControl12.Location = new System.Drawing.Point(362, 123);
            this.labelControl12.Location = new System.Drawing.Point(362, 152);
            this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl12.Name = "labelControl12";
            this.labelControl12.Size = new System.Drawing.Size(8, 18);
@@ -350,7 +306,7 @@
            // 
            // txt_conTel
            // 
            this.txt_conTel.Location = new System.Drawing.Point(134, 202);
            this.txt_conTel.Location = new System.Drawing.Point(134, 231);
            this.txt_conTel.Name = "txt_conTel";
            this.txt_conTel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_conTel.Properties.Appearance.Options.UseFont = true;
@@ -361,7 +317,7 @@
            // 
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(24, 206);
            this.labelControl4.Location = new System.Drawing.Point(24, 235);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(102, 21);
            this.labelControl4.TabIndex = 6;
@@ -369,7 +325,7 @@
            // 
            // txt_conPeople
            // 
            this.txt_conPeople.Location = new System.Drawing.Point(134, 160);
            this.txt_conPeople.Location = new System.Drawing.Point(134, 189);
            this.txt_conPeople.Name = "txt_conPeople";
            this.txt_conPeople.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_conPeople.Properties.Appearance.Options.UseFont = true;
@@ -380,7 +336,7 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(24, 164);
            this.labelControl3.Location = new System.Drawing.Point(24, 193);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(102, 21);
            this.labelControl3.TabIndex = 4;
@@ -388,7 +344,7 @@
            // 
            // txt_name
            // 
            this.txt_name.Location = new System.Drawing.Point(134, 118);
            this.txt_name.Location = new System.Drawing.Point(134, 147);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_name.Properties.Appearance.Options.UseFont = true;
@@ -399,27 +355,26 @@
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(41, 122);
            this.labelControl2.Location = new System.Drawing.Point(41, 151);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(85, 21);
            this.labelControl2.TabIndex = 2;
            this.labelControl2.Text = "组织名称:";
            // 
            // labelControl10
            // tlMenu
            // 
            this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl10.Appearance.Options.UseFont = true;
            this.labelControl10.Location = new System.Drawing.Point(362, 80);
            this.labelControl10.Name = "labelControl10";
            this.labelControl10.Size = new System.Drawing.Size(145, 21);
            this.labelControl10.TabIndex = 137;
            this.labelControl10.Text = "(根组织建立为0)";
            this.tlMenu.Dock = System.Windows.Forms.DockStyle.Left;
            this.tlMenu.Font = new System.Drawing.Font("Tahoma", 10F);
            this.tlMenu.Location = new System.Drawing.Point(0, 0);
            this.tlMenu.Name = "tlMenu";
            this.tlMenu.Size = new System.Drawing.Size(343, 584);
            this.tlMenu.TabIndex = 2;
            // 
            // Organization
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(772, 490);
            this.ClientSize = new System.Drawing.Size(1074, 696);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Organization";
@@ -427,12 +382,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fNumber.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
@@ -445,8 +398,13 @@
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private System.Windows.Forms.TreeView tlMenu;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.CheckBox txt_isStatus;
        private DevExpress.XtraEditors.LabelControl labelControl10;
        private DevExpress.XtraEditors.TextEdit txt_fNumber;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private System.Windows.Forms.Label label1;
        private DevExpress.XtraEditors.LabelControl labelControl8;
        private System.Windows.Forms.ComboBox txt_upGuid;
        private DevExpress.XtraEditors.LabelControl labelControl6;
@@ -461,17 +419,8 @@
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_name;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private System.Windows.Forms.Label label1;
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkBy;
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_fid;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.LabelControl labelControl15;
        private System.Windows.Forms.Label txt_checkStatus;
        private System.Windows.Forms.CheckBox txt_isStatus;
        private DevExpress.XtraEditors.LabelControl labelControl10;
        private DevExpress.XtraEditors.LabelControl labelControl14;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -12,8 +12,10 @@
{
    public partial class Organization : XtraForm
    {
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Organization()
        {
            InitializeComponent();
            //toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            //toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -21,12 +23,45 @@
            //toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            //toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            //toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            tlMenu.DoubleClick += TlMenu_DoubleClick;
            getTree();
        }
        /// <summary>
        /// 查询事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
        }
        /// <summary>
        /// 查询回调
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getTree();
        }
        /// <summary>
        /// 刷新事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), false, 999);
            else
                getTree();
        }
        private void TlMenu_DoubleClick(object sender, EventArgs e)
        {
            var clickedNode = tlMenu.SelectedNode;
@@ -117,16 +152,7 @@
            }
        }
        /// <summary>
        ///     刷新事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getTree();
        }
        /// <summary>
        ///     修改事件
@@ -167,10 +193,10 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_factory.Text.Trim()))
            if (string.IsNullOrEmpty(txt_fNumber.Text.Trim()))
            {
                MsgHelper.Warning("编号不能为空!");
                txt_factory.Focus();
                txt_fNumber.Focus();
                return;
            }
@@ -206,7 +232,7 @@
                conPeople = txt_conPeople.Text, //联系人
                conTel = txt_conPeople.Text, //联系电话
                isStatus = txt_isStatus.Checked, //状态
                factory = txt_factory.Text //组织编号
                factory = txt_fNumber.Text //组织编号
            };
            try
            {
@@ -243,7 +269,7 @@
                    "Organization/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                var drGrp = dt.Select("FParentlD='0' or isnull(FParentlD,'') =''");
                var drGrp = dt.Select("FID=1");
                var dtComList = new DataTable();
                dtComList.Columns.Add("guid", typeof(string));
                dtComList.Columns.Add("name", typeof(string));
@@ -266,14 +292,13 @@
                        node22.ImageIndex = 1;
                        node.Nodes.Add(node22);
                    }
                    node.ExpandAll();
                    tlMenu.Nodes.Add(node);
                }
                txt_upGuid.DataSource = dtComList;
                txt_upGuid.DisplayMember = "name";
                txt_upGuid.ValueMember = "guid";
                getModel(dtComList.Rows[0]["guid"].ToString(),false,0);
            }
            catch (Exception ex)
            {
@@ -315,5 +340,7 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}