From e873a5853b513a5be6368d6d77916dc81e07aaa7 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 11 May 2022 15:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sys_PsychologicalCounseController.cs | 48 ++- .../Views/Sys_PsychologicalCounse/Form.cshtml | 2 +- .../FormReceive.cshtml | 14 +- .../Sys_PsychologicalCounse/FormReceive.js | 2 +- .../FormViewReceive.cshtml | 19 ++ .../FormViewReceive.js | 50 +++ .../FormViewReceiveData.cshtml | 27 ++ .../FormViewReceiveData.js | 60 ++++ .../Sys_PsychologicalCounse/Index.cshtml | 2 +- .../Views/Sys_PsychologicalCounse/Index.js | 37 ++- .../IndexRecive.cshtml | 12 +- .../Sys_PsychologicalCounse/IndexRecive.js | 301 +++++++++--------- .../Learun.Application.Web.csproj | 4 + .../Sys_PsychologicalCounseService.cs | 9 + 14 files changed, 407 insertions(+), 180 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_PsychologicalCounseController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_PsychologicalCounseController.cs index 3a00c1499..a8b5abb24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_PsychologicalCounseController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_PsychologicalCounseController.cs @@ -1,4 +1,5 @@ -using Learun.Util; +using System; +using Learun.Util; using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; @@ -44,6 +45,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] + public ActionResult IndexRecive() + { + return View(); + } + [HttpGet] + public ActionResult FormReceive() + { + return View(); + } + [HttpGet] + public ActionResult FormViewReceive() + { + return View(); + } + [HttpGet] + public ActionResult FormViewReceiveData() + { + return View(); + } + + #endregion #region 获取数据 @@ -126,11 +149,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { Sys_PsychologicalCounseEntity entity = strEntity.ToObject(); sys_PsychologicalCounseIBLL.SaveEntity(keyValue, entity); - if (string.IsNullOrEmpty(keyValue)) - { - } return Success("保存成功！"); } + + /// + /// 心理咨询回复 + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveReceiveForm(string keyValue, string strEntity) + { + Sys_PsychologicalCounseEntity entity = strEntity.ToObject(); + entity.ReplyFlag = true; + entity.ReplyTime = DateTime.Now; + entity.ReplyUserId = LoginUserInfo.Get().userId; + sys_PsychologicalCounseIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Form.cshtml index f47846c49..66af3bf10 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Form.cshtml @@ -5,7 +5,7 @@
咨询编号
- +
咨询内容*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.cshtml index d996f4155..b051df8a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.cshtml @@ -3,13 +3,17 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
咨询编号
- +
-
-
咨询内容*
- +
+
咨询内容
+ +
+
+
回复内容*
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.js index 4585ba5d7..a1796e0a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormReceive.js @@ -39,7 +39,7 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/SaveForm?keyValue=' + keyValue, postData, function (res) { + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/SaveReceiveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { callBack(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.cshtml new file mode 100644 index 000000000..f62f68c44 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.cshtml @@ -0,0 +1,19 @@ +@{ + ViewBag.Title = "心理咨询"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
咨询编号
+ +
+
+
咨询内容
+ +
+
+
回复内容*
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.js new file mode 100644 index 000000000..4585ba5d7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceive.js @@ -0,0 +1,50 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-05-09 11:23 + * 描 述：心理咨询 + */ +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 + '/EducationalAdministration/Sys_PsychologicalCounse/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 + '/EducationalAdministration/Sys_PsychologicalCounse/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.cshtml new file mode 100644 index 000000000..e7412e49d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "心理咨询"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
咨询编号
+ +
+
+
咨询内容
+ +
+
+
回复内容
+ +
+
+
回复时间
+ +
+
+
回复人
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.js new file mode 100644 index 000000000..432a39d73 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/FormViewReceiveData.js @@ -0,0 +1,60 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-05-09 11:23 + * 描 述：心理咨询 + */ +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 + '/EducationalAdministration/Sys_PsychologicalCounse/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]); + } + if (data["Sys_PsychologicalCounse"].ReplyUserId) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: data["Sys_PsychologicalCounse"].ReplyUserId, + keyId: 'f_userid', + callback: function (_data) { + $('#ReplyUserId').val(_data['f_realname']); + } + }); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.cshtml index 8deb1c9d4..b1e87d734 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.cshtml @@ -11,7 +11,7 @@
-
编号
+
咨询编号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.js index 481184177..8a91df7ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/Index.js @@ -37,7 +37,12 @@ var bootstrap = function ($, learun) { // 编辑 $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow.SendFlag !== false) { + learun.alert.warning("选中记录已提交，不能编辑！"); + return false; + } learun.layerForm({ id: 'form', title: '编辑', @@ -53,7 +58,12 @@ var bootstrap = function ($, learun) { // 删除 $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow.SendFlag !== false) { + learun.alert.warning("选中记录已提交，不能删除！"); + return false; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/DeleteForm', { keyValue: keyValue }, function () { @@ -63,16 +73,11 @@ var bootstrap = function ($, learun) { }); } }); - //// 打印 - //$('#lr_print').on('click', function () { - // $('#gridtable').jqprintTable(); - //}); // 提交 $('#lr_submit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - console.log('selectedRow.SendFlag', selectedRow.SendFlag); if (selectedRow.SendFlag !== false) { learun.alert.warning("选中记录已提交！"); return false; @@ -98,23 +103,23 @@ var bootstrap = function ($, learun) { }); // 回复情况 $('#lr_reply').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('SComplaintId'); + var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.SendFlag !== 1) { - learun.alert.warning("当前投诉意见未提交，请先提交！"); + if (selectedRow.SendFlag !== true) { + learun.alert.warning("当前咨询未提交，请先提交！"); return false; } - if (selectedRow.ReplyFlag !== 1) { - learun.alert.warning("当前投诉意见未回复！"); + if (selectedRow.ReplyFlag !== true) { + learun.alert.warning("当前咨询未回复！"); return false; } learun.layerForm({ - id: 'replylistSys_SendComplaint', + id: 'formviewreceive', title: '回复情况', - url: top.$.rootUrl + '/EducationalAdministration/Sys_SendComplaint/ReplyList?keyValue=' + keyValue, - width: 600, - height: 400, + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/FormViewReceiveData?keyValue=' + keyValue, + width: 700, + height: 500, btn: null }); } @@ -142,7 +147,7 @@ var bootstrap = function ($, learun) { { label: "回复状态", name: "ReplyFlag", width: 100, align: "left", formatter: function (cellvalue, row) { - if (cellvalue === 1) { + if (cellvalue === true) { return '已回复'; } else { return '未回复'; @@ -158,6 +163,8 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + var uid = learun.clientdata.get(['userinfo']).userId; + param.SqlParameter = " and CreateUserId='" + uid + "'"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.cshtml index ecb4f65d2..8a5388fea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.cshtml @@ -2,7 +2,7 @@ ViewBag.Title = "心理咨询"; Layout = "~/Views/Shared/_Index.cshtml"; } -
+
@@ -11,17 +11,17 @@
-
编号
+
咨询编号
咨询内容
-
-
回复内容
- -
+ @*
+
回复内容
+ +
*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.js index 31d5b3c9c..0fa0059b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_PsychologicalCounse/IndexRecive.js @@ -1,147 +1,154 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2022-05-09 11:23 - * 描 述：心理咨询 - */ -var refreshGirdData; -var selectedRow; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //// 打印 - //$('#lr_print').on('click', function () { - // $('#gridtable').jqprintTable(); - //}); - // 提交 - $('#lr_submit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - console.log('selectedRow.SendFlag', selectedRow.SendFlag); - if (selectedRow.SendFlag !== false) { - learun.alert.warning("选中记录已提交！"); - return false; - } - learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/SubmitForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - // 查看 - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'formview', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/FormView?keyValue=' + keyValue, - width: 600, - height: 400, - btn: null - }); - } - }); - // 回复情况 - $('#lr_reply').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('SComplaintId'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - if (selectedRow.SendFlag !== 1) { - learun.alert.warning("当前投诉意见未提交，请先提交！"); - return false; - } - if (selectedRow.ReplyFlag !== 1) { - learun.alert.warning("当前投诉意见未回复！"); - return false; - } - learun.layerForm({ - id: 'replylistSys_SendComplaint', - title: '回复情况', - url: top.$.rootUrl + '/EducationalAdministration/Sys_SendComplaint/ReplyList?keyValue=' + keyValue, - width: 600, - height: 400, - btn: null - }); - } - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/GetPageList', - headData: [ - { label: "咨询编号", name: "Code", width: 150, align: "left" }, - { label: "咨询内容", name: "Concent", width: 250, align: "left" }, - { label: "回复时间", name: "ReplyTime", width: 150, align: "left" }, - ], - mainId: 'Id', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - param.SqlParameter = " and SendFlag=1 "; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-05-09 11:23 + * 描 述：心理咨询 + */ +var refreshGirdData; +var selectedRow; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + + //查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formviewreceive', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/FormViewReceive?keyValue=' + keyValue, + width: 600, + height: 400, + btn: null + }); + } + }); + + // 回复 + $('#lr_receive').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.ReplyFlag !== false) { + learun.alert.warning("当前咨询已回复！"); + return false; + } + learun.layerForm({ + id: 'formreceive', + title: '回复', + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/FormReceive?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Sys_PsychologicalCounse/GetPageList', + headData: [ + { label: "咨询编号", name: "Code", width: 150, align: "left" }, + { label: "咨询内容", name: "Concent", width: 250, align: "left" }, + { + label: "回复状态", name: "ReplyFlag", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === true) { + return '已回复'; + } else { + return '未回复'; + } + } + + }, + { label: "回复时间", name: "ReplyTime", width: 150, align: "left" }, + { + label: "回复人", name: "ReplyUserId", width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = " and SendFlag=1 "; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index ff97b803c..506326e51 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1099,6 +1099,8 @@ + + @@ -7825,6 +7827,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_PsychologicalCounse/Sys_PsychologicalCounseService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_PsychologicalCounse/Sys_PsychologicalCounseService.cs index e933c4b7f..d7cf9fef5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_PsychologicalCounse/Sys_PsychologicalCounseService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_PsychologicalCounse/Sys_PsychologicalCounseService.cs @@ -49,6 +49,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Concent", "%" + queryParam["Concent"].ToString() + "%", DbType.String); strSql.Append(" AND t.Concent Like @Concent "); } + if (!queryParam["ReplyContent"].IsEmpty()) + { + dp.Add("ReplyContent", "%" + queryParam["ReplyContent"].ToString() + "%", DbType.String); + strSql.Append(" AND t.ReplyContent Like @ReplyContent "); + } + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)