报修完成

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs

@@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
     public class RepairReportStudentController : MvcControllerBase
     {
         private RepairReportStudentIBLL repairReportStudentIBLL = new RepairReportStudentBLL();
+        private RepairStudent_rejectlogIBLL logbll = new RepairStudent_rejectlogBLL();
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
         private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
         private DataItemIBLL dataItemIBLL = new DataItemBLL();
@@ -112,6 +113,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = repairReportStudentIBLL.GetPageList(paginationobj, queryJson);
+            
             var jsonData = new
             {
                 rows = data,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairStudent_rejectlogController.cs

@@ -0,0 +1,122 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public class RepairStudent_rejectlogController : MvcControllerBase
+    {
+        private RepairStudent_rejectlogIBLL repairStudent_rejectlogIBLL = new RepairStudent_rejectlogBLL();
+        private RepairReportStudentIBLL repairReportStudentIBLL = new RepairReportStudentBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = repairStudent_rejectlogIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var RepairStudent_rejectlogData = repairStudent_rejectlogIBLL.GetRepairStudent_rejectlogEntity( keyValue );
+            var jsonData = new {
+                RepairStudent_rejectlog = RepairStudent_rejectlogData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            repairStudent_rejectlogIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            RepairStudent_rejectlogEntity entity = strEntity.ToObject<RepairStudent_rejectlogEntity>();
+            entity.Rid = keyValue;
+            repairStudent_rejectlogIBLL.SaveEntity("",entity);
+            RepairReport_StudentEntity report = repairReportStudentIBLL.GetRepairReport_StudentEntity(keyValue);
+            report.Status = 0;
+            repairReportStudentIBLL.SaveEntity(keyValue, report);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairTeacher_rejectlogController.cs

@@ -0,0 +1,122 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public class RepairTeacher_rejectlogController : MvcControllerBase
+    {
+        private RepairTeacher_rejectlogIBLL repairTeacher_rejectlogIBLL = new RepairTeacher_rejectlogBLL();
+        private RepairReportTeacherIBLL repairReportteacherIBLL = new RepairReportTeacherBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = repairTeacher_rejectlogIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var RepairTeacher_rejectlogData = repairTeacher_rejectlogIBLL.GetRepairTeacher_rejectlogEntity( keyValue );
+            var jsonData = new {
+                RepairTeacher_rejectlog = RepairTeacher_rejectlogData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            repairTeacher_rejectlogIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            RepairTeacher_rejectlogEntity entity = strEntity.ToObject<RepairTeacher_rejectlogEntity>();
+            entity.Rid = keyValue;
+            repairTeacher_rejectlogIBLL.SaveEntity("",entity);
+            RepairReport_TeacherEntity report = repairReportteacherIBLL.GetRepairReport_TeacherEntity(keyValue);
+            report.Status = 0;
+            repairReportteacherIBLL.SaveEntity(keyValue, report);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/FormView.cshtml

@@ -75,6 +75,14 @@
         <div class="lr-form-item-title">维修图片</div>
         <div id="RepairImg"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">是否付款<font face="宋体">*</font></div>
+        <div id="IsPay" disabled></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">付款金额</div>
+        <input id="Amount" type="text" class="form-control" disabled />
+    </div>
     <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
         <span>评价</span>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/FormView.js

@@ -11,6 +11,7 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            $("#IsPay").lrDataItemSelect({ code: 'YesOrNoInt' });
             page.bind();
             page.initData();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/Index.js

@@ -276,6 +276,9 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { label: "驳回人", name: "rejectuser", width: 100, align: "left"},
+                    { label: "驳回时间", name: "rejecttime", width: 100, align: "left"},
+                    { label: "驳回原因", name: "rejectreason", width: 100, align: "left"},
                 ],
                 mainId:'ID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealFormView.cshtml

@@ -75,6 +75,14 @@
         <div class="lr-form-item-title">维修图片<font face="宋体">*</font></div>
         <div id="RepairImg" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">是否付款<font face="宋体">*</font></div>
+        <div id="IsPay" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">付款金额</div>
+        <input id="Amount" class="form-control" />
+    </div>
     @*<div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
             <span>评价</span>
         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealFormView.js

@@ -11,6 +11,7 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            $("#IsPay").lrDataItemSelect({ code: 'YesOrNoInt' });
             page.bind();
             page.initData();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml

@@ -2,7 +2,9 @@
     ViewBag.Title = "教师报修";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<style id="style1" media="print">
+</style>
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -15,11 +17,13 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                 
+
                     <div class=" btn-group btn-group-sm">
                         <a id="lr-look" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 查看</a>
                         <a id="lr-deal" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 维修处理</a>
                         <a id="lr-reject" class="btn btn-warning"><i class="fa fa-plus"></i>&nbsp; 驳回</a>
+                        <a id="lr-printwait" class="btn btn-warning"><i class="fa fa-plus"></i>&nbsp; 维修打印</a>
+                        <a id="lr-printfinish" class="btn btn-warning btn-"><i class="fa fa-plus"></i>&nbsp; 打印存档</a>
                     </div>
                 </div>
             </div>
@@ -28,3 +32,271 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js")
+<script src="~/Content/static/js/LodopFuncs.js"></script>
+<script>
+    var num = 0,
+        tableNum = 1,
+        html = '';
+
+    function prints(data, flag, title) {
+        //初始化数据
+        num = 0, tableNum = 1, html = '';
+
+        var htmlHead = "",
+            tableHtml = '';
+
+        //数据处理
+        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;">';
+        tableHtml += '	<tbody>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<b>';
+        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">' + title + '</span>';
+        tableHtml += '					</b>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">单据编号';
+        tableHtml += '					</span>';
+        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.OrderNumber;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">提交日期';
+        tableHtml += '					</span>';
+        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.CreateTime;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '			<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人姓名';
+        tableHtml += '					</span>';
+        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.CreatorName;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">学号';
+        tableHtml += '					</span>';
+        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.StuNo;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">系/学院';
+        tableHtml += '					</span>';
+        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;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">专业';
+        tableHtml += '					</span>';
+        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;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">班级';
+        tableHtml += '					</span>';
+        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;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">联系电话';
+        tableHtml += '					</span>';
+        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.Contact;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修地址';
+        tableHtml += '					</span>';
+        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.Address;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修类型';
+        tableHtml += '					</span>';
+        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;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:6;height:96.6pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:96.6pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">故障描述';
+        tableHtml += '					</span>';
+        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;height:96.6pt">';
+        tableHtml += data.Remark;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:7;height:92.5pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:92.5pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">给维修人员留言';
+        tableHtml += '					</span>';
+        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;height:92.5pt">';
+        tableHtml += data.LeaveMsg;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<b>';
+        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">维修处理信息</span>';
+        tableHtml += '					</b>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">处理日期';
+        tableHtml += '					</span>';
+        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.RepairTime ? data.RepairTime : "");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:10;height:95.4pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:95.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">故障原因';
+        tableHtml += '					</span>';
+        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;height:95.4pt">';
+        tableHtml += (data.Reason ? data.Reason : "");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:11;height:94.85pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:94.85pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">耗材信息';
+        tableHtml += '					</span>';
+        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;height:94.85pt">';
+        tableHtml += (data.Material ? data.Material : "");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">是否付款';
+        tableHtml += '					</span>';
+        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 += '			</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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:  宋体">付款金额';
+        tableHtml += '					</span>';
+        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 += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人签字';
+        tableHtml += '					</span>';
+        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;height:67.0pt">';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '	</tbody>';
+        tableHtml += '</table>';
+        html += tableHtml;
+        numJudge(htmlHead, tableHtml)
+        AddPrintContent(html, flag);
+    };
+
+    function AddPrintContent(html, flag) {
+        var myHtml = myHtml = html;
+        var strBodyStyle = "<style>" + document.getElementById("style1").innerHTML + "</style>";
+        var strFormHtml = strBodyStyle + "<body>" + myHtml + "</body>";
+
+        LODOP = getLodop();
+        LODOP.PRINT_INIT("教师报修");
+        LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "A4");
+
+        LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
+        LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
+
+        LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', strFormHtml);
+        LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
+        if (flag == "preview") {
+            //打印预览
+            LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 2);
+            var TaskID1 = LODOP.PREVIEW();
+        } else if (flag == "print") {
+            // 直接打印
+            var TaskID1 = LODOP.PRINT();
+        }
+        //打印设计
+        //		var TaskID1 = LODOP.PRINT_DESIGN();
+
+    };
+
+    function numJudge(htmlHead, tableHtml) {
+        num++;
+        if (num > 29) {
+            num = 0;
+            if (tableNum >= 3) {
+                tableNum = 1;
+                html += '</table></div></div>' + htmlHead + tableHtml
+            } else {
+                html += '</table></div>' + tableHtml;
+                tableNum++
+            }
+        };
+
+    };
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js

@@ -13,6 +13,8 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $("#lr-reject").hide()
+            $("#lr-printwait").hide()
+            $("#lr-printfinish").hide()
             page.initGird();
             page.bind();
         },
@@ -99,16 +101,117 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'formview',
-                        title: '维修处理',
-                        url: top.$.rootUrl + '/LogisticsManagement/RepairReportStudent/dealFormView?keyValue=' + keyValue,
-                        width: 1000,
-                        height: 600,
+                        title: '驳回',
+                        url: top.$.rootUrl + '/LogisticsManagement/RepairStudent_rejectlog/Form?rid=' + keyValue,
+                        width: 500,
+                        height: 300,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }
             });
