bjquanjiang
/
DigitalScholl
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

报修修复

塔里木分支
hwh2023 1年前
父节点
bc70e7de79
当前提交
8e0f267633
共有 7 个文件被更改，包括 23 次插入 和 19 次删除
分列视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs
  2. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs
  3. +6
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml
  4. +8
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js
  5. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js
  7. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs

+ 2
- 0
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<Pagination>();
paginationobj.sidx = "Status";
var data = repairReportStudentIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new


+ 1
- 0
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<Pagination>();
paginationobj.sidx = "Status";
var data = repairReportTeacherIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{


+ 6
- 6
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml 查看文件

@@ -105,7 +105,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.DeptNo ? data.DeptNo:"");
tableHtml += (data.DeptNo_ ? data.DeptNo_:"");
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += ' <p class="MsoNormal" align="center" style="text-align:center">';
@@ -114,7 +114,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.MajorNo ? data.MajorNo:"");
tableHtml += (data.MajorNo_ ? data.MajorNo_:"");
tableHtml += ' </td>';
tableHtml += ' </tr>';
tableHtml += ' <tr>';
@@ -125,7 +125,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.TeachClassNo ? data.TeachClassNo:"");
tableHtml += (data.TeachClassNo_ ? data.TeachClassNo_:"");
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += ' <p class="MsoNormal" align="center" style="text-align:center">';
@@ -156,7 +156,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.ServiceType ? data.ServiceType:"");
tableHtml += (data.ServiceType_ ? data.ServiceType_:"");
tableHtml += ' </td>';
tableHtml += ' </tr>';
tableHtml += ' <tr style="mso-yfti-irow:6;height:96.6pt">';
@@ -231,7 +231,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.IsPay == 1 ? "是" : "否");
tableHtml += (title.indexOf("结束") >= 0 ? (data.IsPay == 1 ? "是" : "否") : "");
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += ' <p class="MsoNormal">';
@@ -240,7 +240,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.Amount ? data.Amount : "");
tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
tableHtml += ' </td>';
tableHtml += ' </tr>';
tableHtml += ' <tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';


+ 8
- 8
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", "学生报修单（结束维修）");
}
});


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml 查看文件

@@ -142,7 +142,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.ServiceType ? data.ServiceType : "");
tableHtml += (data.ServiceType_ ? data.ServiceType_ : "");
tableHtml += ' </td>';
tableHtml += ' </tr>';
tableHtml += ' <tr style="mso-yfti-irow:6;height:96.6pt">';
@@ -217,7 +217,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.IsPay==1 ? "是" : "否");
tableHtml += (title.indexOf("结束")>=0?(data.IsPay==1 ? "是" : "否"):"");
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += ' <p class="MsoNormal">';
@@ -226,7 +226,7 @@
tableHtml += ' </p>';
tableHtml += ' </td>';
tableHtml += ' <td valign="top" style="border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:0cm 5.4pt 0cm 5.4pt">';
tableHtml += (data.Amount ? data.Amount : "");
tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
tableHtml += ' </td>';
tableHtml += ' </tr>';
tableHtml += ' <tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';


+ 2
- 2
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);
}


+ 1
- 0
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<RepairReport_TeacherEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)


撰写 预览
正在加载...
取消
保存