细节修改

lu

2025-02-13 c0aa9538d0c080a0ede4fe80b61bb3901db82621

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -190,11 +190,7 @@
                string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
                    ? Guid.NewGuid().ToString()
                    : LoginInfoModel.CurrentUser.LoginUserGuid;
            var orgGuid =
                string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid)
                    ? Guid.NewGuid().ToString()
                    : LoginInfoModel.CurrentUser.LoginOrgGuid;
            var token = userGuid + "~" + orgGuid;
            var token = userGuid;
            return token;
        }

@@ -455,7 +451,6 @@
                            txt.Enabled = !isEdt;
                            continue;
                        }

                        //时间
                        if (colType is DateTimePicker)
                        {
@@ -645,6 +640,17 @@
                                txt.Enabled = false;
                            continue;
                        }
                        //自定货主
                        if (colType is UcLookHuoZhu)
                        {
                            var txt = colType as UcLookHuoZhu;
                            //txt.SetIdOrCode(strVal);
                            if (txt.IsReadly == false)
                                txt.Enabled = !isEdt;
                            else
                                txt.Enabled = false;
                            continue;
                        }
                        if (colType is SimpleButton)
                        {
                            var txt = colType as SimpleButton;
@@ -766,7 +772,6 @@
                        txt.ReadOnly = isEdt;
                    continue;
                }

                //时间
                if (ctrl is DateTimePicker)
                {
@@ -793,7 +798,6 @@
                        txt.Checked = false;
                    continue;
                }

                //自定义仓库
                if (ctrl is UcLookCk)
                {
@@ -911,6 +915,15 @@
                {
                    var txt = ctrl as UcLookWwgd;
                    txt.SetIdOrCode("-1");
                    txt.Enabled = !isEdt;
                    continue;
                }
                //自定义货主
                if (ctrl is UcLookHuoZhu)
                {
                    var txt = ctrl as UcLookHuoZhu;
                    txt.SetHzId("-1");
                    txt.SetHzLx(0);
                    txt.Enabled = !isEdt;
                    continue;
                }
@@ -1165,6 +1178,18 @@
                        txt.Enabled = false;
                    continue;
                }

                //自定义货主
                if (ctrl is UcLookHuoZhu)
                {
                    var txt = ctrl as UcLookHuoZhu;
                    if (txt.IsReadly == false)
                        txt.Enabled = !isEdt;
                    else
                        txt.Enabled = false;
                    continue;
                }

                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;
@@ -1339,7 +1364,18 @@
            if (string.IsNullOrEmpty(str)) return Guid.Empty;
            return Guid.Parse(str);
        }
        public static decimal ToDecimal(string str)
        {
            try
            {
                return decimal.Parse(str);
            }
            catch (Exception)
            {

                return 0;
            }
        }
        public static int ToInt(string str)
        {
            try
@@ -1377,12 +1413,7 @@
                return true;
            return false;
        }
        public string GetIsNullOrEmpty(string str)
        {
            if (string.IsNullOrEmpty(str.Trim()))
                return "{>";
            return str.Trim();
        }
       

        /// <summary>
        /// 读取grid的当前行
@@ -1574,7 +1605,7 @@
                        var checkStatus = dgv.GetRowCellValue(selectedRow, fileName).ToString(); // 获取指定列的值
                        btnChkIco.Text = checkStatus;
                        btnChkIco.Visible = true;
                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper())
                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper()|| checkStatus == "已审核")
                        {
                            btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
                            btnChkIco.Tag = "已审核";
@@ -1700,9 +1731,11 @@
        /// <param name="action"></param>
        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)
        {
            gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽
            foreach (GridColumn column in gridView1.Columns)
            {
                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
                column.OptionsColumn.AllowEdit = true;
                column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
@@ -1859,6 +1892,12 @@
        /// <param name="icoName"></param>
        public static void SetGridViewParameterMx(GridView gridView1)
        {
           // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
            foreach (GridColumn column in gridView1.Columns)
            {
                // column.DefaultCellStyle.Alignment = true;
                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
            }
            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽
            gridView1.OptionsFilter.AllowFilterEditor = false;
            gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;