+            //维修打印
+            $('#lr-printwait').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.Status != 1) {
+                        learun.alert.warning("当前记录状态错误！");
+                        return false;
+                    }
+
+                    var data = selectedRow;
+                    console.log(data)
+                    //报修类型
+                    learun.clientdata.getAsync('dataItem', {
+                        key: data.ServiceType,
+                        code: 'repairtype',
+                        callback: function (_data) {
+                            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']
+                                    //专业
+                                    learun.clientdata.getAsync('custmerData', {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                        key: data.MajorNo,
+                                        keyId: 'majorno',
+                                        callback: function (_data2) {
+                                            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']
+                                                    prints(data, "preview", "学生报修维修单（待维修）");
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            });
+                            //callback(_data.text);
+                        }
+                    });
+                }
+            });
+            //打印存档
+            $('#lr-printfinish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.Status != 3) {
+                        learun.alert.warning("当前记录状态错误！");
+                        return false;
+                    }
+                    var data = selectedRow;
+                    console.log(data)
+                    //报修类型
+                    learun.clientdata.getAsync('dataItem', {
+                        key: data.ServiceType,
+                        code: 'repairtype',
+                        callback: function (_data) {
+                            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']
+                                    //专业
+                                    learun.clientdata.getAsync('custmerData', {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                        key: data.MajorNo,
+                                        keyId: 'majorno',
+                                        callback: function (_data2) {
+                                            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']
+                                                    prints(selectedRow, "preview", "学生报修单（结束维修）");
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            });
+                            //callback(_data.text);
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -197,10 +300,17 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 onSelectRow: function (row) {
                     console.log(row)
-                    if(row.Status==1){
+                    if (row.Status == 1) {
                         $("#lr-reject").show()
-                    }else{
+                        $("#lr-printwait").show()
+                    } else {
                         $("#lr-reject").hide()
+                        $("#lr-printwait").hide()
+                    }
+                    if (row.Status == 3) {
+                        $("#lr-printfinish").show()
+                    } else {
+                        $("#lr-printfinish").hide()
                     }
                 },
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/FormView.cshtml

@@ -35,7 +35,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">报修地址</div>
-        <input id="Address" type="text" class="form-control" disabled/>
+        <input id="Address" type="text" class="form-control" disabled />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">报修类型<font face="宋体">*</font></div>
@@ -43,7 +43,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">故障描述</div>
-        <input id="Remark" type="text" class="form-control" disabled/>
+        <input id="Remark" type="text" class="form-control" disabled />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">故障图片</div>
@@ -51,30 +51,38 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">给维修人留言</div>
-        <input id="LeaveMsg" type="text" class="form-control" disabled/>
-    </div>
-    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;" >
-            <span>维修处理信息</span>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">处理日期</div>
-            <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })"  disabled />
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">故障原因</div>
-            <input id="Reason" type="text" class="form-control"  disabled/>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">耗材信息</div>
-            <input id="Material" type="text" class="form-control"  disabled/>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">维修图片</div>
-            <div id="RepairImg"  ></div>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">评价</div>
-            <input id="Evaluate" type="text" class="form-control"  disabled/>
-        </div>
+        <input id="LeaveMsg" type="text" class="form-control" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
+        <span>维修处理信息</span>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">处理日期</div>
+        <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">故障原因</div>
+        <input id="Reason" type="text" class="form-control" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">耗材信息</div>
+        <input id="Material" type="text" class="form-control" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">维修图片</div>
+        <div id="RepairImg"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">是否付款<font face="宋体">*</font></div>
+        <div id="IsPay" disabled></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">付款金额</div>
+        <input id="Amount" type="text" class="form-control" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
+        <div class="lr-form-item-title">评价</div>
+        <input id="Evaluate" type="text" class="form-control" disabled />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportTeacher/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/FormView.js

@@ -11,6 +11,7 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            $("#IsPay").lrDataItemSelect({ code: 'YesOrNoInt' });
             page.bind();
             page.initData();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/Index.js

@@ -227,8 +227,11 @@ var bootstrap = function ($, learun) {
                             }else{
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
-                        }
+                        },
                     },
+                    { label: "驳回人", name: "rejectuser", width: 100, align: "left"},
+                    { label: "驳回时间", name: "rejecttime", width: 100, align: "left"},
+                    { label: "驳回原因", name: "rejectreason", width: 100, align: "left"},
                 ],
                 mainId:'ID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealFormView.cshtml

