From 57c25c5d3d04aa32cd6bdd2f9ee722609488c62c Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 8 Mar 2022 15:49:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=83=A9=E7=BD=9A=E5=A5=96=E5=8A=B1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AwardAndPunishment/AwardForm.js | 2 +- .../Views/AwardAndPunishment/Index.js | 4 +- .../Views/AwardPunishInfo/AwardForm.js | 75 +++++++++---------- 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js index 77c55ea0d..c9400de3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#AwardType').lrDataItemSelect({ code: 'AwardType' }); + $('#AwardType').lrDataItemSelect({ code: 'EncouragementDegree' }); $('#NatureType').lrselect({ data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }], text: "text", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js index a22043ff5..79ded0fee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js @@ -110,10 +110,10 @@ var bootstrap = function ($, learun) { { label: "奖励代码", name: "CodePrize", width: 100, align: "left" }, { label: "奖励级别", name: "AwardType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { + formatterAsync: function(callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'AwardType', + code: 'EncouragementDegree', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js index d8a4d3a73..970e79dc9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js @@ -21,26 +21,25 @@ var bootstrap = function ($, learun) { value: 'id', text: 'awardname', headData: - [ - { label: "奖励类型", name: "awardname", width: 100, align: "left" }, - { - label: '奖励属性', name: 'naturetype', width: 100, align: "left", - formatter: function (val) { - if (val == '0') { return '集体'; } - else { return '个人'; } - } - }, - { - label: "奖励级别", name: "awardtype", width: 100, align: "left", - formatterAsync: function (callback, value) { - learun.clientdata.getAsync('dataItem', - { - key: value,code: 'AwardType', - callback: function (_data) {callback(_data.text);} - }); + [ + { label: "奖励类型", name: "awardname", width: 100, align: "left" }, + { + label: '奖励属性', name: 'naturetype', width: 100, align: "left", + formatter: function (val) { + if (val == '0') { return '集体'; } + else { return '个人'; } + } }, - } - ], + { + label: "奖励级别", name: "awardtype", width: 100, align: "left", + formatterAsync: function (callback, value) { + learun.clientdata.getAsync('dataItem', { + key: value, code: 'EncouragementDegree', + callback: function (_data) { callback(_data.text); } + }); + }, + } + ], select: function (item) { $("#NatureType").val(item.awardname); $("#shuxing").val(item.naturetype); @@ -53,23 +52,23 @@ var bootstrap = function ($, learun) { 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']); - } - }); - } - }, - ], + [ + { 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) { $("#StuId").val(item.stuno); $("#RewardObjects").val(item.stuname); @@ -86,7 +85,7 @@ var bootstrap = function ($, learun) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); @@ -94,7 +93,7 @@ var bootstrap = function ($, learun) { } }); } - $('#IsVaild').val('0'); + $('#IsVaild').val('0'); } }; // 保存数据