From 679440e3928e171d9762f36a18e5f2a04ef91ccd Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 8 Mar 2022 17:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E6=8D=9F=E5=9D=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=A0=B4=E5=9D=8F=E8=80=85=E4=B8=BA=E5=AD=A6=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AwardAndPunishment/Index.cshtml | 4 -- .../Views/AwardPunishInfo/Index.cshtml | 4 -- .../Views/Acc_GoodsDemage/Form.js | 31 ++++++++-- .../Views/Acc_GoodsDemage/Index.js | 61 +++++++++++-------- .../Views/Acc_Punishment/Index.js | 6 +- 5 files changed, 66 insertions(+), 40 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml index 12428a695..95d19b75c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml @@ -14,10 +14,6 @@
惩罚名称
-
-
惩罚级别
-
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.cshtml index 4ef00d927..baa38d2d7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.cshtml @@ -14,10 +14,6 @@
惩罚类型
-
-
惩罚对象
-
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js index 203a3bbd7..a511ed37a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js @@ -55,11 +55,32 @@ var bootstrap = function ($, learun) { value: 'id', allowSearch: true }) - $('#DeangeUserr').lrformselect({ - layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', - layerUrlW: 400, - layerUrlH: 300, - dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + $('#DeangeUserr').lrGirdSelect({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic', + selectWord: 'stuno', + value: 'stuno', + text: 'stuname', + headData: + [ + { label: "学号", name: "stuno", width: 100, align: "left" }, + { label: "姓名", name: "stuname", width: 100, align: "left" }, + { + label: "班级", name: "classno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + ], + select: function (item) { + $("#DeangeUserr").val(item.stuno); + } }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js index 0ba082280..ace713e42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js @@ -19,7 +19,7 @@ var bootstrap = function ($, learun) { }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/LogisticsManagement/Acc_GoodsDemage/Form', @@ -50,9 +50,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_GoodsDemage/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_GoodsDemage/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -65,7 +65,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/LogisticsManagement/Acc_GoodsDemage/GetPageList', headData: [ - { label: "宿舍楼", name: "Dormitory", width: 100, align: "left", + { + label: "宿舍楼", name: "Dormitory", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData', @@ -75,8 +76,10 @@ var bootstrap = function ($, learun) { callback(_data['name']); } }); - }}, - { label: "单元", name: "Unit", width: 100, align: "left", + } + }, + { + label: "单元", name: "Unit", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData', @@ -86,8 +89,10 @@ var bootstrap = function ($, learun) { callback(_data['name']); } }); - }}, - { label: "楼层", name: "Floor", width: 100, align: "left", + } + }, + { + label: "楼层", name: "Floor", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData', @@ -97,8 +102,10 @@ var bootstrap = function ($, learun) { callback(_data['name']); } }); - }}, - { label: "宿舍", name: "RId", width: 100, align: "left", + } + }, + { + label: "宿舍", name: "RId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData', @@ -108,27 +115,33 @@ var bootstrap = function ($, learun) { callback(_data['name']); } }); - }}, - { label: "物品", name: "Goods", width: 100, align: "left"}, - { label: "价格", name: "Price", width: 100, align: "left"}, - { label: "破坏者", name: "DeangeUserr", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('user', { - key: value, - callback: function (_data) { - callback(_data.name); - } - }); - }}, + } + }, + { label: "物品", name: "Goods", width: 100, align: "left" }, + { label: "价格", name: "Price", width: 100, align: "left" }, + { + label: "破坏者", name: "DeangeUserr", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic', + key: value, + keyId: 'stuno', + callback: function (_data) { + console.log(_data,123) + callback(_data['stuname']); + } + }); + } + }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Index.js index 0192b5074..22fe3aa2a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Index.js @@ -148,9 +148,9 @@ var bootstrap = function ($, learun) { }); } }, - { label: "奖励", name: "RewardContent", width: 100, align: "left" }, - { label: "奖励时间", name: "RTime", width: 100, align: "left" }, - { label: "奖励原因", name: "RReason", width: 100, align: "left" }, + { label: "惩罚", name: "RewardContent", width: 100, align: "left" }, + { label: "惩罚时间", name: "RTime", width: 100, align: "left" }, + { label: "惩罚原因", name: "RReason", width: 100, align: "left" }, ], mainId: 'ID', isPage: true