@@ -74,6 +74,14 @@
         <div class="lr-form-item-title">维修图片<font face="宋体">*</font></div>
         <div id="RepairImg" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">是否付款<font face="宋体">*</font></div>
+        <div id="IsPay" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">付款金额</div>
+        <input id="Amount" class="form-control"  />
+    </div>
     @*<div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
             <div class="lr-form-item-title">评价</div>
             <input id="Evaluate" type="text" class="form-control"  />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealFormView.js

@@ -11,6 +11,7 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            $("#IsPay").lrDataItemSelect({ code: 'YesOrNoInt' });
             page.bind();
             page.initData();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml

@@ -3,83 +3,7 @@
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <style id="style1" media="print">
-    body,
-    html {
-        font-size: 13px;
-        font-family: "微软雅黑";
-        color: #333;
-        overflow-x: hidden;
-        letter-spacing: 0;
-    }
-
-    ul {
-        margin: 0px;
-        padding: 0px;
-        list-style: none;
-    }
-
-    li {
-        list-style: none;
-    }
-
-    table {
-        border-collapse: collapse;
-    }
-
-    .title ul {
-        overflow: hidden;
-    }
-
-    .title li {
-        width: 33.333333%;
-        float: left;
-        line-height: 24px
-    }
-
-    .tableBox {
-        height: 661px;
-        width: 33%;
-        float: left;
-        margin-left: 0.2%;
-        border: 1px solid #000;
-        box-sizing: border-box;
-    }
-
-        .tableBox:first-child {
-            margin-left: 0
-        }
-
-    .table {
-        padding: 0;
-        width: 100%;
-    }
-
-        .table td {
-            border-top: 1px solid #000;
-            line-height: 21px;
-            letter-spacing: 2px;
-        }
-
-        .table tr:first-child {
-            border-top: 0
-        }
-
-        .table th,
-        .table td {
-            padding: 0px 1px;
-            border-left: 1px solid #000;
-            font-size: 13px;
-        }
-
-            .table th:first-child,
-            .table td:first-child {
-                border-left: 0px solid #000;
-            }
-
-    .print {
-        overflow: hidden;
-        margin-top: 10px;
-    }
+    
 </style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
