From 81ce7a0920bb759fb821198bb6aa1b7ac78766be Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 10 Mar 2023 10:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2-=E6=80=BB?= =?UTF-8?q?=E7=AB=99=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PsychologyReplyInfoController.cs | 10 ++ .../PsychologyReplyInfo/FormFiveView.cshtml | 79 ++++++++++++++ .../Views/PsychologyReplyInfo/FormFiveView.js | 101 ++++++++++++++++++ .../Views/PsychologyReplyInfo/IndexFive.js | 2 +- .../Learun.Application.Web.csproj | 2 + .../PsychologyReplyInfoService.cs | 4 +- 6 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/PsychologyReplyInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/PsychologyReplyInfoController.cs index 1978221eb..0496740f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/PsychologyReplyInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/PsychologyReplyInfoController.cs @@ -62,6 +62,16 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers { return View(); } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormFiveView() + { + return View(); + } + /// /// 表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.cshtml new file mode 100644 index 000000000..1b9f78138 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.cshtml @@ -0,0 +1,79 @@ +@{ + ViewBag.Title = "心理咨询回复"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
学号
+ +
+
+
姓名
+ +
+
+
系部
+
+
+
+
专业
+
+
+
+
班级
+
+
+
+
身份证号
+ +
+
+
性别
+
+
+
+
是否单亲
+
+
+
+
联系电话
+ +
+
+
校内电话
+ +
+
+
现住址
+ +
+
+
提交日期
+ +
+
+
咨询内容
+ +
+
+
咨询附件
+
+
+
+
教师操作*
+
+
+
+
指派教师
+
+
+
+
回复内容
+ +
+
+
附件上传
+
+
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.js new file mode 100644 index 000000000..ac14373b8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFiveView.js @@ -0,0 +1,101 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-03-06 12:21 + * 描 述：心理咨询回复 + */ +var acceptClick; +var PsychologyInfoId = request('PsychologyInfoId'); +var type = request('type'); +var bootstrap = function ($, learun) { + "use strict"; + var objectId = '1b3b9b47-450e-45ab-8264-14ef89106f83'; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#ReplyUser').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#Appointor').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#ReplyType').lrselect({ + url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList', + param: { itemCode: 'ReplyType' }, + value: 'F_ItemValue', + text: 'F_ItemName' + }); + //$('#ReplyType').lrselect({ + // url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList', + // param: { itemCode: 'ReplyType' }, + // value: 'F_ItemValue', + // text: 'F_ItemName', + // select: + // function (item) { + // if (item) { + // if (item.F_ItemValue == '1') { + // //上报 + // $('#ReplyContent').attr('readonly', 'readonly'); + // $('#ReplyContent').val(''); + // $('#ReplyContent').prev().html('回复内容'); + // $('#ReplyContent').removeAttr('isvalid'); + // $('#Appointor').removeAttr('readonly'); + // //$('#Appointor').prev().html('指派教师*'); + // //$('#Appointor').attr('isvalid', 'yes').attr('checkexpession', 'NotNull'); + // } else { + // //回复 + // $('#ReplyContent').removeAttr('readonly'); + // $('#ReplyContent').prev().html('回复内容*'); + // $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull'); + // $('#Appointor').attr('readonly', 'readonly'); + // $('#Appointor').lrselectSet(''); + // //$('#Appointor').remove(); + // //$('#Appointor').removeAttr('isvalid'); + // } + // } + // } + //}); + $('#Url').lrUploader(); + $('#StuUrl').lrUploader({ isUpload: false }); + }, + initData: function () { + if (!!PsychologyInfoId) { + $.lrSetForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetFormDataByPsychologyInfoId?PsychologyInfoId=' + PsychologyInfoId + '&type=' + type, function (data) { + console.log(data, "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 strEntity = $('body').lrGetFormData(); + strEntity.ReplyUser = learun.clientdata.get(['userinfo']).account; + strEntity.ReplyTime = learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'); + var postData = { + strEntity: JSON.stringify(strEntity) + }; + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexFive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexFive.js index 76b9e3f3e..e4dd38c8c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexFive.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexFive.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formview', title: '查看', - url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId, + url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormFiveView?PsychologyInfoId=' + PsychologyInfoId, width: 800, height: 700, btn: null, 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 2c2ed0697..7eb464395 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 @@ -1510,6 +1510,7 @@ + @@ -8091,6 +8092,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoService.cs index 77e31934a..149bbd00a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoService.cs @@ -138,14 +138,16 @@ where a.Id='{keyValue}'"; strSql.Append("SELECT "); strSql.Append(@" info.StuNo,info.createtime as SubmitTime,info.Concent -,t.ReplyUser,t.ReplyContent,t.ReplyTime,a.ReplyType,t.url,info.[state],info.id as PsychologyInfoId ,info.url as StuUrl +,t.ReplyUser,t.ReplyContent,t.ReplyTime,a.ReplyType,ss.Appointor,t.url,info.[state],info.id as PsychologyInfoId ,info.url as StuUrl FROM PsychologyInfo info "); strSql.Append(@" join StuInfoBasic s on info.StuNo=s.StuNo left join (select * from PsychologyReplyInfo where ReplyType=2 )t on t.PsychologyInfoid=info.id "); strSql.Append($" left join (select * from PsychologyReplyInfo where [state]='{type}' ) a on a.PsychologyInfoid=info.id "); + strSql.Append($" left join(select * from PsychologyReplyInfo where [state]= 6)ss on ss.PsychologyInfoid = info.id "); strSql.Append($" WHERE 1=1 and info.[state]>=2 and info.Id='{PsychologyInfoId}'"); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()).FirstOrDefault(); } catch (Exception ex)