~tjx/GsMesClient.git

			@@ -112,7 +112,7 @@
			//
			this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
			this.gvMx1createBy.Caption = "建立者 ";
			this.gvMx1createBy.Caption = "建立者";
			this.gvMx1createBy.FieldName = "createBy";
			this.gvMx1createBy.MinWidth = 50;
			this.gvMx1createBy.Name = "gvMx1createBy";
			@@ -126,25 +126,25 @@
			//
			this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
			this.gvMx1createDate.Caption = "建立时间 ";
			this.gvMx1createDate.Caption = "建立时间";
			this.gvMx1createDate.FieldName = "createDate";
			this.gvMx1createDate.MinWidth = 50;
			this.gvMx1createDate.MinWidth = 180;
			this.gvMx1createDate.Name = "gvMx1createDate";
			this.gvMx1createDate.OptionsColumn.ReadOnly = true;
			this.gvMx1createDate.Tag = "query_a.create_date";
			this.gvMx1createDate.Visible = true;
			this.gvMx1createDate.VisibleIndex = 5;
			this.gvMx1createDate.Width = 94;
			this.gvMx1createDate.Width = 180;
			//
			// gvMx1remark
			//
			this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1remark.AppearanceCell.Options.UseFont = true;
			this.gvMx1remark.Caption = "备注 ";
			this.gvMx1remark.Caption = "备注";
			this.gvMx1remark.FieldName = "remark";
			this.gvMx1remark.MinWidth = 50;
			this.gvMx1remark.Name = "gvMx1remark";
			this.gvMx1remark.Tag = "query_a.remark";
			this.gvMx1remark.Tag = "edit";
			this.gvMx1remark.Visible = true;
			this.gvMx1remark.VisibleIndex = 2;
			this.gvMx1remark.Width = 94;
			@@ -153,11 +153,11 @@
			//
			this.gvMx1name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1name.AppearanceCell.Options.UseFont = true;
			this.gvMx1name.Caption = "产线名称 ";
			this.gvMx1name.Caption = "产线名称";
			this.gvMx1name.FieldName = "name";
			this.gvMx1name.MinWidth = 50;
			this.gvMx1name.Name = "gvMx1name";
			this.gvMx1name.Tag = "query_a.name";
			this.gvMx1name.Tag = "edit";
			this.gvMx1name.Visible = true;
			this.gvMx1name.VisibleIndex = 1;
			this.gvMx1name.Width = 94;
			@@ -166,11 +166,11 @@
			//
			this.gvMx1lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1lineNo.AppearanceCell.Options.UseFont = true;
			this.gvMx1lineNo.Caption = "产线编号 ";
			this.gvMx1lineNo.Caption = "产线编号";
			this.gvMx1lineNo.FieldName = "lineNo";
			this.gvMx1lineNo.MinWidth = 50;
			this.gvMx1lineNo.Name = "gvMx1lineNo";
			this.gvMx1lineNo.Tag = "query_a.line_no";
			this.gvMx1lineNo.Tag = "edit";
			this.gvMx1lineNo.Visible = true;
			this.gvMx1lineNo.VisibleIndex = 0;
			this.gvMx1lineNo.Width = 94;
			@@ -234,6 +234,8 @@
			this.gvMx1isStatus.FieldName = "isStatus";
			this.gvMx1isStatus.MinWidth = 25;
			this.gvMx1isStatus.Name = "gvMx1isStatus";
			this.gvMx1isStatus.Tag = "edit";
			this.gvMx1isStatus.UnboundDataType = typeof(bool);
			this.gvMx1isStatus.Visible = true;
			this.gvMx1isStatus.VisibleIndex = 3;
			this.gvMx1isStatus.Width = 94;
			@@ -313,14 +315,17 @@
			//
			// gridView1
			//
			this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
			this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
			this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gridView1.Appearance.Row.Options.UseFont = true;
			this.gridView1.ColumnPanelRowHeight = 50;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gv_factory,
			this.gridColumn3,
			this.gv_departmentid,
			this.gv_departmentcode,
			this.gv_departmentname,
			this.gridColumn3,
			this.gridColumn2,
			this.gridColumn1,
			this.gv_depextr4,
			@@ -366,7 +371,7 @@
			this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_departmentid.Tag = "query_a.departmentid";
			this.gv_departmentid.Visible = true;
			this.gv_departmentid.VisibleIndex = 1;
			this.gv_departmentid.VisibleIndex = 2;
			this.gv_departmentid.Width = 94;
			//
			// gv_departmentcode
			@@ -381,7 +386,7 @@
			this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_departmentcode.Tag = "query_a.departmentcode";
			this.gv_departmentcode.Visible = true;
			this.gv_departmentcode.VisibleIndex = 2;
			this.gv_departmentcode.VisibleIndex = 3;
			this.gv_departmentcode.Width = 94;
			//
			// gv_departmentname
			@@ -396,18 +401,19 @@
			this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_departmentname.Tag = "query_a.departmentname";
			this.gv_departmentname.Visible = true;
			this.gv_departmentname.VisibleIndex = 3;
			this.gv_departmentname.VisibleIndex = 4;
			this.gv_departmentname.Width = 150;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "审核状态";
			this.gridColumn3.FieldName = "checkStatus";
			this.gridColumn3.MinWidth = 25;
			this.gridColumn3.MaxWidth = 50;
			this.gridColumn3.MinWidth = 50;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 4;
			this.gridColumn3.Width = 94;
			this.gridColumn3.VisibleIndex = 1;
			this.gridColumn3.Width = 50;
			//
			// gridColumn2
			//