diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFive.js
index 841502a14..b6ea8ec30 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFive.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormFive.js
@@ -22,6 +22,11 @@ var bootstrap = function ($, learun) {
$('#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').lrselect({
+ url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetUserIdLists?objectId=' + objectId,
+ value: 'F_Account',
+ text: 'F_RealName',
+ });
$('#ReplyType').lrselect({
url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
param: { itemCode: 'ReplyType' },
@@ -31,27 +36,23 @@ var bootstrap = function ($, learun) {
function (item) {
if (item) {
if (item.F_ItemValue == '1') {
- $('#Appointor').lrselect({
- url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetUserIdLists?objectId=' + objectId,
- value: 'F_Account',
- text: 'F_RealName',
- });
//上报
$('#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');
+ //$('#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').remove();
- $('#Appointor').removeAttr('isvalid');
+ $('#Appointor').lrselectSet('');
+ //$('#Appointor').remove();
+ //$('#Appointor').removeAttr('isvalid');
}
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormView.js
index a783009be..09bc883d5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormView.js
@@ -28,23 +28,23 @@ var bootstrap = function ($, learun) {
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');
- } else {
- //回复
- $('#ReplyContent').removeAttr('readonly');
- $('#ReplyContent').prev().html('回复内容*');
- $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull');
- }
- }
- }
+ //select:
+ // function (item) {
+ // if (item) {
+ // if (item.F_ItemValue == '1') {
+ // //上报
+ // $('#ReplyContent').attr('readonly', 'readonly');
+ // $('#ReplyContent').val('');
+ // $('#ReplyContent').prev().html('回复内容');
+ // $('#ReplyContent').removeAttr('isvalid');
+ // } else {
+ // //回复
+ // $('#ReplyContent').removeAttr('readonly');
+ // $('#ReplyContent').prev().html('回复内容*');
+ // $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull');
+ // }
+ // }
+ // }
});
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 1c22161f0..2c2ed0697 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
@@ -8090,6 +8090,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 34eeb9e18..77e31934a 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
@@ -220,7 +220,7 @@ where a.Id='{keyValue}'";
,[Url]
,[ReplyUser]
,[ReplyTime]
- ,[CreateTime])
+ ,[CreateTime],Appointor)
VALUES
(newid()
,'{psychologyInfoId}'
@@ -230,7 +230,7 @@ where a.Id='{keyValue}'";
,NULL
,NULL
,NULL
- ,getdate())";
+ ,getdate(),'{entity.Appointor}')";
db.ExecuteBySql(sql);
//修改主表state