From 16137343f557e923b12446ceafa5be4a888a43d8 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 28 Apr 2023 15:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/InternShipSignUp/Form.cshtml | 61 +++++++++++++------ .../Views/InternShipSignUp/Form.js | 29 ++++----- .../Views/InternShipSignUp/Index.js | 27 +++++--- .../Views/PracticeTeacherSummary/Form.cshtml | 4 ++ .../Views/PracticeTeacherSummary/Form.js | 3 +- .../Views/TextBookInfo/Form.cshtml | 2 +- .../Views/TextBookInfo/Index.js | 5 +- .../Views/BC_EffectEvaluation/Form.cshtml | 8 +++ .../Views/BC_EffectEvaluation/Index.js | 6 +- .../InternShipSignUpEntity.cs | 14 +++++ .../InternShipSignUpService.cs | 13 +--- .../Practice_Teacher_SummaryEntity.cs | 2 + .../TextBookInfo/TextBookInfoEntity.cs | 2 +- .../BC_EffectEvaluationEntity.cs | 6 ++ .../BC_EffectEvaluationService.cs | 10 +-- 15 files changed, 122 insertions(+), 70 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.cshtml index 4101ee550..20d1f3015 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.cshtml @@ -3,37 +3,62 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
学生名字
- +
+
序号
+
-
+
+
姓名
+ +
+
+
性别
+
+
+
+
身份证号
+ +
+
+
民族
+
+
+
+
班级
+ +
+
+
本人联系电话
+ +
+
+
家长联系电话
+ +
+
实习单位
-
+
-
+
实习岗位
-
+
-
+
实习时间
- -
-
-
联系方式
- +
-
+ +
审批人
- +
-
+
审批结果
-
+
实习内容
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js index 7102358b2..b8a85b291 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js @@ -19,22 +19,23 @@ var bootstrap = function ($, learun) { type: 'radio', code: 'YesOrNoInt', }); - + $('#xb').lrDataItemSelect({ code: 'usersexbit'}); + $('#mz').lrDataItemSelect({ code: 'National' }); //实习基地 - $('#IUnit').lrselect({ - text: 'name', - value: 'id', - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=PracticeBase', - select: function (item) { - if (item) { - $('#IPost').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "PBPost", strWhere: "PBID='" + item.id + "'" } - }); - } + //$('#IUnit').lrselect({ + // text: 'name', + // value: 'id', + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=PracticeBase', + // select: function (item) { + // if (item) { + // $('#IPost').lrselectRefresh({ + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + // param: { code: "PBPost", strWhere: "PBID='" + item.id + "'" } + // }); + // } - } - }); + // } + //}); //实习岗位 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Index.js index 679c17903..8deee10ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSignUp/Index.js @@ -65,23 +65,34 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/InternShipSignUp/GetPageList', headData: [ - { label: "学生名字", name: "StudentID", width: 100, align: "left" }, + { label: "序号", name: "xh", width: 100, align: "left" }, + { label: "姓名", name: "StudentID", width: 100, align: "left" }, { - label: "实习单位", name: "IUnit", width: 100, align: "left", + label: "性别", name: "xb", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { label: "身份证号", name: "sfzh", width: 100, align: "left" }, + { + label: "民族", name: "mz", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PracticeBase', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'id', + code: 'National', callback: function (_data) { - callback(_data['name']); + callback(_data.text); } }); } }, + { label: "班级", name: "classname", width: 100, align: "left" }, + { label: "本人联系电话", name: "Mobile", width: 100, align: "left" }, + { label: "家长联系电话", name: "jzMobile", width: 100, align: "left" }, + { label: "实习单位", name: "IUnit", width: 100, align: "left" }, { label: "实习岗位", name: "IPost", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -96,7 +107,7 @@ var bootstrap = function ($, learun) { } }, { label: "实习时间", name: "ITime", width: 100, align: "left" }, - { label: "联系方式", name: "Mobile", width: 100, align: "left" }, + { label: "审批人", name: "Cjhecker", width: 100, align: "left" }, { label: "审批结果", name: "Status", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.cshtml index f1623e834..4e2957480 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.cshtml @@ -15,6 +15,10 @@
总结时间*
+
+
附件
+
+
总结详情*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.js index c42b17946..da20d2ba4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeTeacherSummary/Form.js @@ -15,7 +15,8 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#TeacherId').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' }); + $('#TeacherId').lrDataSourceSelect({ code: 'EmpInfo', value: 'empid', text: 'empname' }); + $('#fj').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Form.cshtml index f3924ec83..8a9b75ac5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Form.cshtml @@ -29,7 +29,7 @@
出版日期*
- +
出版社*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Index.js index 20158fcb6..d16d00e50 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookInfo/Index.js @@ -144,10 +144,7 @@ var bootstrap = function ($, learun) { { label: "第一作者", name: "FirstAuthor", width: 100, align: "left" }, { label: "其他作者", name: "OtherAuthor", width: 100, align: "left" }, { - label: "出版日期", name: "Pubdate", width: 80, align: "left", - formatter: function (value) { - return learun.formatDate(value, 'yyyy-MM-dd'); - } + label: "出版日期", name: "Pubdate", width: 100, align: "left" }, { label: "出版社", name: "Publisher", width: 100, align: "left" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Form.cshtml index 75858aad5..1953ba4fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Form.cshtml @@ -11,6 +11,14 @@
评估对象
+
+
序号
+ +
+
+
班级
+ +
评估结果
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Index.js index 15e137725..76e9d4589 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Index.js @@ -66,11 +66,13 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/PersonnelManagement/BC_EffectEvaluation/GetPageList', headData: [ { label: "评估人", name: "Name", width: 100, align: "left"}, - { label: "评估对象", name: "Name1", width: 100, align: "left"}, + { label: "评估对象", name: "Name1", width: 100, align: "left" }, + { label: "序号", name: "xh", width: 100, align: "left" }, + { label: "班级", name: "classname", width: 100, align: "left" }, { label: "评估结果", name: "Result", width: 100, align: "left"}, { label: "评估时间", name: "ResultTime", width: 100, align: "left"}, { label: "备注", name: "Remark", width: 100, align: "left"}, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpEntity.cs index 845d34a98..d8af973e9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpEntity.cs @@ -24,6 +24,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("STUDENTID")] public string StudentID { get; set; } + + [Column("XB")] + public bool xb { get; set; } + [Column("XH")] + public string xh { get; set; } + [Column("SFZH")] + public string sfzh { get; set; } + [Column("MZ")] + public string mz { get; set; } + [Column("CLASSNAME")] + public string classname { get; set; } + + [Column("JZMOBILE")] + public string jzMobile { get; set; } /// /// 实习单位 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpService.cs index 660d9eedd..f92001d27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpService.cs @@ -29,18 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.StudentID, - t.IUnit, - t.IPost, - t.ITime, - t.Mobile, - t.Cjhecker, - t.Status, - t.IContent - "); + strSql.Append("SELECT * "); strSql.Append(" FROM InternShipSignUp t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeTeacherSummary/Practice_Teacher_SummaryEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeTeacherSummary/Practice_Teacher_SummaryEntity.cs index 6990e92ef..156b668eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeTeacherSummary/Practice_Teacher_SummaryEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeTeacherSummary/Practice_Teacher_SummaryEntity.cs @@ -64,6 +64,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } + [Column("FJ")] + public string fj { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookInfo/TextBookInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookInfo/TextBookInfoEntity.cs index de827f00f..059092a12 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookInfo/TextBookInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookInfo/TextBookInfoEntity.cs @@ -53,7 +53,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 出版日期 /// [Column("PUBDATE")] - public DateTime? Pubdate { get; set; } + public string Pubdate { get; set; } /// /// 出版社 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationEntity.cs index 6ca6b7b1b..92a54386b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationEntity.cs @@ -29,6 +29,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("NAME1")] public string Name1 { get; set; } + + [Column("XH")] + public string xh { get; set; } + + [Column("CLASSNAME")] + public string classname { get; set; } /// /// 评估结果 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationService.cs index 952aef29b..82cbfffc2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationService.cs @@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.Name, - t.Name1, - t.Result, - t.ResultTime, - t.Remark - "); + strSql.Append("SELECT * "); strSql.Append(" FROM BC_EffectEvaluation t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject();