diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs
index 8ca797f21..17af060d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs
@@ -111,7 +111,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
[AjaxOnly]
public ActionResult GetPageList(string pagination, string queryJson)
{
+
Pagination paginationobj = pagination.ToObject();
+ paginationobj.sidx = "Status";
var data = repairReportStudentIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs
index 64cf47277..05fefc0c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs
@@ -111,6 +111,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject();
+ paginationobj.sidx = "Status";
var data = repairReportTeacherIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml
index c7bd0a918..fd7415263 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml
@@ -105,7 +105,7 @@
tableHtml += '
';
tableHtml += ' ';
tableHtml += ' ';
- tableHtml += (data.DeptNo ? data.DeptNo:"");
+ tableHtml += (data.DeptNo_ ? data.DeptNo_:"");
tableHtml += ' | ';
tableHtml += ' ';
tableHtml += ' ';
@@ -114,7 +114,7 @@
tableHtml += ' ';
tableHtml += ' | ';
tableHtml += ' ';
- tableHtml += (data.MajorNo ? data.MajorNo:"");
+ tableHtml += (data.MajorNo_ ? data.MajorNo_:"");
tableHtml += ' | ';
tableHtml += ' ';
tableHtml += ' ';
@@ -125,7 +125,7 @@
tableHtml += ' ';
tableHtml += ' ';
tableHtml += ' ';
- tableHtml += (data.TeachClassNo ? data.TeachClassNo:"");
+ tableHtml += (data.TeachClassNo_ ? data.TeachClassNo_:"");
tableHtml += ' | ';
tableHtml += ' ';
tableHtml += ' ';
@@ -156,7 +156,7 @@
tableHtml += ' ';
tableHtml += ' | ';
tableHtml += ' ';
- tableHtml += (data.ServiceType ? data.ServiceType:"");
+ tableHtml += (data.ServiceType_ ? data.ServiceType_:"");
tableHtml += ' | ';
tableHtml += '
';
tableHtml += ' ';
@@ -231,7 +231,7 @@
tableHtml += ' ';
tableHtml += ' ';
tableHtml += ' ';
- tableHtml += (data.IsPay == 1 ? "是" : "否");
+ tableHtml += (title.indexOf("结束") >= 0 ? (data.IsPay == 1 ? "是" : "否") : "");
tableHtml += ' | ';
tableHtml += ' ';
tableHtml += ' ';
@@ -240,7 +240,7 @@
tableHtml += ' ';
tableHtml += ' | ';
tableHtml += ' ';
- tableHtml += (data.Amount ? data.Amount : "");
+ tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
tableHtml += ' | ';
tableHtml += '
';
tableHtml += ' ';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js
index 4c6ff3064..2f311cbae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js
@@ -128,28 +128,28 @@ var bootstrap = function ($, learun) {
key: data.ServiceType,
code: 'repairtype',
callback: function (_data) {
- data.ServiceType = _data.text
+ data.ServiceType_ = _data.text
//班级
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: data.TeachClassNo,
keyId: 'classno',
callback: function (_data1) {
- data.TeachClassNo = _data1['classname']
+ data.TeachClassNo_ = _data1['classname']
//专业
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: data.MajorNo,
keyId: 'majorno',
callback: function (_data2) {
- data.MajorNo = _data2['majorname']
+ data.MajorNo_ = _data2['majorname']
//系部
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: data.DeptNo,
keyId: 'deptno',
callback: function (_data3) {
- data.DeptNo = _data3['deptname']
+ data.DeptNo_ = _data3['deptname']
prints(data, "preview", "学生报修维修单(待维修)");
}
});
@@ -178,28 +178,28 @@ var bootstrap = function ($, learun) {
key: data.ServiceType,
code: 'repairtype',
callback: function (_data) {
- data.ServiceType = _data.text
+ data.ServiceType_ = _data.text
//班级
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: data.TeachClassNo,
keyId: 'classno',
callback: function (_data1) {
- data.TeachClassNo = _data1['classname']
+ data.TeachClassNo_ = _data1['classname']
//专业
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: data.MajorNo,
keyId: 'majorno',
callback: function (_data2) {
- data.MajorNo = _data2['majorname']
+ data.MajorNo_ = _data2['majorname']
//系部
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: data.DeptNo,
keyId: 'deptno',
callback: function (_data3) {
- data.DeptNo = _data3['deptname']
+ data.DeptNo_ = _data3['deptname']
prints(selectedRow, "preview", "学生报修单(结束维修)");
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml
index aa26ecc09..c74c95474 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml
@@ -142,7 +142,7 @@
tableHtml += ' ';
tableHtml += ' ';
tableHtml += ' ';
- tableHtml += (data.ServiceType ? data.ServiceType : "");
+ tableHtml += (data.ServiceType_ ? data.ServiceType_ : "");
tableHtml += ' | ';
tableHtml += '
';
tableHtml += ' ';
@@ -217,7 +217,7 @@
tableHtml += ' ';
tableHtml += ' ';
tableHtml += ' ';
- tableHtml += (data.IsPay==1 ? "是" : "否");
+ tableHtml += (title.indexOf("结束")>=0?(data.IsPay==1 ? "是" : "否"):"");
tableHtml += ' | ';
tableHtml += ' ';
tableHtml += ' ';
@@ -226,7 +226,7 @@
tableHtml += ' ';
tableHtml += ' | ';
tableHtml += ' ';
- tableHtml += (data.Amount ? data.Amount : "");
+ tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
tableHtml += ' | ';
tableHtml += '
';
tableHtml += ' ';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js
index 569ec333f..76752ceb5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js
@@ -125,7 +125,7 @@ var bootstrap = function ($, learun) {
key: data.ServiceType,
code: 'repairtype',
callback: function (_data) {
- data.ServiceType = _data.text
+ data.ServiceType_ = _data.text
prints(data, "preview", "教师报修维修单(待维修)");
//callback(_data.text);
}
@@ -146,7 +146,7 @@ var bootstrap = function ($, learun) {
key: data.ServiceType,
code: 'repairtype',
callback: function (_data) {
- data.ServiceType = _data.text
+ data.ServiceType_ = _data.text
prints(data, "preview", "教师报修单(结束维修)");
//callback(_data.text);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs
index 8bcad89ee..67156c26c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs
@@ -64,6 +64,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
strSql.Append(" AND t.Creator = '" + userLogin.userId + "' ");
//}
}
+ //strSql.Append(" order by t.createtime desc");
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)