教学比赛 需求变更

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.cshtml

@@ -3,41 +3,45 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
-        <div id="DepartmentId" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="DepartmentId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">获奖教师<font face="宋体">*</font></div>
-        <div id="TeachNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="TeachNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">获奖内容<font face="宋体">*</font></div>
-        <textarea id="AwardContent" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <textarea id="AwardContent" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
-        <input id="AwardTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AwardTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="AwardTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AwardTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">发奖单位<font face="宋体">*</font></div>
         <input id="AwardingUnit" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-4 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">级别<font face="宋体">*</font></div>
-        <div id="Grade" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">类别<font face="宋体">*</font></div>
-        <div id="Classes" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Classes" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
+        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <div id="TType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">奖励金额</div>
-        <input id="Money" type="number" class="form-control"  />
+        <input id="Money" type="number" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingCompetition" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingCompetition">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js

@@ -19,6 +19,7 @@ var bootstrap = function ($, learun) {
             $('#TeachNo').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' });
             $('#Grade').lrDataItemSelect({ code: 'Level' });
             $('#Classes').lrDataItemSelect({ code: 'Classes' });
+            $('#TType').lrDataItemSelect({ code: 'TType' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -150,17 +150,14 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "奖励金额", name: "Money", width: 100, align: "left" },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
                     {
-                        label: "评价教师", name: "EvaluateTeacher", width: 100, align: "left",
+                        label: "类型", name: "TType", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'f_userid',
+                                code: 'TType',
                                 callback: function (_data) {
-                                    callback(_data['f_realname']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -177,6 +174,21 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "奖励金额", name: "Money", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: "评价教师", name: "EvaluateTeacher", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "评价时间", name: "EvaluateTime", width: 100, align: "left"
                         , formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionEntity.cs

@@ -93,6 +93,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("EVALUATEREMARK")]
         public string EvaluateRemark { get; set; }
+        [Column("TType")]
+        public string TType { get; set; }
         #endregion
 
         #region 扩展操作