diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js index 7a11ac2cf..6277bb5d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js @@ -106,15 +106,10 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('RID'); if (learun.checkrow(keyValue)) { - var SendFlag = $('#gridtable').jfGridValue('RSendFlag'); - if (SendFlag != 0) { - learun.alert.warning("当前项目已提交不能删除!"); - return; - } learun.layerConfirm('是否确认删除该项!', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); + page.search(); }); } }); @@ -205,6 +200,18 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/GetPageList', headData: [ + { + label: "录入人员", name: "SenderId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, { label: "来文单位", name: "RSourceUnit", width: 100, align: "left" }, { label: "收文单位", name: "RReceiveUnit", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js index d5e4da00f..58c2b2253 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js @@ -1682,6 +1682,8 @@ { id: "NotNull", text: "不能为空!" }, { id: "Num", text: "必须为数字!" }, { id: "NumOrNull", text: "数字或空!" }, + { id: "PositiveFloatintZero", text: "整数或小数(不能为负数)!" }, + { id: "PositiveFloatint", text: "整数或小数(不能为零和负数)!" }, { id: "Email", text: "必须为E-mail格式!" }, { id: "EmailOrNull", text: "E-mail格式或空!" }, { id: "EnglishStr", text: "必须为字符串!" },