Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/YG-OPP-WCS-Client

WCS_Client/UC/UCPanel/UC_QueryPage.cs

@@ -749,6 +749,14 @@ namespace WCS_Client.UC
                 }
                 foreach (GridColumn dc in _GCList)
                 {
+                    if (dc.HeaderText.Contains("时间"))
+                    {
+                        GridDateTimeInputEditControl createTimeColumnRenderControl = (GridDateTimeInputEditControl)dc.RenderControl;
+                        //设置 format 为自定义
+                        createTimeColumnRenderControl.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
+                        //设置自定义格式            
+                        createTimeColumnRenderControl.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+                    }
                     // dc.ReadOnly = true;
                     dc.DisplayIndex = this.SCGrid.PrimaryGrid.Columns.Count;
                     this.SCGrid.PrimaryGrid.Columns.Add(dc);