@@ -120,39 +44,254 @@
         tableNum = 1,
         html = '';
 
-    function prints(data, flag) {
+    function prints(data, flag, title) {
         //初始化数据
         num = 0, tableNum = 1, html = '';
-
+        console.log(data)
         var htmlHead = "",
-            tableHtml = '<div class="tableBox">';
-        tableHtml += '<table class="table" cellspacing="0" cellpadding="0"><tr><th style="width:20%">课程类别</th><th style="width:70%">课程名称</th><th style="width:10%">成绩</th></tr>';
+            tableHtml = '';
+       
         //数据处理
-        $.each([data], function (i, n) { //data 循环
-            if (num == 0 && i == 0) {
-                html += tableHtml;
-            }
-            $.each(n, function (j, k) { // 学期数据循环
-                if (j == 'title') {
-                    html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'
-                } else if (j == 'list') {
-                    $.each(k, function (m, b) { //具体数据显示
-                        html += '<tr><td>' + b.type + '</td><td>' + b.className + '</td><td style="text-align:center">' + b.achievement + '</td></tr>';
-                        numJudge(htmlHead, tableHtml)
-                    })
-                } else if (j == 'seal') {
-                    html += '<tr><td colspan="3" style="text-align: right;padding-right:20px">' + k + '</td></tr>';
-                } else {
-                    html += '<tr><td colspan="3" style="text-align:center">以 &nbsp;&nbsp; 下 &nbsp;&nbsp; 空 &nbsp;&nbsp; 白</td></tr></table></div>';
-                }
-                numJudge(htmlHead, tableHtml)
-            })
-
-        })
-        for (var i = tableNum; i < 3; i++) {
-            html += '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"></table></div>';
-        }
+        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;">';
+        tableHtml += '	<tbody>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<b>';
+        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">' + title +'</span>';
+        tableHtml += '					</b>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">单据编号';
+        tableHtml += '					</span>';
+        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.OrderNumber;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">提交日期';
+        tableHtml += '					</span>';
+        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.CreateTime;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '			<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人姓名';
+        tableHtml += '					</span>';
+        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.CreatorName;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">教职工编号';
+        tableHtml += '					</span>';
+        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.TeachNo;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">所在部门';
+        tableHtml += '					</span>';
+        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.DeptName;
+        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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">联系电话';
+        tableHtml += '					</span>';
+        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.Contact;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修地址';
+        tableHtml += '					</span>';
+        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.Address;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修类型';
+        tableHtml += '					</span>';
+        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;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:6;height:96.6pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:96.6pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">故障描述';
+        tableHtml += '					</span>';
+        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;height:96.6pt">';
+        tableHtml += data.Remark;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:7;height:92.5pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:92.5pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">给维修人员留言';
+        tableHtml += '					</span>';
+        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;height:92.5pt">';
+        tableHtml += data.LeaveMsg;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<b>';
+        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">维修处理信息</span>';
+        tableHtml += '					</b>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">处理日期';
+        tableHtml += '					</span>';
+        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.RepairTime ? data.RepairTime : "");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:10;height:95.4pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:95.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">故障原因';
+        tableHtml += '					</span>';
+        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;height:95.4pt">';
+        tableHtml += (data.Reason ? data.Reason : "");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:11;height:94.85pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:94.85pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">耗材信息';
+        tableHtml += '					</span>';
+        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;height:94.85pt">';
+        tableHtml += (data.Material ? data.Material:"");
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr>';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;border-top:none;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">是否付款';
+        tableHtml += '					</span>';
+        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 += '			</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">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:  宋体">付款金额';
+        tableHtml += '					</span>';
+        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;
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人签字';
+        tableHtml += '					</span>';
+        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;height:67.0pt">';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
+        tableHtml += '	</tbody>';
+        tableHtml += '</table>';
+        //html += '<tr><td>' + b.type + '</td><td>' + b.className + '</td><td style="text-align:center">' + b.achievement + '</td></tr>';
+        //res.push({ "name": "", "col": 12, "type": "", "text": "教师报修维修单(待维修)" })
+        //res.push({ "name": "单据编号", "col": 6, "type": "input", "text": selectedRow.OrderNumber })
+        //res.push({ "name": "提交日期", "col": 6, "type": "input", "text": selectedRow.CreateTime })
+        //res.push({ "name": "报修人姓名", "col": 6, "type": "input", "text": selectedRow.CreatorName })
+        //res.push({ "name": "教职工编号", "col": 6, "type": "input", "text": selectedRow.TeachNo})
+        //res.push({ "name": "所在部门", "col": 6, "type": "input", "text": selectedRow.DeptName })
+        //res.push({ "name": "联系电话", "col": 6, "type": "input", "text": selectedRow.Contact })
+        //res.push({ "name": "报修地址", "col": 12, "type": "input", "text": selectedRow.Address })
+        //learun.clientdata.getAsync('dataItem', {
+        //    key: selectedRow.ServiceType,
+        //    code: 'repairtype',
+        //    callback: function (_data) {
+        //        res.push({ "name": "报修类型", "col": 12, "type": "input", "text": _data.text })
+        //    }
+        //});
+        //res.push({ "name": "故障描述", "col": 12, "type": "input","height":"100px", "text": selectedRow.Remark })
+        //res.push({ "name": "给维修人员留言", "col": 12, "type": "input", "text": selectedRow.LeaveMsg })
+        //res.push({ "name": "", "col": 12, "type": "input", "text": "维修处理信息" })
+        //res.push({ "name": "处理日期", "col": 12, "type": "input", "text": "" })
+        //res.push({ "name": "故障原因", "col": 12, "type": "input", "text": "" })
+        //res.push({ "name": "耗材信息", "col": 12, "type": "input", "text": "" })
+        //res.push({ "name": "是否付款", "col": 6, "type": "input", "text": "" })
+        //res.push({ "name": "付款金额", "col": 6, "type": "input", "text": "" })
+        //res.push({ "name": "报修人签字", "col":12, "type": "input", "text": "" })
+        //$.each([data], function (i, n) { //data 循环
+        //    if (num == 0 && i == 0) {
+        //        html += tableHtml;
+        //    }
+        //    $.each(n, function (j, k) { // 学期数据循环
+        //        if (j == 'title') {
+        //            html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'
+        //        } else if (j == 'list') {
+        //            $.each(k, function (m, b) { //具体数据显示
+        //                html += '<tr><td>' + b.type + '</td><td>' + b.className + '</td><td style="text-align:center">' + b.achievement + '</td></tr>';
+        //                numJudge(htmlHead, tableHtml)
+        //            })
+        //        } else if (j == 'seal') {
+        //            html += '<tr><td colspan="3" style="text-align: right;padding-right:20px">' + k + '</td></tr>';
+        //        } else {
+        //            html += '<tr><td colspan="3" style="text-align:center">以 &nbsp;&nbsp; 下 &nbsp;&nbsp; 空 &nbsp;&nbsp; 白</td></tr></table></div>';
+        //        }
+        //        numJudge(htmlHead, tableHtml)
+        //    })
 
+        //})
+        //for (var i = tableNum; i < 3; i++) {
+        //    html += '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"></table></div>';
+        //}
+        html += tableHtml;
+        numJudge(htmlHead, tableHtml)
         AddPrintContent(html, flag);
     };
 
