我的班级and学生学籍管理调整显示列

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

@@ -237,6 +237,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    { label: "考生号", name: "ksh", width: 100, align: "left" },
+                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -322,72 +324,198 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'QRCodeHealthStatus',
+                                code: 'StudyModality',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+                    { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
+                    //{ label: "余额", name: "Balance", width: 100, align: "left" },
+                    { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
+                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
                     {
-                        label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'StudyModality',
+                                code: 'ResidenceNo',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
-                    { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
-                    { label: "余额", name: "Balance", width: 100, align: "left" },
-                    { label: "通信地址", name: "MailAddress", width: 100, align: "left" },
-                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     {
-                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
-                        formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        label: "籍贯 (省)", name: "F_ProvinceId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "籍贯 (市)", name: "F_CityId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
                         }
                     },
                     {
-                        label: "异动类型", name: "MoveType", width: 100, align: "left" ,
+                        label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+                                key: value,
+                                keyId: 'acode',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "E-mail", name: "E-mail", width: 100, align: "center" },
+                    {
+                        label: "开户银行", name: "DepositBank", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'StuChangeType',
+                                code: 'DepositBank',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
+                    { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
                     {
-                        label: "审核状态", name: "CheckMark", width: 80, align: "center",
+                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoBit',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
+                    { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
+                    { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
+                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
+                    { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
+                    { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
+                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    {
+                        label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdFamilyOrigin',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "港澳台侨", name: "OverseasChineseNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdOverseasChinese',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CollegeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    {
+                        label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
                         formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
+                    {
+                        label: "入党时间", name: "BankCard", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
                     {
-                        label: '开户银行', name: 'DepositBank', width: 100, align: "center",
+                        label: "入团时间", name: "BankCard", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    { label: "QQ", name: "QQ", width: 100, align: "center" },
+                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    { label: "备注", name: "Remark", width: 200, align: "center" },
+                    {
+                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    {
+                        label: "异动类型", name: "MoveType", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'DepositBank',
+                                code: 'StuChangeType',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: '银行卡账号', name: 'BankCard', width: 150, align: "center" },
-                    { label: '开户银行位置', name: 'BankLocation', width: 200, align: "center" },
+                    {
+                        label: "审核状态", name: "CheckMark", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                        }
+                    }
                 ],
                 mainId: 'StuId',
                 isPage: true,

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

@@ -101,11 +101,13 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表 
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    { label: "考生号", name: "ksh", width: 100, align: "left" },
+                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -127,6 +129,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdPartyFace',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "系所", name: "DeptNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -191,12 +205,180 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
+                    //{ label: "余额", name: "Balance", width: 100, align: "left" },
+                    { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
+                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+                    {
+                        label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ResidenceNo',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "籍贯 (省)", name: "F_ProvinceId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "籍贯 (市)", name: "F_CityId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+                                key: value,
+                                keyId: 'acode',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "E-mail", name: "E-mail", width: 100, align: "center" },
                     {
-                        label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
+                        label: "开户银行", name: "DepositBank", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepositBank',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
+                    { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
+                    {
+                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoBit',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
+                    { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
+                    { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
+                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
+                    { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
+                    { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
+                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    {
+                        label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdFamilyOrigin',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "港澳台侨", name: "OverseasChineseNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdOverseasChinese',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CollegeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    {
+                        label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
+                    {
+                        label: "入党时间", name: "BankCard", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "入团时间", name: "BankCard", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    { label: "QQ", name: "QQ", width: 100, align: "center" },
+                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    { label: "备注", name: "Remark", width: 200, align: "center" },
+                    {
+                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
+                    {
+                        label: "异动类型", name: "MoveType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "审核状态", name: "CheckMark", width: 80, align: "center",
                         formatter: function (cellvalue) {