缺陷报告修复

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_StorageController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -69,8 +69,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_StorageData = ass_StorageIBLL.GetAss_StorageEntity( keyValue );
-            var jsonData = new {
+            var Ass_StorageData = ass_StorageIBLL.GetAss_StorageEntity(keyValue);
+            var jsonData = new
+            {
                 Ass_Storage = Ass_StorageData,
             };
             return Success(jsonData);
@@ -113,7 +114,22 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Ass_StorageEntity entity = strEntity.ToObject<Ass_StorageEntity>();
-            ass_StorageIBLL.SaveEntity(keyValue,entity);
+            var model = ass_StorageIBLL.NameOrcode(entity.SName, entity.SCode);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                if (model != null)
+                {
+                    return Fail("编码,姓名已存在,请重命名");
+                }
+            }
+            else
+            {
+                if (model != null && model.SId != keyValue)
+                {
+                    return Fail("编码,姓名已存在,请重命名！");
+                }
+            }
+            ass_StorageIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Supplier/Form.js

@@ -15,12 +15,13 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#SSchoolUserId').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/EducationalAdministration/SYS_SendMessage/GetSelectedUserName'
-            });
+            $('#SSchoolUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //$('#SSchoolUserId').lrformselect({
+            //    layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+            //    layerUrlW: 400,
+            //    layerUrlH: 300,
+            //    dataUrl: top.$.rootUrl + '/EducationalAdministration/SYS_SendMessage/GetSelectedUserName'
+            //});
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js

@@ -94,7 +94,8 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                    page.search();
+                                //refreshGirdData();
                             });
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
-            $('#CheckStatus').lrselect({ data: [{ id: '0', text: '草稿' }, { id: '1', text: '审批中' }, { id: '2', text: '审批通过' }, { id: '3', text: '审批不通过' }] });
+            $('#CheckStatus').lrselect({ data: [{ id: '0', text: '草稿' }, { id: '1', text: '待审核' }, { id: '2', text: '审批通过' }, { id: '3', text: '审核未通过' }] });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage/Ass_StorageBLL.cs

@@ -115,7 +115,24 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
             }
         }
-
+        public Ass_StorageEntity NameOrcode(string Name, string Code)
+        {
+            try
+            {
+                return ass_StorageService.NameOrcode(Name, Code);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage/Ass_StorageIBLL.cs

@@ -30,7 +30,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         #endregion
 
         #region  提交数据
-
+        Ass_StorageEntity NameOrcode(string Name, string Code);
         /// <summary>
         /// 删除实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage/Ass_StorageService.cs

@@ -54,7 +54,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("SCode", "%" + queryParam["SCode"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.SCode Like @SCode ");
                 }
-                return this.BaseRepository().FindList<Ass_StorageEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository().FindList<Ass_StorageEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -106,7 +106,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                this.BaseRepository().Delete<Ass_StorageEntity>(t=>t.SId == keyValue);
+                this.BaseRepository().Delete<Ass_StorageEntity>(t => t.SId == keyValue);
             }
             catch (Exception ex)
             {
@@ -142,7 +142,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
             }
         }
-
+        public Ass_StorageEntity NameOrcode(string Name, string Code)
+        {
+            return this.BaseRepository().FindEntity<Ass_StorageEntity>(x => x.SName == Name && x.SCode == Code);
+        }
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>