diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index ef9d72447..79cbcddee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -147,10 +147,10 @@
部门*
-
+ @*
系部
-
+
*@
岗位类别
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index b6d9557e5..c4948f653 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -48,7 +48,7 @@ var bootstrap = function ($, learun) { $("#ForeignLanguageNo").parent().hide(); $("#EmpSortNo").parent().hide(); $("#EmpFullTimeNo").parent().hide(); - $("#DeptNo").parent().hide(); + //$("#DeptNo").parent().hide(); $("#TitleOfTechPostNo").parent().hide(); $("#InSchoolDate").parent().hide(); $("#resume").parent().hide(); @@ -127,7 +127,7 @@ var bootstrap = function ($, learun) { $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' }); $('#Photo').lrUploader(); $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index d50374b93..a3ce1de60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
部门
-
+ @*
系部
-
+
*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index 9f1bb64ba..ca29ab2d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index f8c885a1e..36ecf66d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -22,10 +22,10 @@
联系电话
-
+ @*
系部
-
+
*@
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index a5487d379..f1080e9ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 280, 400); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { @@ -364,19 +364,19 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "系部", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, + //{ + // label: "系部", name: "DeptNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptno', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // } + //}, { label: "性别", name: "GenderNo", width: 80, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml index c7f49e031..00c2cbcb8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml @@ -36,7 +36,7 @@ 政治面貌 @Model.PartyFaceNo 入党时间 - @(Model.JoinPartyTime.HasValue ? Model.JoinPartyTime.Value.ToShortDateString().Replace("/", "-") : "") + @(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "") 最高学历（学位） @Model.HighestRecord diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml index a5a99d2ad..b28177bcb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml @@ -7,21 +7,25 @@
教师姓名*
-
-
资格种类
-
-
-
-
任教学科*
- +
+
证书名称*
+
-
+
证书编号*
-
+
+
资格种类
+
+
+
+
任教学科
+ +
+
取得时间*
- +
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js index f1dd57a33..94f26ecb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js @@ -16,11 +16,12 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' }); - $('#TCName').lrformselect({ - layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', - layerUrlW: 400, - layerUrlH: 300, - dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + $('#TCName').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml index 71998f003..b36e0db23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml @@ -7,8 +7,26 @@
-
+ @*
+
*@ +
+
+
+
+
教师姓名
+
+
+
+
证书名称
+ +
+
+
资格种类
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js index 6174d3dae..2615111ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js @@ -15,6 +15,9 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); // 时间搜索框 $('#datesearch').lrdate({ dfdata: [ @@ -42,6 +45,14 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#TCName').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -101,14 +112,18 @@ var bootstrap = function ($, learun) { { label: "教师姓名", name: "TCName", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', key: value, + keyId: 'empid', callback: function (_data) { - callback(_data.name); + callback(_data['empname']); } }); } }, + { label: "证书名称", name: "TCType", width: 150, align: "left" }, + { label: "证书编号", name: "TCCode", width: 150, align: "left" }, { label: "资格种类", name: "TCTypeID", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -122,17 +137,18 @@ var bootstrap = function ($, learun) { } }, { label: "任教学科", name: "TCClass", width: 100, align: "left" }, - { label: "证书编号", name: "TCCode", width: 100, align: "left" }, { label: "取得时间", name: "TCTime", width: 100, align: "left" }, ], mainId: 'TCID', - isPage: true + isPage: true, + sidx:'TCTime desc' }); + page.search(); }, search: function (param) { param = param || {}; - param.StartTime = startTime; - param.EndTime = endTime; + //param.StartTime = startTime; + //param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 11a2e6672..489b3b61f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -13,12 +13,12 @@ --> - + + + + - + + - +