1
lu
2024-10-31 344613d596fe956b4ce16eb7df1683d413071b8d
1
已修改3个文件
28 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -342,12 +342,9 @@
                Isenabled = false,
                FoneChecked = false,
                Fversion =  Convert.ToInt32(txt_fversion.Text.Trim()),
                MesQmAql2s = qmaql2,
                MesQmAql3s = qmaql3
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -53,12 +53,12 @@
            this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
@@ -345,15 +345,6 @@
            this.btnFjianYan.Name = "btnFjianYan";
            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnLog
            //
            this.btnLog.Caption = "日志";
            this.btnLog.Id = 18;
            this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
            this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
            this.btnLog.Name = "btnLog";
            this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // btnPiZhun
            // 
            this.btnPiZhun.Caption = "批准";
@@ -399,6 +390,15 @@
            this.btnCaiGouFchk.Name = "btnCaiGouFchk";
            this.btnCaiGouFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnLog
            //
            this.btnLog.Caption = "日志";
            this.btnLog.Id = 18;
            this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
            this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
            this.btnLog.Name = "btnLog";
            this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // barDockControlTop
            // 
            this.barDockControlTop.CausesValidation = false;
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -46,7 +46,7 @@
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
                    if (!string.IsNullOrEmpty(item.Caption))
                    if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "保存" && item.Caption != "刷新")
                        lst.Add(item.Caption);
            actions = lst;
        }
@@ -411,7 +411,6 @@
                lst.Add(btnDesign.Name);
                lst.Add(btnChk.Name);
                lst.Add(btnFchk.Name);
                lst.Add(btnLoad.Name);
                lst.Add(btnJianYan.Name);
                lst.Add(btnFjianYan.Name);
                lst.Add(btnOut.Name);
@@ -612,7 +611,7 @@
                }
                //默认启用的按钮
                // _enabledList.Add(btnDesign.Name);
                _enabledList.Add(btnLoad.Name);
                _enabledBtn(_enabledList);
            }
            catch (Exception ex)