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 @@
-->
-
+
+
+
+
-
+
+
-
+