报修列表是否付款显示修改，从消息打开评价通知可进行评价

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml

@@ -123,20 +123,38 @@
                     async: false,
                     success: function (data) {
                         //弹窗查看详情
-                        var keyValue = params[1];
-                        var ConnectionUrl = params[3];
-                        if (top.learun.checkrow(keyValue)) {
-                            top.learun.layerForm({
-                                id: 'formview',
-                                title: title,
-                                url: top.$.rootUrl + ConnectionUrl + keyValue,
-                                width: 1000,
-                                height: 650,
-                                maxmin: true,
-                                btn: null,
-                            });
+                        if (title == "评价通知") {
+                            var keyValue = params[1];
+                            var ConnectionUrl = params[3];
+                            if (top.learun.checkrow(keyValue)) {
+                                top.learun.layerForm({
+                                    id: 'formview',
+                                    title: '评价',
+                                    url: top.$.rootUrl + ConnectionUrl + keyValue,
+                                    width: 1000,
+                                    height: 650,
+                                    callBack: function (id) {
+                                        return top[id].acceptClick(function () { });
+                                    }
+                                });
+                            }
+                        } else {
+                            var keyValue = params[1];
+                            var ConnectionUrl = params[3];
+                            if (top.learun.checkrow(keyValue)) {
+                                top.learun.layerForm({
+                                    id: 'formview',
+                                    title: title,
+                                    url: top.$.rootUrl + ConnectionUrl + keyValue,
+                                    width: 1000,
+                                    height: 650,
+                                    maxmin: true,
+                                    btn: null,
+                                });
 
+                            }
                         }
+                        
                     }
                 })
             }

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

@@ -132,7 +132,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult GetFormData(string keyValue)
         {
             var RepairReport_TeacherData = repairReportTeacherIBLL.GetRepairReport_TeacherEntity(keyValue);
-            var jsonData = new {
+            var jsonData = new
+            {
                 RepairReport_Teacher = RepairReport_TeacherData,
             };
             return Success(jsonData);
@@ -178,7 +179,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
                 string servicevalue = datalist.Where(c => c.F_ItemValue == model.ServiceType).FirstOrDefault().F_ItemName;
                 string content = "您发起" + model.Address + "-" + servicevalue + "维修请求已处理，请评价。";
 
-                addmessagerind(userList, model, content, "评价通知");
+                addmessagerind(userList, model, content, "评价通知", true);
             }
             if (string.IsNullOrEmpty(keyValue))
             {
@@ -202,7 +203,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             //查询当前用户是否有已处理未评价的报修数据
             //select * from repairreport_teacher where status='2' and creator=''
             int existcount = repairReportTeacherIBLL.Waitevaluatecount();
-            if (existcount>0)
+            if (existcount > 0)
             {
                 return Fail("您有待评价的保修单，请评价后在提交！");
             }
@@ -234,7 +235,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return Success("提交成功！");
         }
 
-        private void addmessagerind(List<UserEntity> userList,RepairReport_TeacherEntity model,string content,string title= "维修通知")
+        private void addmessagerind(List<UserEntity> userList, RepairReport_TeacherEntity model, string content, string title = "维修通知", bool isComment = false)
         {
             foreach (var userinfo in userList)
             {
@@ -248,7 +249,14 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
 
                 entity.TheContent = content;
                 entity.InstanceId = model.ID;
-                entity.ConnectionUrl = "/LogisticsManagement/RepairReportTeacher/FormView?keyValue=";
+                if (isComment)
+                {
+                    entity.ConnectionUrl = "/LogisticsManagement/RepairReportTeacher/EvaluateFormView?keyValue=";
+                }
+                else
+                {
+                    entity.ConnectionUrl = "/LogisticsManagement/RepairReportTeacher/FormView?keyValue=";
+                }
                 entity.SendTime = DateTime.Now;
                 entity.ReadSigns = false;
                 messageRindIBLL.SaveEntity("", entity);

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

@@ -284,7 +284,9 @@ var bootstrap = function ($, learun) {
                         formatter:function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '是';
-                            }else{
+                            } else if (cellvalue == null) {
+                                return '';
+                            }else {
                                 return '否';
                             }
                         }

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

@@ -187,6 +187,8 @@ var bootstrap = function ($, learun) {
                         formatter:function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '是';
+                            } else if (cellvalue == null) {
+                                return '';
                             }else{
                                 return '否';
                             }