@@ -168,8 +307,8 @@
         LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
         LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
 
-        LODOP.ADD_PRINT_HTM(10, 10, '284mm', '196mm', strFormHtml);
-
+        LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', strFormHtml);
+        LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
         if (flag == "preview") {
             //打印预览
             LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 2);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.js

@@ -102,9 +102,9 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formview',
                         title: '维修处理',
-                        url: top.$.rootUrl + '/LogisticsManagement/RepairReportStudent/dealFormView?keyValue=' + keyValue,
-                        width: 1000,
-                        height: 600,
+                        url: top.$.rootUrl + '/LogisticsManagement/Repairteacher_rejectlog/Form?keyValue=' + keyValue,
+                        width: 500,
+                        height: 300,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -120,32 +120,16 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("当前记录状态错误！");
                         return false;
                     }
-                    //var res = []
-                    //res.push({ "name": "", "col": 12, "type": "", "text": "教师报修维修单(待维修)" })
-                    //res.push({ "name": "单据编号", "col": 6, "type": "input", "text": selectedRow.OrderNumber })
-                    //res.push({ "name": "提交日期", "col": 6, "type": "input", "text": selectedRow.CreateTime })
-                    //res.push({ "name": "报修人姓名", "col": 6, "type": "input", "text": selectedRow.CreatorName })
-                    //res.push({ "name": "教职工编号", "col": 6, "type": "input", "text": selectedRow.TeachNo})
-                    //res.push({ "name": "所在部门", "col": 6, "type": "input", "text": selectedRow.DeptName })
-                    //res.push({ "name": "联系电话", "col": 6, "type": "input", "text": selectedRow.Contact })
-                    //res.push({ "name": "报修地址", "col": 12, "type": "input", "text": selectedRow.Address })
-                    //learun.clientdata.getAsync('dataItem', {
-                    //    key: selectedRow.ServiceType,
-                    //    code: 'repairtype',
-                    //    callback: function (_data) {
-                    //        res.push({ "name": "报修类型", "col": 12, "type": "input", "text": _data.text })
-                    //    }
-                    //});
-                    //res.push({ "name": "故障描述", "col": 12, "type": "input","height":"100px", "text": selectedRow.Remark })
-                    //res.push({ "name": "给维修人员留言", "col": 12, "type": "input", "text": selectedRow.LeaveMsg })
-                    //res.push({ "name": "", "col": 12, "type": "input", "text": "维修处理信息" })
-                    //res.push({ "name": "处理日期", "col": 12, "type": "input", "text": "" })
-                    //res.push({ "name": "故障原因", "col": 12, "type": "input", "text": "" })
-                    //res.push({ "name": "耗材信息", "col": 12, "type": "input", "text": "" })
-                    //res.push({ "name": "是否付款", "col": 6, "type": "input", "text": "" })
-                    //res.push({ "name": "付款金额", "col": 6, "type": "input", "text": "" })
-                    //res.push({ "name": "报修人签字", "col":12, "type": "input", "text": "" })
-                    prints(selectedRow, "preview");
+                    var data = selectedRow;
+                    learun.clientdata.getAsync('dataItem', {
+                        key: data.ServiceType,
+                        code: 'repairtype',
+                        callback: function (_data) {
+                            data.ServiceType = _data.text
+                            prints(data, "preview", "教师报修维修单（待维修）");
+                            //callback(_data.text);
+                        }
+                    });
                 }
             });
             //打印存档
