Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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",

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

@@ -4,11 +4,11 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
-        <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">惩罚名称<font face="宋体">*</font></div>
         <input id="AwardName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
-        <div class="lr-form-item-title">奖励代码<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">惩罚代码<font face="宋体">*</font></div>
         <input id="CodePrize" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml

@@ -11,13 +11,9 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <div class="lr-form-item-title">惩罚名称</div>
                                     <input id="AwardName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励级别</div>
-                                    <div id="AwardType"></div>
-                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            $('#AwardType').lrDataItemSelect({ code: 'EncouragementDegree' });
             $('#NatureType').lrselect({
                 data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
                 text: "text",
@@ -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);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <div class="lr-form-item-title">惩罚名称</div>
                                     <input id="AwardName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励级别</div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">惩罚级别</div>
                                     <div id="AwardType"></div>
-                                </div>
+                                </div>*@
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            //$('#AwardType').lrDataItemSelect({ code: 'EncouragementDegree' });
             $('#NatureType').lrselect({
                 data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
                 text: "text",
@@ -79,7 +79,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认启用选择项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -88,11 +88,11 @@ var bootstrap = function ($, learun) {
             });
             //禁用
             $('#lr_disabled').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认禁用选择项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -105,8 +105,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetPageList',
                 headData: [
-                    { label: "奖励名称", name: "AwardName", width: 100, align: "left" },
-                    { label: "奖励代码", name: "CodePrize", width: 100, align: "left" },
+                    { label: "惩罚名称", name: "AwardName", width: 100, align: "left" },
+                    { label: "惩罚代码", name: "CodePrize", width: 100, align: "left" },
                     {
                         label: '状态', name: 'IsValid', width: 100, align: "left",
                         formatter: function (cellvalue) {

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,11 +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" },
-                ],
+                    [
+                        { 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);
@@ -74,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]);
@@ -82,7 +93,7 @@ var bootstrap = function ($, learun) {
                     }
                 });
             }
-           $('#IsVaild').val('0');
+            $('#IsVaild').val('0');
         }
     };
     // 保存数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.cshtml

@@ -14,10 +14,10 @@
                                     <div class="lr-form-item-title">奖励类型</div>
                                     <div id="NatureType"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">奖励对象</div>
                                     <div id="StuName"></div>
-                                </div>
+                                </div>*@
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js

@@ -40,7 +40,7 @@ var bootstrap = function ($, learun) {
                                 learun.clientdata.getAsync('dataItem',
                                     {
                                         key: value,
-                                        code: 'AwardType',
+                                        code: 'EncouragementDegree',
                                         callback: function(_data) {
                                             callback(_data.text);
                                         }
@@ -54,7 +54,7 @@ var bootstrap = function ($, learun) {
                     $("#awardtype").val(item.awardtype);
                 }
             });
-            $('#RewardObjects').lrGirdSelect({
+            $('#StuName').lrGirdSelect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                 selectWord: 'stuno',
                 value: 'stuno',
@@ -63,7 +63,19 @@ var bootstrap = function ($, learun) {
                     [
                         { label: "学号", name: "stuno", width: 100, align: "left" },
                         { label: "姓名", name: "stuname", width: 100, align: "left" },
-                        { label: "班级", name: "classno", 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);

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

@@ -27,7 +27,19 @@ var bootstrap = function ($, learun) {
                     [
                         { label: "学号", name: "stuno", width: 100, align: "left"},
                         { label: "姓名", name: "stuname", width: 100, align: "left" },
-                        { label: "班级", name: "classno", 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);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.cshtml

@@ -14,10 +14,6 @@
                                     <div class="lr-form-item-title">惩罚类型</div>
                                     <div id="NatureType"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">惩罚对象</div>
-                                    <div id="StuName"></div>
-                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -88,8 +88,8 @@
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
-        <input id="PostalCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">邮政编码</div>
+        <input id="PostalCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口所在地</div>
@@ -111,6 +111,14 @@
         <div class="lr-form-item-title">与监护人关系<font face="宋体">*</font></div>
         <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">实习状态</div>
+        <div id="InternshipStatus" type="text" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否实习</div>
+        <div id="IsRestudy" type="text" class="form-control"></div>
+    </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
                 <div class="lr-form-item-title">父亲姓名<font face="宋体">*</font></div>
                 <input id="FatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -186,7 +194,7 @@
         <div class="lr-form-item-title">毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>

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

@@ -176,6 +176,8 @@ var bootstrap = function ($, learun) {
             $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
+            $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' });
+            $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' });
 
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml

@@ -88,8 +88,8 @@
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
-        <input id="PostalCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">邮政编码</div>
+        <input id="PostalCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口所在地</div>
@@ -111,6 +111,14 @@
         <div class="lr-form-item-title">与监护人关系<font face="宋体">*</font></div>
         <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">实习状态</div>
+        <div id="InternshipStatus" type="text" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否实习</div>
+        <div id="IsRestudy" type="text" class="form-control"></div>
+    </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
             <div class="lr-form-item-title">父亲姓名<font face="宋体">*</font></div>
             <input id="FatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -187,7 +195,7 @@
         <div class="lr-form-item-title">毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js

@@ -176,6 +176,8 @@ var bootstrap = function ($, learun) {
             $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
+            $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' });
+            $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' });
         },
         initData: function () {
             if (!!keyValue) {

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 () {

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 () {

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -758,6 +758,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("FiveYear")]
         public string FiveYear { get; set; }
+        /// <summary>
+        /// 实习状态
+        /// </summary>
+        [Column("INTERNSHIPSTATUS")]
+        public string InternshipStatus { get; set; }
+        /// <summary>
+        /// 是否复读
+        /// </summary>
+        [Column("ISRESTUDY")]
+        public string IsRestudy { get; set; }
         #endregion
 
         #region  扩展操作