附件上传
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 7e9aadcae..aa53598cc 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
@@ -1,87 +1,88 @@
-/* * 版 本 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 bootstrap = function ($, learun) {
- "use strict";
- 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' });
- // $('#ReplyType').lrDataItemSelect({ code: 'ReplyType' });
- $('#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');
- } else {
- //回复
- $('#ReplyContent').removeAttr('readonly');
- $('#ReplyContent').prev().html('回复内容
*');
- $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull');
- }
- }
- }
- });
-
-
- $('#Url').lrUploader();
- $('#StuUrl').lrUploader();
- },
- initData: function () {
- if (!!PsychologyInfoId) {
- $.lrSetForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetFormDataByPsychologyInfoId?PsychologyInfoId=' + PsychologyInfoId, 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 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();
-}
+/* * 版 本 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 bootstrap = function ($, learun) {
+ "use strict";
+ 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' });
+ // $('#ReplyType').lrDataItemSelect({ code: 'ReplyType' });
+ $('#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');
+ } else {
+ //回复
+ $('#ReplyContent').removeAttr('readonly');
+ $('#ReplyContent').prev().html('回复内容
*');
+ $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull');
+ }
+ }
+ }
+ });
+
+
+ $('#Url').lrUploader();
+ $('#StuUrl').lrUploader();
+ },
+ initData: function () {
+ if (!!PsychologyInfoId) {
+ $.lrSetForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetFormDataByPsychologyInfoId?PsychologyInfoId=' + PsychologyInfoId, 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 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/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index.js
index fb014818a..7cd8713a9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index.js
@@ -1,227 +1,239 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
- * 创建人：超级管理员
- * 日 期：2023-03-06 12:21
- * 描 述：心理咨询回复(班级辅导员)
- */
-var refreshGirdData;
-var bootstrap = function ($, learun) {
- "use strict";
- var startTime;
- var endTime;
- var page = {
- init: function () {
- page.initGird();
- page.bind();
- },
- bind: function () {
- // 时间搜索框
- $('#datesearch').lrdate({
- dfdata: [
- { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
- ],
- // 月
- mShow: false,
- premShow: false,
- // 季度
- jShow: false,
- prejShow: false,
- // 年
- ysShow: false,
- yxShow: false,
- preyShow: false,
- yShow: false,
- // 默认
- dfvalue: '1',
- selectfn: function (begin, end) {
- startTime = begin;
- endTime = end;
- page.search();
- }
- });
- $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
- page.search(queryJson);
- }, 220, 400);
- $('#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' });
// 刷新
- $('#lr_refresh').on('click', function () {
- location.reload();
- });
- // 新增
- $('#lr_add').on('click', function () {
- learun.layerForm({
- id: 'form',
- title: '新增',
- url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/Form',
- width: 800,
- height: 700,
- callBack: function (id) {
- return top[id].acceptClick(refreshGirdData);
- }
- });
- });
- // 查看
- $('#lr_view').on('click', function () {
- var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
- if (learun.checkrow(PsychologyInfoId)) {
- learun.layerForm({
- id: 'formview',
- title: '查看',
- url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId,
- width: 800,
- height: 700,
- btn: null,
- callBack: function (id) {
- return top[id].acceptClick(refreshGirdData);
- }
- });
- }
- });
-
- // 编辑
- $('#lr_edit').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('Id');
- //主表Id
- var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
- var State = $('#gridtable').jfGridValue('State');
-
- if (State != 2) {
- learun.alert.warning('当前由其他老师审核！');
- return false;
- }
- if (learun.checkrow(PsychologyInfoId)) {
- learun.layerForm({
- id: 'form',
- title: '回复',
- url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/Form?keyValue=' + keyValue,
- width: 800,
- height: 700,
- 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 + '/LR_Desktop/PsychologyReplyInfo/DeleteForm', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
- }
- });
- }
- });
- // 打印
- $('#lr_print').on('click', function () {
- $('#gridtable').jqprintTable();
- });
- },
- // 初始化列表
- initGird: function () {
- $('#gridtable').jfGrid({
- url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetPageList',
- headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "学生姓名", name: "StuName", width: 100, align: "left" },
{ label: "提交日期", name: "SubmitTime", width: 150, align: "left" },
{
- label: "系", name: "DeptNo", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
- {
- label: "专业", name: "MajorNo", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- key: value,
- keyId: 'majorno',
- callback: function (_data) {
- callback(_data['majorname']);
- }
- });
- }
- },
{
- label: "班级", name: "ClassNo", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
- key: value,
- keyId: 'classno',
- callback: function (_data) {
- callback(_data['classname']);
- }
- });
- }
- },
- { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
- {
- label: "是否单亲", name: "IsSingle", width: 100, align: "left",
- formatter: function (value, row) {
- if (value == true) {
- return '是';
- }
- else if (value == false) {
- return '否';
- }
- }
- },
- { label: "咨询内容", name: "Concent", width: 100, align: "left" },
{
- label: "最终回复人", name: "ReplyUser", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
- key: value,
- keyId: 'f_account',
- callback: function (_data) {
- callback(_data['f_realname']);
- }
- });
- }
- },
- { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
- { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
- {
- label: "状态", name: "State", width: 100, align: "left",
- formatter: function (cellvalue) {
- if (cellvalue == 2) {
- return "
待回复";
- } else if (cellvalue == 7) {
- return "
已归档";
- //return "
未发布";
- } else {
- return "
其他老师审核";
- }
- }
},
- ],
- mainId: 'Id',
- isPage: true
- });
- //page.search();
- },
- search: function (param) {
- param = param || {};
- param.StartTime = startTime;
- param.EndTime = endTime;
- $('#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 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2023-03-06 12:21
+ * 描 述：心理咨询回复(班级辅导员)
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var startTime;
+ var endTime;
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ // 时间搜索框
+ $('#datesearch').lrdate({
+ dfdata: [
+ { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+ ],
+ // 月
+ mShow: false,
+ premShow: false,
+ // 季度
+ jShow: false,
+ prejShow: false,
+ // 年
+ ysShow: false,
+ yxShow: false,
+ preyShow: false,
+ yShow: false,
+ // 默认
+ dfvalue: '1',
+ selectfn: function (begin, end) {
+ startTime = begin;
+ endTime = end;
+ page.search();
+ }
+ });
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#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' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/Form',
+ width: 800,
+ height: 700,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
+ // 查看
+ $('#lr_view').on('click', function () {
+ var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
+ if (learun.checkrow(PsychologyInfoId)) {
+ learun.layerForm({
+ id: 'formview',
+ title: '查看',
+ url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId,
+ width: 800,
+ height: 700,
+ btn: null,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ //主表Id
+ var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
+ var State = $('#gridtable').jfGridValue('State');
+
+ if (State != 2) {
+ learun.alert.warning('当前由其他老师审核！');
+ return false;
+ }
+ if (learun.checkrow(PsychologyInfoId)) {
+ learun.layerForm({
+ id: 'form',
+ title: '回复',
+ url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/Form?keyValue=' + keyValue,
+ width: 800,
+ height: 700,
+ 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 + '/LR_Desktop/PsychologyReplyInfo/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 打印
+ $('#lr_print').on('click', function () {
+ $('#gridtable').jqprintTable();
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetPageList',
+ headData: [
+ { label: "学号", name: "StuNo", width: 100, align: "left" },
+ { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+ { label: "提交日期", name: "SubmitTime", width: 150, align: "left" },
+ {
+ label: "系", name: "DeptNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ key: value,
+ keyId: 'deptno',
+ callback: function (_data) {
+ callback(_data['deptname']);
+ }
+ });
+ }
+ },
+ {
+ label: "专业", name: "MajorNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ key: value,
+ keyId: 'majorno',
+ callback: function (_data) {
+ callback(_data['majorname']);
+ }
+ });
+ }
+ },
+ {
+ label: "班级", name: "ClassNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
+ {
+ label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+ formatter: function (value, row) {
+ if (value == true) {
+ return '是';
+ }
+ else if (value == false) {
+ return '否';
+ }
+ }
+ },
+ { label: "咨询内容", name: "Concent", width: 100, align: "left" },
+ {
+ label: "最终回复人", name: "ReplyUser", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+ key: value,
+ keyId: 'f_account',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+
+ { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
+ { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+ {
+ label: "状态", name: "State", width: 100, align: "left",
+ formatter: function (cellvalue) {
+ if (cellvalue == 2) {
+ return "
待回复";
+ } else if (cellvalue == 7) {
+ return "
已归档";
+ //return "
未发布";
+ } else {
+ return "
其他老师审核";
+ }
+ }
+ },
+ ],
+ mainId: 'Id',
+ isPage: true,
+ sidx: 'SubmitTime',
+ sord: 'ASC'
+ });
+ //page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.StartTime = startTime;
+ param.EndTime = endTime;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
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 a4902b765..3192a01be 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,11 +138,12 @@ where a.Id='{keyValue}'";
strSql.Append("SELECT ");
strSql.Append(@"
info.StuNo,info.createtime as SubmitTime,info.Concent
-,t.ReplyUser,t.ReplyContent,t.ReplyTime,t.ReplyType,t.url,info.[state],info.id as PsychologyInfoId ,info.url as StuUrl
+,t.ReplyUser,t.ReplyContent,t.ReplyTime,a.ReplyType,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]=2 ) a on a.PsychologyInfoid=info.id ");
strSql.Append($" WHERE 1=1 and info.[state]>=2 and info.Id='{PsychologyInfoId}'");
return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString()).FirstOrDefault();