@@ -153,12 +137,20 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status != 1) {
+                    if (selectedRow.Status != 3) {
                         learun.alert.warning("当前记录状态错误！");
                         return false;
                     }
-                    var res=[]
-                    $.jqprintForm(res);
+                    var data = selectedRow;
+                    learun.clientdata.getAsync('dataItem', {
+                        key: data.ServiceType,
+                        code: 'repairtype',
+                        callback: function (_data) {
+                            data.ServiceType = _data.text
+                            prints(data, "preview", "教师报修单（结束维修）");
+                            //callback(_data.text);
+                        }
+                    });
                 }
             });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Form.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "学生报修驳回日志";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="RepairStudent_rejectlog" >
+        <div class="lr-form-item-title">原因</div>
+        <input id="Reason" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Form.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-11-18 14:26
+ * 描  述：学生报修驳回日志
+ */
+var acceptClick;
+var keyValue = request('rid');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/RepairStudent_rejectlog/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/RepairStudent_rejectlog/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Index.cshtml

@@ -0,0 +1,21 @@
+@{
+    ViewBag.Title = "学生报修驳回日志";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairStudent_rejectlog/Index.js

@@ -0,0 +1,42 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-11-18 14:26
+ * 描  述：学生报修驳回日志
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/RepairStudent_rejectlog/GetPageList',
+                headData: [
+                    { label: "文本框", name: "Reason", width: 100, align: "left"},
+                ],
+                mainId:'id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Form.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "教师报修驳回日志";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="RepairTeacher_rejectlog" >
+        <div class="lr-form-item-title">驳回原因</div>
+        <input id="Reason" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Form.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-11-18 14:28
+ * 描  述：教师报修驳回日志
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/RepairTeacher_rejectlog/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/RepairTeacher_rejectlog/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Index.cshtml

@@ -0,0 +1,21 @@
+@{
+    ViewBag.Title = "教师报修驳回日志";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairTeacher_rejectlog/Index.js

@@ -0,0 +1,42 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-11-18 14:28
+ * 描  述：教师报修驳回日志
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/RepairTeacher_rejectlog/GetPageList',
+                headData: [
+                    { label: "文本框", name: "Reason", width: 100, align: "left"},
+                ],
+                mainId:'id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -895,6 +895,8 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonTermAttemperChildController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\RepairReportTeacherController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\VisitManageController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\RepairStudent_rejectlogController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\RepairTeacher_rejectlogController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6830,6 +6832,14 @@
     <Content Include="Areas\LR_Desktop\Views\VisitManage\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\VisitManage\Form.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\VisitManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairStudent_rejectlog\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairStudent_rejectlog\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairStudent_rejectlog\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairStudent_rejectlog\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairTeacher_rejectlog\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairTeacher_rejectlog\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairTeacher_rejectlog\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\RepairTeacher_rejectlog\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -623,6 +623,8 @@
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttrmperChildMap.cs" />
     <Compile Include="LogisticsManagement\RepairReport_TeacherMap.cs" />
     <Compile Include="LR_Desktop\VisitManageMap.cs" />
+    <Compile Include="LogisticsManagement\RepairStudent_rejectlogMap.cs" />
+    <Compile Include="LogisticsManagement\RepairTeacher_rejectlogMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/RepairStudent_rejectlogMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public class RepairStudent_rejectlogMap : EntityTypeConfiguration<RepairStudent_rejectlogEntity>
+    {
+        public RepairStudent_rejectlogMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("REPAIRSTUDENT_REJECTLOG");
+            //主键
+            this.HasKey(t => t.id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/RepairTeacher_rejectlogMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public class RepairTeacher_rejectlogMap : EntityTypeConfiguration<RepairTeacher_rejectlogEntity>
+    {
+        public RepairTeacher_rejectlogMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("REPAIRTEACHER_REJECTLOG");
+            //主键
+            this.HasKey(t => t.id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1917,6 +1917,14 @@
     <Compile Include="LR_Desktop\VisitManage\VisitManageService.cs" />
     <Compile Include="LR_Desktop\VisitManage\VisitManageBLL.cs" />
     <Compile Include="LR_Desktop\VisitManage\VisitManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\RepairStudent_rejectlog\RepairStudent_rejectlogEntity.cs" />
+    <Compile Include="LogisticsManagement\RepairStudent_rejectlog\RepairStudent_rejectlogService.cs" />
+    <Compile Include="LogisticsManagement\RepairStudent_rejectlog\RepairStudent_rejectlogBLL.cs" />
+    <Compile Include="LogisticsManagement\RepairStudent_rejectlog\RepairStudent_rejectlogIBLL.cs" />
+    <Compile Include="LogisticsManagement\RepairTeacher_rejectlog\RepairTeacher_rejectlogEntity.cs" />
+    <Compile Include="LogisticsManagement\RepairTeacher_rejectlog\RepairTeacher_rejectlogService.cs" />
+    <Compile Include="LogisticsManagement\RepairTeacher_rejectlog\RepairTeacher_rejectlogBLL.cs" />
+    <Compile Include="LogisticsManagement\RepairTeacher_rejectlog\RepairTeacher_rejectlogIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs

@@ -32,8 +32,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" t.* ");
-                strSql.Append("  FROM RepairReport_Student t ");
+                strSql.Append(@" l.creator as rejectuser,l.time as rejecttime,l.reason as rejectreason,t.* ");
+                strSql.Append("  FROM RepairReport_Student t left join (select  t.* from (select a.*, row_number() over(partition by rid order by time desc) rw from RepairStudent_rejectlog a) t where t.rw = 1) l on l.rid=t.id");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReport_StudentEntity.cs

@@ -128,7 +128,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// IsPay
         /// </summary>
         [Column("ISPAY")]
-        public int IsPay { get; set; }
+        public string IsPay { get; set; }
+        [NotMapped]
+        public string rejectuser { get; set; }
+        [NotMapped]
+        public string rejecttime { get; set; }
+        [NotMapped]
+        public string rejectreason { get; set; }
         /// <summary>
         /// Amount
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs

@@ -32,8 +32,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" t.* ");
-                strSql.Append("  FROM RepairReport_Teacher t ");
+                strSql.Append(@" l.creator as rejectuser,l.time as rejecttime,l.reason as rejectreason,t.* ");
+                strSql.Append("  FROM RepairReport_Teacher t left join (select  t.* from (select a.*, row_number() over(partition by rid order by time desc) rw from RepairTeacher_rejectlog a) t where t.rw = 1) l on l.rid=t.id");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReport_TeacherEntity.cs

@@ -118,12 +118,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// IsPay
         /// </summary>
         [Column("ISPAY")]
-        public int IsPay { get; set; }
+        public string IsPay { get; set; }
         /// <summary>
         /// Amount
         /// </summary>
         [Column("AMOUNT")]
         public string Amount { get; set; }
+        [NotMapped]
+        public string rejectuser { get; set; }
+        [NotMapped]
+        public string rejecttime { get; set; }
+        [NotMapped]
+        public string rejectreason { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairStudent_rejectlog/RepairStudent_rejectlogBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public class RepairStudent_rejectlogBLL : RepairStudent_rejectlogIBLL
+    {
+        private RepairStudent_rejectlogService repairStudent_rejectlogService = new RepairStudent_rejectlogService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RepairStudent_rejectlogEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return repairStudent_rejectlogService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RepairStudent_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RepairStudent_rejectlogEntity GetRepairStudent_rejectlogEntity(string keyValue)
+        {
+            try
+            {
+                return repairStudent_rejectlogService.GetRepairStudent_rejectlogEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                repairStudent_rejectlogService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, RepairStudent_rejectlogEntity entity)
+        {
+            try
+            {
+                repairStudent_rejectlogService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairStudent_rejectlog/RepairStudent_rejectlogEntity.cs

@@ -0,0 +1,79 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public class RepairStudent_rejectlogEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// id
+        /// </summary>
+        [Column("ID")]
+        public string id { get; set; }
+        /// <summary>
+        /// Rid
+        /// </summary>
+        [Column("RID")]
+        public string Rid { get; set; }
+        /// <summary>
+        /// time
+        /// </summary>
+        [Column("TIME")]
+        public DateTime? time { get; set; }
+        /// <summary>
+        /// Creator
+        /// </summary>
+        [Column("CREATOR")]
+        public string Creator { get; set; }
+        /// <summary>
+        /// CreateName
+        /// </summary>
+        [Column("CREATENAME")]
+        public string CreateName { get; set; }
+        /// <summary>
+        /// Reason
+        /// </summary>
+        [Column("REASON")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// Createtime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? Createtime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.id = Guid.NewGuid().ToString();
+            this.Createtime = DateTime.Now;
+            this.Creator = LoginUserInfo.Get().realName;
+            this.CreateName = LoginUserInfo.Get().userId;
+            this.time = DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairStudent_rejectlog/RepairStudent_rejectlogIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public interface RepairStudent_rejectlogIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<RepairStudent_rejectlogEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取RepairStudent_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        RepairStudent_rejectlogEntity GetRepairStudent_rejectlogEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, RepairStudent_rejectlogEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairStudent_rejectlog/RepairStudent_rejectlogService.cs

@@ -0,0 +1,145 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:26
+    /// 描 述：学生报修驳回日志
+    /// </summary>
+    public class RepairStudent_rejectlogService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RepairStudent_rejectlogEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.id,
+                t.Reason
+                ");
+                strSql.Append("  FROM RepairStudent_rejectlog t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<RepairStudent_rejectlogEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RepairStudent_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RepairStudent_rejectlogEntity GetRepairStudent_rejectlogEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<RepairStudent_rejectlogEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<RepairStudent_rejectlogEntity>(t=>t.id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, RepairStudent_rejectlogEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairTeacher_rejectlog/RepairTeacher_rejectlogBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public class RepairTeacher_rejectlogBLL : RepairTeacher_rejectlogIBLL
+    {
+        private RepairTeacher_rejectlogService repairTeacher_rejectlogService = new RepairTeacher_rejectlogService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RepairTeacher_rejectlogEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return repairTeacher_rejectlogService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RepairTeacher_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RepairTeacher_rejectlogEntity GetRepairTeacher_rejectlogEntity(string keyValue)
+        {
+            try
+            {
+                return repairTeacher_rejectlogService.GetRepairTeacher_rejectlogEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                repairTeacher_rejectlogService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, RepairTeacher_rejectlogEntity entity)
+        {
+            try
+            {
+                repairTeacher_rejectlogService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairTeacher_rejectlog/RepairTeacher_rejectlogEntity.cs

@@ -0,0 +1,79 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public class RepairTeacher_rejectlogEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// id
+        /// </summary>
+        [Column("ID")]
+        public string id { get; set; }
+        /// <summary>
+        /// Rid
+        /// </summary>
+        [Column("RID")]
+        public string Rid { get; set; }
+        /// <summary>
+        /// time
+        /// </summary>
+        [Column("TIME")]
+        public DateTime? time { get; set; }
+        /// <summary>
+        /// Creator
+        /// </summary>
+        [Column("CREATOR")]
+        public string Creator { get; set; }
+        /// <summary>
+        /// CreateName
+        /// </summary>
+        [Column("CREATENAME")]
+        public string CreateName { get; set; }
+        /// <summary>
+        /// Reason
+        /// </summary>
+        [Column("REASON")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// Createtime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? Createtime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.id = Guid.NewGuid().ToString();
+            this.Createtime = DateTime.Now;
+            this.Creator = LoginUserInfo.Get().realName;
+            this.CreateName = LoginUserInfo.Get().userId;
+            this.time = DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairTeacher_rejectlog/RepairTeacher_rejectlogIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public interface RepairTeacher_rejectlogIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<RepairTeacher_rejectlogEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取RepairTeacher_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        RepairTeacher_rejectlogEntity GetRepairTeacher_rejectlogEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, RepairTeacher_rejectlogEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairTeacher_rejectlog/RepairTeacher_rejectlogService.cs

@@ -0,0 +1,145 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-11-18 14:28
+    /// 描 述：教师报修驳回日志
+    /// </summary>
+    public class RepairTeacher_rejectlogService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RepairTeacher_rejectlogEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.id,
+                t.Reason
+                ");
+                strSql.Append("  FROM RepairTeacher_rejectlog t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<RepairTeacher_rejectlogEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RepairTeacher_rejectlog表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RepairTeacher_rejectlogEntity GetRepairTeacher_rejectlogEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<RepairTeacher_rejectlogEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<RepairTeacher_rejectlogEntity>(t=>t.id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, RepairTeacher_rejectlogEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}