\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.js
index 0552f9444..9cd0eff9e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.js
@@ -1,12 +1,24 @@
(function () {
+ var userinfo = null;
var page = {
isScroll: true,
init: function ($page) {
+ userinfo = learun.storage.get('userinfo');
+ //主被动修改密码判断
+ if (learun.storage.get('pwd')===true) {
+ $page.find('#strongpwd').css("display", "block");
+ $page.find('#strongpwdout').css("display", "block");
+ }
$page.find('#savepassword').on('tap', function () {
if (!$('#modifypasswordform').lrformValid()) {
return false;
}
var formdata = $('#modifypasswordform').lrformGet();
+ var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+ if (!reg.test(formdata.newpassword)) {
+ learun.layer.toast('密码不满足强度要求');
+ return false;
+ }
if (formdata.newpassword1 === formdata.newpassword) {
var req = {
@@ -20,6 +32,7 @@
if (data) {// 表单数据保存成功，发起流程
learun.layer.toast(info);
learun.storage.set('logininfo', null);
+ learun.storage.set('pwd', false);
learun.nav.go({ path: 'login', isBack: false, isHead: false });
}
return false;
@@ -29,6 +42,25 @@
learun.layer.toast('二次输入密码不同');
}
});
+ $page.find('#outloginbtn').on('tap', function () {
+ learun.layer.confirm('确定要退出账号?', function (_index) {
+ if (_index === '1') {
+ learun.isOutLogin = true;
+ if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
+ //Ip上网
+ sendToAc(learun.storage.get("ACIp"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+ }
+ if (learun.storage.get("Ip") != null && learun.storage.get("ACIp2") != "") {
+ //Ip上网
+ sendToAc(learun.storage.get("ACIp2"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+ }
+ learun.storage.set('logininfo', null);
+ learun.nav.go({ path: 'login', isBack: false, isHead: false });
+
+ }
+
+ }, '', ['取消', '退出']);
+ });
}
};
return page;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
index 31c1e6f5d..c989d93cd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
@@ -3,9 +3,11 @@
var page = {
isScroll: false,
init: function ($page) {
+ // 获取登录者信息
+ var userinfo = learun.storage.get('userinfo');
- //ݰ
- learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+ //数据绑定
+ learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
if (data) {
var entity = data['StuInfoFreshEntity'];
if (entity != null) {
@@ -16,16 +18,16 @@
$('#ClassNo').html(entity.ClassNo);
$('#ClassTutorName').html(entity.ClassTutorName);
$('#ClassTutorMobile').html(entity.ClassTutorMobile);
- $('#PayFeeStatus').html(entity.PayFeeStatus);
- $('#CollectFileStatus').html(entity.CollectFileStatus);
- $('#GetKeyStatus').html(entity.GetKeyStatus);
+ $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费");
+ $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交");
+ $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取");
$('#IsCompleteInfo').html(entity.IsCompleteInfo);
$('#Dormitory').html(entity.DormitoryName);
}
}
});
-
+
},
bind: function ($page) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
index 0e901d528..a4bfb785e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
@@ -1,61 +1,61 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
index 8aadd1a53..ec11bc7c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
@@ -7,57 +7,53 @@
var page = {
isScroll: false,
init: function ($page) {
- //ݰ
- learun.layer.loading(true, 'ȡ');
- learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
- if (data) {
- for (var id in data) {
- if (id == "StuInfoFreshEntity") {
- //todo:
- console.log(data[id].IsCompleteInfo == "");//false
-
- if (data[id].IsCompleteInfo == "") {
- completeStyle("#IsCompleteInfo", "images/enter1-1.png");
- } else {
- notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
- }
- if (data[id].PayFeeStatus == "ѽɷ") {
- completeStyle("#PayFeeStatus", "images/enter1-2.png");
- } else {
- notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
- }
- if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) {
- notCompleteStyle("#StudentLoan", "images/enter2-3.png");
- } else {
- completeStyle("#StudentLoan", "images/enter1-3.png");
- }
- if (data[id].OnsitePayFeeStatus == "1") {
- completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
- } else {
- notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
- }
- if (data[id].RegisterStatus == "1") {
- completeStyle("#RegisterStatus", "images/enter1-5.png");
- } else {
- notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
- }
+ // 获取登录者信息
+ var userinfo = learun.storage.get('userinfo');
- }
+ //数据绑定
+ learun.layer.loading(true, '获取数据中');
+ learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
+ if (data) {
+ if (data["StuInfoFreshFamilyList"].length && data["StuInfoFreshFamilyList"].length > 0) {
+ completeStyle("#IsCompleteInfo", "images/enter1-1.png");
+ } else {
+ notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
+ }
+ if (data["StuInfoFreshEntity"].PayFeeStatus == "1") {
+ completeStyle("#PayFeeStatus", "images/enter1-2.png");
+ } else {
+ notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
}
+ if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+ completeStyle("#StudentLoan", "images/enter1-3.png");
+ } else {
+ notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+ }
+ if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+ completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+ } else {
+ notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+ }
+ if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
+ completeStyle("#RegisterStatus", "images/enter1-5.png");
+ } else {
+ notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
+ }
+
page.bind($page);
learun.layer.loading(false);
}
});
- //
+ //点击步骤
$page.on('tap', '#IsCompleteInfo', function () {
- learun.nav.go({ path: 'welcome', title: 'Ϣ', isBack: true, isHead: true, param: {}, type: 'right' });
+ learun.nav.go({ path: 'welcome', title: '完善新生信息', isBack: true, isHead: true, param: {}, type: 'right' });
});
$page.on('tap', '#RegisterStatus', function () {
- learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: 'ɱά', isBack: true, isHead: true, param: {}, type: 'right' });
+ learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
});
$page.on('tap', '#StudentLoan', function () {
- learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: 'дִ', isBack: true, isHead: true, param: {}, type: 'right' });
+ learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: '填写贷款回执码', isBack: true, isHead: true, param: {}, type: 'right' });
});
},
@@ -65,16 +61,16 @@
}
};
- //ʽ
+ //已完成样式
var completeStyle = function (box, img) {
$(box).removeClass("sSec1Type2").addClass("sSec1Type1");
- $(box).find(".sSec1State").html("");
+ $(box).find(".sSec1State").html('已完成');
$(box).find('img').attr("src", img);
};
- //ʽ
+ //未完成样式
var notCompleteStyle = function (box, img) {
$(box).removeClass("sSec1Type1").addClass("sSec1Type2");
- $(box).find(".sSec1State").html("δ");
+ $(box).find(".sSec1State").html('未完成');
$(box).find('img').attr("src", img);
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js
index 063f7e75a..8d9290718 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js
@@ -23,6 +23,7 @@
isScroll: false,
init: function ($page) {
//获取学年学期列表
+ learun.layer.loading(true, '获取数据中');
learun.httpget(config.webapi + "scoreSearch/academicAndSemesterList", {}, (data) => {
if (data == null || data.length <= 0) {
$('.studSeeSec2 .studSeeSec2Top').hide();
@@ -41,6 +42,8 @@
studentSeeAjax(res.value)
}
});
+
+ learun.layer.loading(false);
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js
index d364dc515..f25753c3b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js
@@ -71,7 +71,7 @@
// }
// });
// }
- // }, 'Learun敏捷框架提示', ['取消', '确定']);
+ // }, '智慧校园提示', ['取消', '确定']);
// }
// }
// ],
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css
index 77c7b1d75..e457854ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css
@@ -113,9 +113,12 @@
margin: 10px auto;
cursor: pointer;
}
-
+.welImgAdd{
+ min-height:110px;
+}
#PhotoImg {
width: 110px;
+ height:110px;
}
.btnBox{
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js
index 2ae8eeea3..02242c932 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js
@@ -5,6 +5,8 @@
var page = {
isScroll: false,
init: function ($page) {
+ // 获取登录者信息
+ var userinfo = learun.storage.get('userinfo');
//增加联系人
$page.find('.welT i').on('tap', function () {
@@ -90,8 +92,10 @@
inputNode.on('change', function () {
previewFile();
});
+
//数据绑定
- learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+ learun.layer.loading(true, '获取数据中');
+ learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
if (data) {
//基本信息
for (var id in data['StuInfoFreshEntity']) {
@@ -185,7 +189,7 @@
});
page.bind($page);
-
+ learun.layer.loading(false);
}
@@ -202,7 +206,9 @@
StuInfoFreshFamilyEntities: family(),
StuInfoFreshEmergePeopleEntities: emergePeople()
};
+ learun.layer.loading(true, '正在提交数据');
learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => {
+ learun.layer.loading(false);
if (data) {
learun.layer.toast('保存成功');
location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.26696.2.2019-09-23.15-42-49.7910 b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.26696.2.2019-09-23.15-42-49.7910
deleted file mode 100644
index 1b96ccbcc..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.26696.2.2019-09-23.15-42-49.7910
+++ /dev/null
@@ -1,414 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-09.14-19-29.6038 b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-09.14-19-29.6038
deleted file mode 100644
index 295aab975..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-09.14-19-29.6038
+++ /dev/null
@@ -1,465 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-15.16-31-23.1336 b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-15.16-31-23.1336
deleted file mode 100644
index 295aab975..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-15.16-31-23.1336
+++ /dev/null
@@ -1,465 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html
index eaa8a1390..f7d954142 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html
@@ -217,6 +217,10 @@
var page = {
init: function ($page) {
+ //主被动修改密码判断
+ if (learun.storage.get('pwd') === true) {
+ learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
+ }
var _html = '';
// _html += '
';
// _html += '
';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.js
index 530662f21..5431f8df3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.js
@@ -6,6 +6,7 @@
var page = {
init: function ($page) {
+
var _html = '';
_html += '
';
_html += '
';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/_sgbak/learun-custmerform.js.26692.2.2020-08-04.14-24-39.5824 b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/_sgbak/learun-custmerform.js.26692.2.2020-08-04.14-24-39.5824
deleted file mode 100644
index e92414898..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/_sgbak/learun-custmerform.js.26692.2.2020-08-04.14-24-39.5824
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
- * 版 本 Learun-ADMS V7.0.0 数字化智慧校园(http://www.learun.cn)
- * Copyright (c) 2013-2017 北京泉江科技有限公司
- * 创建人：数字化智慧校园-前端开发组
- * 日 期：2018.7.12
- * 描 述：数字化智慧校园移动端框架(ADMS) 自定义表单
- */
-
-(function ($, learun, window) {
- // 加载自定义表单模板
- learun.custmerform = {
- loadScheme: function (schemeIds, callback) {// formIds表单主键集合,callback回调函数
- if (learun.type(schemeIds) === 'string') {
- schemeIds = [schemeIds];
- }
-
- var req = [];
- var scheme = {};
- $.each(schemeIds, function (_index, _item) {
- var formId = 'lrform' + _item;
- var formScheme = learun.storage.get(formId);// 从缓存中获取表单模板数据
- if (!formScheme) {
- req.push({ id: _item, ver: "" });
- }
- else {
- scheme[_item] = JSON.parse(formScheme.content);
- req.push({ id: _item, ver: formScheme.ver });
- }
- });
- // 加载自定义表单模板
- learun.httpget(config.webapi + "learun/adms/form/scheme", req, (data) => {
- if (data) {
- $.each(data, function (_index, _item) {
- scheme[_index] = JSON.parse(_item.F_Scheme);
- var formScheme = { ver: _item.F_Id, content: _item.F_Scheme };
- learun.storage.set('lrform' + _index,formScheme);
- });
- }
- callback(scheme);
- });
- }
- };
- // 自定义表单初始化
- $.fn.custmerform = function (formScheme) {
- var $this = $(this);
- $this.scroll();
- var $container = $this.find('.f-scroll');
-
- $.each(formScheme, function (_id, _scheme) {
- custmerformRender($container, _scheme.data, _id);
- });
- $this = null;
- $container = null;
- };
- // 获取自定义表单数据
- $.fn.custmerformGet = function () {
- var res = {};
- var validateflag = true;
- $(this).find('.lrcomponts').each(function () {
- var $this = $(this);
- var schemeInfoId = $this.attr('data-id');
- var _componts = $this[0].componts;
- res[schemeInfoId] = res[schemeInfoId] || {};
- // 遍历自定义表单控件
- $.each(_componts, function (_index, _item) {
- var _fn = componts[_item.type].get;
- if (_fn) {
- var compontData = _fn(_item, $this);
- if (compontData.isHad) {
- if (_item.verify) {
- var checkfn = window.fui.validator['is' + _item.verify];
- var r = checkfn(compontData.value);
- if (!r.code) {
- validateflag = false;
- window.fui.dialog({ msg: r.msg });
- return false;
- }
- }
- res[schemeInfoId][_item.id] = compontData.value;
- }
- }
- });
- $this = null;
- if (!validateflag) {
- return false;
- }
- });
- if (!validateflag) {
- return null;
- }
- return res;
- };
- // 设置自定义表单数据
- $.fn.custmerformSet = function (data) {
- var $this = $(this);
- function set($this, data) {
- if ($this.find('.lrcomponts').length > 0) {
- $this.find('.lrcomponts').each(function () {
- var $this = $(this);
- var schemeInfoId = $this.attr('data-id');
- var _componts = $this[0].componts;
- var _data = {};
- $.each(data[schemeInfoId] || [], function (_index, _item) {
- $.each(_item[0] || [], function (_id, _jitem) {
- _data[_index.toLowerCase() + _id] = _jitem;
- });
- });
- // 遍历自定义表单控件
- $.each(_componts, function (_index, _item) {
- var _fn = componts[_item.type].set;
- if (_fn) {
- if (_item.table && _item.field) {
- _fn(_item, _data[(_item.table + _item.field).toLowerCase()], $this);
- }
- else if (_item.table){// 表格
- _fn(_item, data[schemeInfoId][_item.table], $this);
- }
- }
- });
- $this = null;
- });
- }
- else {
- setTimeout(function () {
- set($this, data);
- }, 100);
- }
- }
- set($this, data);
- };
-
- function getFontHtml(verify) {
- var res = "";
- switch (verify) {
- case "NotNull":
- case "Num":
- case "Email":
- case "EnglishStr":
- case "Phone":
- case "Fax":
- case "Mobile":
- case "MobileOrPhone":
- case "Uri":
- res = '
*';
- break;
- }
- return res;
- }
- function loadCheck(data, text, value, compontId) {
- var $row = $('#' + compontId);
- if ($row.length === 0) {
- setTimeout(function () {
- loadCheck(data, text, value, compontId);
- }, 100);
- }
- else {
- var $Last = $row;
- $.each(data, function (_index, _item) {
- $div = $('
');
- $Last.after($div);
- $div.find('.checkbox').lrswitch();
- $Last = $div;
- $div = null;
- });
- if ($Last) {
- $Last.after('
');
- $Last = null;
- }
- }
- $row = null;
- }
- function organizeRegister1(_compont) {
- if ($('#' + _compont.relation).length > 0) {
- $('#' + _compont.relation).on('change', { myId: _compont.id }, function (e) {
- e = e || window.event;
- var myId = e.data.myId;
- var value = $(this).lrselectGet();
- $('#' + myId).lrselectUpdate({
- companyId: value,
- needPre: value === '' ? true : false
- });
- });
- }
- else {
- setTimeout(function () { organizeRegister1(_compont); }, 100);
- }
- }
- function organizeRegister2(_compont) {
- if ($('#' + _compont.relation).length > 0) {
- $('#' + _compont.relation).on('change', { myId: _compont.id }, function (e) {
- e = e || window.event;
- var myId = e.data.myId;
- var value = $(this).lrselectGet();
- $('#' + myId).lrselectUpdate({
- departmentId: value,
- needPre: value === '' ? true : false
- });
- });
- }
- else {
- setTimeout(function () { organizeRegister2(_compont); }, 100);
- }
- }
-
- function loadGridComponts(compont) {
- }
- function loadGridButton(compont) {// 编辑表格增加按钮
- var $row = $('#' + compont.id);
- if ($row.length === 0) {
- setTimeout(function () {
- loadGridButton(compont);
- }, 100);
- }
- else {
- var $btn = $('
增加' + (compont.title || '') + '
');
- $btn[0].compont = compont;
-
- $btn.on('tap', { compont: compont }, function (e) {
- e = e || window.event;
- });
-
- $row.after($btn);
- }
- $row = null;
- }
-
- // 渲染自定义表单
- function custmerformRender($container, scheme, schemeInfoId) {
- var loaddataComponts = [];
- $.each(scheme, function (_index, _item) {
- var $list = $('
');
- $list[0].componts = _item.componts;
- $.each(_item.componts, function (_jindex, _jitem) {
- var $row = $('
');
- if (componts[_jitem.type].render($row, _jitem)) {
- $list.append($row);
- $row.prepend(getFontHtml(_jitem.verify));
- }
- });
- $container.append($list);
- });
-
- $container = null;
- }
-
- var componts = {
- label: {
- render: function ($row, compont) {
- $row.addClass('lr-form-row-title');
- return true;
- }
- },
- html: {
- render: function ($row, compont) {
- return false;
- }
- },
- text: {
- render: function ($row, compont) {
- var $compont = $('
');
- $row.append($compont);
- $compont.val(compont.dfvalue || '');
-
- $compont = null;
- $row = null;
- if (compont.isHide === '1') {
- return false;
- }
-
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.val();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).val(value || '');
- }
- },
- textarea: {
- render: function ($row, compont) {
- $row.addClass('lr-form-row-multi');
- var $compont = $('
');
- $compont.text(compont.dfvalue || '');
- $row.append($compont);
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.val();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).val(value || '');
- }
- },
- texteditor: {
- render: function ($row, compont) {
- $row.addClass('lr-form-row-multi');
- var $compont = $('
');
- $compont.text(compont.dfvalue || '');
- $row.append($compont);
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.val();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).val(value || '');
- }
- },
- radio: {
- render: function ($row, compont) {// 单选改用和下拉一致
- var $compont = $('
');
- $row.append($compont);
- if (compont.dataSource === '0') {
- $compont.lrpickerex({
- code: compont.itemCode,
- type: 'dataItem'
- });
- } else {
- var vlist = compont.dataSourceId.split(',');
- $compont.lrpickerex({
- code: vlist[0],
- type: 'sourceData',
- ivalue: vlist[2],
- itext: vlist[1]
- });
- }
-
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrpickerGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).lrpickerSet(value);
- }
- },
- checkbox: {
- render: function ($row, compont) {
- var $compont = $('
');
- $row.append($compont);
- if (compont.dataSource === '0') {
- $compont.lrcheckboxex({
- code: compont.itemCode,
- type: 'dataItem'
- });
- } else {
- var vlist = compont.dataSourceId.split(',');
- $compont.lrcheckboxex({
- code: vlist[0],
- type: 'sourceData',
- ivalue: vlist[2],
- itext: vlist[1]
- });
- }
-
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrcheckboxGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).lrcheckboxSet(value);
- }
- },
- select: {
- render: function ($row, compont) {//
- var $compont = $('
');
- $row.append($compont);
- if (compont.dataSource === '0') {
- $compont.lrpickerex({
- code: compont.itemCode,
- type: 'dataItem'
- });
- } else {
- var vlist = compont.dataSourceId.split(',');
- $compont.lrpickerex({
- code: vlist[0],
- type: 'sourceData',
- ivalue: vlist[2],
- itext: vlist[1]
- });
- }
-
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrpickerGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).lrpickerSet(value);
- }
- },
- datetime: {
- render: function ($row, compont) {//
- var $compont = $('
');
- $row.append($compont);
- if (compont.dateformat === '0') {
- $compont.lrdate({
- type: 'date'
- });
- }
- else {
- $compont.lrdate();
- }
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrdateGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- if (compont.dateformat === '0') {
- value = learun.date.format(value, 'yyyy-MM-dd');
- }
- else {
- value = learun.date.format(value, 'yyyy-MM-dd hh:mm');
- }
-
- $container.find('#' + compont.id).lrdateSet(value);
- }
- },
- datetimerange: {
- render: function ($row, compont) {//
- var $compont = $('
');
- function register(_compont) {
- if ($('#' + _compont.startTime).length > 0 && $('#' + _compont.endTime).length > 0) {
- $('#' + _compont.startTime).on('change', { myId: _compont.id, end: _compont.endTime }, function (e) {
- e = e || window.event;
- var end = e.data.end;
- var myId = e.data.myId;
- var st = $(this).lrdateGet();
- var et = $('#' + end).lrdateGet();
- if (!!st && !!et) {
- var diff = learun.date.parse(st).DateDiff('d', et) + 1;
- $('#' + myId).val(diff);
- }
- });
- $('#' + _compont.endTime).on('change', { myId: _compont.id, begin: _compont.startTime }, function (e) {
- e = e || window.event;
- var begin = e.data.begin;
- var myId = e.data.myId;
-
- var st = $('#' + begin).lrdateGet();
- var et = $(this).lrdateGet();
- if (!!st && !!et) {
- var diff = learun.date.parse(st).DateDiff('d', et) + 1;
- $('#' + myId).val(diff);
- }
- });
- }
- else {
- setTimeout(function () {
- register(_compont);
- }, 100);
- }
- }
- if (!!compont.startTime && compont.endTime) {
- register(compont);
- }
- $row.append($compont);
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.val();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).val(value);
- }
- },
- encode: {
- render: function ($row, compont) {
- var $compont = $('
');
- compont.isInit = false;
- learun.getRuleCode(compont.rulecode, function (data) {
- if (!compont.isInit) {
- compont.isInit = true;
- $('#' + compont.id).val(data);
- }
- });
- $row.append($compont);
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.val();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- compont.isInit = true;
- $container.find('#' + compont.id).val(value);
- }
- },
- organize: {
- render: function ($row, compont) {
- var $compont = $('
');
- $row.append($compont);
- switch (compont.dataType) {
- case "company"://公司
- $compont.lrselect();
- break;
- case "department"://部门
- $compont.lrselect({
- type: 'department',
- needPre: compont.relation === '' ? false : true
- });
-
- organizeRegister1(compont);
- break;
- case "user"://用户
- $compont.lrselect({
- type: 'user',
- needPre: compont.relation === '' ? false : true
- });
- organizeRegister2(compont);
- break;
- }
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrselectGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).lrselectSet(value);
- }
- },
- currentInfo: {
- render: function ($row, compont) {
- var $compont = $('
');
- var userinfo = learun.storage.get('userinfo');
- switch (compont.dataType) {
- case 'company':
- compont.value = userinfo.baseinfo.companyId;
- if (compont.isHide !== '1') {
- learun.clientdata.get('company', {
- key: compont.value,
- compont: compont,
- callback: function (item, _op) {
- if (!_op.compont.isEdit) {
- $(_op.compont.id).val(item.name);
- }
- }
- });
- }
- break;
- case 'department':
- compont.value = userinfo.baseinfo.departmentId;
- if (compont.isHide !== '1') {
- learun.clientdata.get('department', {
- key: compont.value,
- compont: compont,
- callback: function (item, _op) {
- if (!_op.compont.isEdit) {
- $(_op.compont.id).val(item.name);
- }
- }
- });
- }
- break;
- case 'user':
- $compont.val(userinfo.baseinfo.realName);
- compont.value = userinfo.baseinfo.userId;
- break;
- case 'time':
- compont.value = learun.date.format(new Date(), 'yyyy-MM-dd hh:mm:ss');
- $compont.val(compont.value);
- break;
- case 'guid':
- compont.value = learun.guid();
- $compont.val(compont.value);
- break;
- }
- if (compont.isHide === '1') {
- $compont = null;
- $row = null;
- return false;
- }
- else {
- $row.append($compont);
- $compont = null;
- $row = null;
- }
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = compont.value;
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- if (value) {
- var organization = learun.storage.get('organization');
- compont.isEdit = true;
- switch (compont.dataType) {
- case 'company':
- compont.value = value;
- if (compont.isHide !== '1') {
- learun.clientdata.get('company', {
- key: compont.value,
- compont: compont,
- callback: function (item, _op) {
- $container.find('#' + _op.compont.id).val(item.name || '');
- }
- });
- }
- break;
- case 'department':
- compont.value = value;
- if (compont.isHide !== '1') {
- learun.clientdata.get('department', {
- key: compont.value,
- compont: compont,
- callback: function (item, _op) {
- $container.find('#' + _op.compont.id).val(item.name || '');
- }
- });
- }
- break;
- case 'user':
- compont.value = value;
- if (compont.isHide !== '1') {
- learun.clientdata.get('user', {
- key: compont.value,
- compont: compont,
- callback: function (item, _op) {
- $container.find('#' + _op.compont.id).val(item.name || '');
- }
- });
- }
- break;
- case 'time':
- compont.value = value;
- if (compont.isHide !== '1') {
- $container.find('#' + compont.id).val(value);
- }
- break;
- case 'guid':
- compont.value = value;
- if (compont.isHide !== '1') {
- $container.find('#' + compont.id).val(value);
- }
- break;
- }
- }
- }
- },
- guid: {
- render: function ($row, compont) {
- compont.value = learun.guid();
- $row.remove();
- return false;
- },
- get: function (compont) {
- var res = {};
- res.isHad = true;
- res.value = compont.value;
- return res;
- },
- set: function (compont, value) {
- compont.value = value;
- }
- },
- upload: {
- render: function ($row, compont) {
- $row.addClass('lr-form-row-multi');
- var $compont = $('
');
- $row.append($compont);
- $compont.lrImagepicker();
- $compont = null;
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.imagepickerGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).imagepickerSet(value);
- }
- },
- girdtable: {
- render: function ($row, compont) {
- var gridCompont = [];
- $.each(compont.fieldsData, function (_index, _item) {
- if (_item.field) {
- switch (_item.type) {
- case 'radio':
- case 'select':
- case 'checkbox':
- if (_item.dataSource === '0') {
- _item.code = _item.itemCode;
- _item.datatype = 'dataItem';
- }
- else {
- _item.code = _item.dataSourceId;
- _item.ivalue = _item.saveField;
- _item.itext = _item.showField;
- _item.datatype = 'sourceData';
- }
- break;
- case 'layer':
- if (_item.dataSource === '0') {
- _item.code = _item.itemCode;
- _item.datatype = 'dataItem';
- }
- else {
- _item.code = _item.dataSourceId;
- _item.datatype = 'sourceData';
- }
- break;
- }
-
-
- gridCompont.push(_item);
- }
- });
- $row.attr('id', compont.id);
- $row.lrgrid({
- title: compont.title,
- componts: gridCompont,
- isToLowerCase: true
- });
- $row = null;
- return true;
- },
- get: function (compont, $container) {
- var res = {};
- var $compont = $container.find('#' + compont.id);
- res.isHad = $compont.length > 0 ? true : false;
- if (res.isHad) {
- res.value = $compont.lrgridGet();
- }
- $compont = null;
- return res;
- },
- set: function (compont, value, $container) {
- $container.find('#' + compont.id).lrgridSet(value);
- }
- }
- };
-
-})(window.jQuery, window.lrmui, window);
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js
index 3a453d948..25040bdd0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js
@@ -29,6 +29,7 @@
$(".login-content").show();
$("#accountopenid").val(res.data.openid);
$("#loginBtn").on("click", function () {
+ var up = true;
var account = $('#account').val();
var password = $('#password').val();
if (account === "") {
@@ -36,10 +37,15 @@
} else if (password === "") {
learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');
} else {
+ var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+ if (!reg.test(password)) {
+ up = false;
+ }
var data = {
username: account,
password: $.md5(password),
- openid: $("#accountopenid").val()
+ openid: $("#accountopenid").val(),
+ up: up
};
var postdata = {
token: '',
@@ -55,7 +61,6 @@
return;
}
if (res.code === 200) {
- console.log(res);
var logininfo = {
account: account,
token: res.data.baseinfo.token,
@@ -65,6 +70,12 @@
learun.storage.set('userinfo', res.data);
$('#account').val('');
$('#password').val('');
+ if (res.data.pwd === true) {
+ learun.storage.set('pwd', true);
+ learun.layer.warning("绑定失败！您的密码不满足强度要求，请您先修改密码后再执行系统其他操作");
+ } else {
+ learun.storage.set('pwd', false);
+ }
location.href = "http://" + window.location.host;
} else {
learun.layer.warning(res.info, function () { }, '提示', '关闭');
@@ -74,7 +85,6 @@
});
}
} else {
- console.log(res.info);
learun.layer.warning(res.info);
location.href = "http://" + window.location.host;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
index 2593a693c..a798f7167 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
@@ -566,6 +566,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
stuInfoFreshIBLL.IsOtherPayFee(keyValue, status);
return Success("操作成功");
}
+
+ ///
+ ///审核助学贷款
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DoCheckLoan(string keyValue, string status)
+ {
+ stuInfoFreshIBLL.DoCheckLoan(keyValue, status);
+ return Success("操作成功");
+ }
+
///
/// 获取新生缴费明细
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs
index 079358e44..da79f58f3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return View();
}
-
+
///
/// 学生成绩录入可去审核页面
@@ -640,9 +640,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
StuId = x.Key.StuId,
StuNo = x.Key.StuNo,
StuName = x.Key.StuName,
- FinishSchoolMark=stuData.FirstOrDefault(a=>a.StuNo==x.Key.StuNo)?.FinishSchoolMark,
+ FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
TotalScore = x.Select(y => y.Score).Sum(),
- LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+ LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
}).OrderByDescending(x => x.TotalScore);
var result = new List>();
@@ -656,7 +656,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
aaa.Add("TotalScore", item.TotalScore.ToString());
foreach (var lessonInfoItem in item.LessonInfo)
{
- aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+ aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
}
result.Add(aaa);
@@ -678,8 +678,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
StuNo = x.Key.StuNo,
StuName = x.Key.StuName,
FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
- TotalScore = x.Where(m=>m.LessonSortNo=="1").Select(y => y.Score).Sum(),
- LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+ TotalScore = x.Where(m => m.LessonSortNo == "1").Select(y => y.Score).Sum(),
+ LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
}).OrderByDescending(x => x.TotalScore);
var result = new List>();
@@ -693,7 +693,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
aaa.Add("TotalScore", item.TotalScore.ToString());
foreach (var lessonInfoItem in item.LessonInfo)
{
- aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+ aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
}
result.Add(aaa);
@@ -739,7 +739,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
StuNo = x.Key.StuNo,
StuName = x.Key.StuName,
TotalScore = x.Select(y => y.Score).Sum(),
- LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+ LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
}).OrderByDescending(x => x.TotalScore);
var result = new List>();
foreach (var item in aa)
@@ -750,7 +750,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
aaa.Add("TotalScore", item.TotalScore.ToString());
foreach (var lessonInfoItem in item.LessonInfo)
{
- aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+ aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
}
result.Add(aaa);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs
index dfccbb604..d0c5e2dbd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs
@@ -47,6 +47,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}
+ ///
+ /// 指派人列表
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IssueForm()
+ {
+ return View();
+ }
+
+ ///
+ /// 阅读详情
+ ///
+ ///
+ [HttpGet]
+ public ActionResult ReadList()
+ {
+ return View();
+ }
#endregion
#region 获取数据
@@ -118,6 +137,23 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return Success("删除成功！");
}
///
+ /// 结束下发
+ /// 主键
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult OverIssue(string keyValue)
+ {
+ var entity = sYS_ReceiveDocumentIBLL.GetSys_ReceiveDocumentEntity(keyValue);
+ if (null != entity)
+ {
+ entity.RSendFlag = "4";
+ sYS_ReceiveDocumentIBLL.SaveEntity(keyValue, entity);
+ }
+ return Success("操作成功！");
+ }
+ ///
/// 保存实体数据（新增、修改）
/// 主键
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs
index 5c4796165..84f5a5c1d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs
@@ -62,6 +62,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return View();
}
///
+ /// 主页面【党政公文查阅】
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexGWJS()
+ {
+ return View();
+ }
+ ///
/// 表单页
///
///
@@ -100,38 +109,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject();
- var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1);
- var jsonData = new
- {
- rows = data,
- total = paginationobj.total,
- page = paginationobj.page,
- records = paginationobj.records
- };
- return Success(jsonData);
- }
-
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetPageListDocument(string pagination, string queryJson)
- {
- Pagination paginationobj = pagination.ToObject();
- var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 2);
- var jsonData = new
- {
- rows = data,
- total = paginationobj.total,
- page = paginationobj.page,
- records = paginationobj.records
- };
- return Success(jsonData);
- }
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetPageListParty(string pagination, string queryJson)
- {
- Pagination paginationobj = pagination.ToObject();
- var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 3);
+ var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
@@ -236,6 +214,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
sys_ReceiveFileIBLL.Issue(entity);
return Success("保存成功！");
}
+
+
+ ///
+ /// 公文接收 下发指定接收人
+ /// 主键
+ ///
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult ReceiveDocumentIssue(string strEntity)
+ {
+ Sys_IssueEntity entity = strEntity.ToObject();
+ sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity);
+ return Success("保存成功！");
+ }
///
/// 查看实体数据
/// 主键
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml
index 9827a3d2f..ae9fa5fa9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml
@@ -9,6 +9,7 @@
+
查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
index cf5a19ef2..296d47d15 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
@@ -17,7 +17,8 @@ var bootstrap = function ($, learun) {
// 查询
$('#btn_Search').on('click', function () {
var keyword = $('#txt_Keyword').val();
- page.search({ keyword: keyword });
+ var Grade = $('#Grade').val();
+ page.search({ keyword: keyword, Grade: Grade });
});
// 刷新
$('#lr_refresh').on('click', function () {
@@ -172,6 +173,7 @@ var bootstrap = function ($, learun) {
{ label: '考生号', name: 'ksh', width: 150, align: "left" },
{ label: '准考证号', name: 'zkzh', width: 150, align: "left" },
{ label: '学号', name: 'StuNo', width: 100, align: "left" },
+ { label: '年级', name: 'Grade', width: 100, align: "left" },
{ label: '姓名', name: 'StuName', width: 100, align: "left" },
{
label: '是否完善信息', name: 'ID', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
index ee697bc2a..c0c4fb108 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
@@ -26,6 +26,8 @@
线上缴费
取消线上缴费
填写贷款回执码
+
审核助学贷款
+
去审核助学贷款
现场缴费
其他费用缴费
取消其他费用缴费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index afd6ed3c0..5f61b0722 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
@@ -89,11 +89,15 @@ var bootstrap = function ($, learun) {
});
}
});
- // 助学贷款
+ // 填写贷款回执码
$('#lr_loan').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
selectedRow = $('#gridtable').jfGridGet('rowdata');
if (learun.checkrow(keyValue)) {
+ if (selectedRow.StudentLoanStatus == "1") {
+ learun.alert.warning("当前新生助学贷款已审核！");
+ return;
+ }
learun.layerForm({
id: 'loanForm',
title: '助学贷款',
@@ -106,6 +110,47 @@ var bootstrap = function ($, learun) {
});
}
});
+ // 审核助学贷款
+ $('#lr_checkLoan').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ selectedRow = $('#gridtable').jfGridGet('rowdata');
+ if (learun.checkrow(keyValue)) {
+ if (selectedRow.StudentLoanStatus == "1") {
+ learun.alert.warning("当前新生助学贷款已审核！");
+ return;
+ }
+ if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
+ learun.alert.warning("贷款回执码为空！");
+ return;
+ }
+
+ learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 去审核助学贷款
+ $('#lr_uncheckLoan').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ selectedRow = $('#gridtable').jfGridGet('rowdata');
+ if (learun.checkrow(keyValue)) {
+ if (selectedRow.StudentLoanStatus != "1") {
+ learun.alert.warning("当前新生助学贷款未审核！");
+ return;
+ }
+ learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
// 现场缴费
$('#lr_onsitePay').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
@@ -176,6 +221,11 @@ var bootstrap = function ($, learun) {
},
{ label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
{ label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
+ {
+ label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "
已审核" : "
未审核";
+ }
+ },
{
label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.cshtml
index d46c7c1ee..7b23cf9a0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.cshtml
@@ -19,6 +19,11 @@
文件标题
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
index dedd439d4..4bfa68923 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
@@ -77,6 +77,31 @@ var bootstrap = function ($, learun) {
});
}
});
+ // 查看
+ $('#lr_view').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('RID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '查看',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/FormView?keyValue=' + keyValue,
+ width: 800,
+ height: 600,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+ });
// 删除
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('RID');
@@ -115,6 +140,64 @@ var bootstrap = function ($, learun) {
});
}
});
+ // 下发审批指定接收人
+ $('#lr_IssueSpecifyReceiver').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('RID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '下发审批指定接收人',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/IssueForm?keyValue=' + keyValue,
+ width: 800,
+ height: 200,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+ });
+ // 结束下发
+ $('#lr_OverIssue').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('RID');
+ if (learun.checkrow(keyValue)) {
+ var SendFlag = $('#gridtable').jfGridValue('RSendFlag');
+ if (SendFlag !== 2) {
+ learun.alert.warning("当前公文未审批通过，请耐心等待审批！");
+ return;
+ }
+ learun.layerConfirm('是否结束下发！', function (res) {
+ if (res) {
+ processId = learun.newGuid();
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/OverIssue', { keyValue: keyValue, }, function (res) {
+ refreshGirdData(res, {});
+ });
+ }
+ });
+ }
+ });
+ // 查阅情况
+ $('#lr_read').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('RID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '查阅情况',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/ReadList?keyValue=' + keyValue,
+ width: 850,
+ height: 400,
+ btn: null
+ });
+ }
+ });
},
// 初始化列表
initGird: function () {
@@ -146,13 +229,42 @@ var bootstrap = function ($, learun) {
}
},
{ label: "文件标题", name: "RTitle", width: 100, align: "left" },
+ {
+ label: "已接收", name: "ReceiverId", width: 300, align: "left", formatterAsync:
+ function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user',
+ {
+ key: value,
+ callback: function (_data) {
+ if (_data.length > 0) {
+ var text = '';
+ $.each(_data,
+ function (i, item) {
+ if (item) {
+ text += item.name + ',';
+ }
+ });
+ text = text.substring(0, text.lastIndexOf(','));
+ callback(text);
+ } else {
+ callback(_data.name);
+ }
+ }
+ });
+ }
+ },
+ { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" },
{
label: "状态", name: "RSendFlag", width: 100, align: "left",
formatter: function (cellvalue, row) {
- if (cellvalue == 1) {
+ if (cellvalue === "1") {
return '
审批中';
- } else if (cellvalue == 2) {
- return '
已下发';
+ } else if (cellvalue === "2") {
+ return '
审批通过';
+ } else if (cellvalue === "3") {
+ return '
审批失败';
+ } else if (cellvalue === "4") {
+ return '
下发完毕';
} else {
return '
草稿';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.cshtml
new file mode 100644
index 000000000..9377585a4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.cshtml
@@ -0,0 +1,11 @@
+@{
+ ViewBag.Title = "公文发送";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js
new file mode 100644
index 000000000..d57fc59cb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js
@@ -0,0 +1,62 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-04-11 10:31
+ * 描 述：公文发送
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var rFileId = request('rFileId');
+var specifyReceiver = request('specifyReceiver');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+ "use strict";
+ // 设置权限
+ setAuthorize = function (data) {
+ };
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#SpecifyReceiver').lrUserSelect({ type: '1' });
+ },
+ initData: function () {
+ if (rFileId) {
+ $('#SpecifyReceiver').lrformselectSet(specifyReceiver);
+ }
+ }
+ };
+ // 验证数据是否填写完整
+ validForm = function () {
+ if (!$('#form').lrValidform()) {
+ return false;
+ }
+ return true;
+ };
+ // 保存数据
+ save = function (processId, callBack, i) {
+ var formData = $('body').lrGetFormData();
+ formData.RFileId = rFileId;
+ formData.SFileId = keyValue;
+ var postData = {
+ strEntity: JSON.stringify(formData)
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/ReceiveDocumentIssue', postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, formData, i);
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml
new file mode 100644
index 000000000..65b9df404
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml
@@ -0,0 +1,29 @@
+@{
+ ViewBag.Title = "公文发送";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js
new file mode 100644
index 000000000..e33eb9d0f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js
@@ -0,0 +1,136 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-04-11 10:31
+ * 描 述：公文发送
+ */
+var refreshGirdData;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+ "use strict";
+ var processId = '';
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ // 查询
+ $('#btn_Search').on('click', function () {
+ var keyword = $('#Receiver').val();
+ page.search({ Receiver: keyword });
+ });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+
+ $('#lr_Issue').on('click',
+ function () {
+ var keyValue = $('#gridtable').jfGridValue('SFileId');
+ var rFileId = $('#gridtable').jfGridValue('RFileId');
+ var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
+ if (learun.checkrow(rFileId)) {
+ var SendStatus = $('#gridtable').jfGridValue('SendStatus');
+ if (SendStatus) {
+ learun.alert.warning("已下发！");
+ return;
+ }
+ learun.layerForm({
+ id: 'formIssue',
+ title: '下发',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver,
+ width: 500,
+ height: 500,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
+ headData: [
+ {
+ label: "接收人", name: "Receiver", width: 150, align: "left"
+ },
+ {
+ label: "查阅时间", name: "ReadTime", width: 150, align: "left"
+ },
+ {
+ label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+ function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user',
+ {
+ key: value,
+ callback: function (_data) {
+ if (_data.length > 0) {
+ var text = '';
+ $.each(_data,
+ function (i, item) {
+ if (item) {
+ text += item.name + ',';
+ }
+ });
+ text = text.substring(0, text.lastIndexOf(','));
+ callback(text);
+ } else {
+ callback(_data.name);
+ }
+ }
+ });
+ }
+ },
+ {
+ label: "状态", name: "ReadFlag", width: 100, align: "left",
+ formatter: function (cellvalue, row) {
+ if (cellvalue === true) {
+ return '
已读';
+ } else {
+ return '
未读';
+ }
+ }
+ },
+ {
+ label: "下发状态", name: "SendStatus", width: 100, align: "left",
+ formatter: function (cellvalue, row) {
+ if (cellvalue === true) {
+ return '
已下发';
+ } else {
+ return '
未下发';
+ }
+ }
+ }
+ ],
+ mainId: 'RFileId',
+ isPage: true,
+ sidx: 'ReadFlag,ReadTime',
+ sord: 'ASC'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.SFileId = keyValue;
+ param.STypeId = 4;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.cshtml.30961.1.2019-10-25.09-36-12.0372 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.cshtml.30961.1.2019-10-25.09-36-12.0372
deleted file mode 100644
index 79f2cb5e8..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.cshtml.30961.1.2019-10-25.09-36-12.0372
+++ /dev/null
@@ -1,31 +0,0 @@
-@{
- ViewBag.Title = "公文收发";
- Layout = "~/Views/Shared/_Form.cshtml";
-}
-
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.js.30962.1.2019-10-25.09-36-12.0442 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.js.30962.1.2019-10-25.09-36-12.0442
deleted file mode 100644
index 22b6ce1ae..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.js.30962.1.2019-10-25.09-36-12.0442
+++ /dev/null
@@ -1,59 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
- * Copyright (c) 2013-2018 北京泉江科技有限公司
- * 创建人：超级管理员
- * 日 期：2019-04-11 10:08
- * 描 述：公文收发
- */
-var acceptClick;
-var keyValue = request('keyValue');
-var bootstrap = function ($, learun) {
- "use strict";
- var selectedRow = learun.frameTab.currentIframe().selectedRow;
- var page = {
- init: function () {
- $('.lr-form-wrap').lrscroll();
- page.bind();
- page.initData();
- },
- bind: function () {
- $('#SendType').lrDataItemSelect({ code: 'FileSendType' });
- if (selectedRow.ReadFlag == true) {//已读
- $('#Url').lrUploader();
- } else {//未读
- $('#Url').lrUploader({ RFileId: selectedRow.RFileId });
- }
- },
- initData: function () {
- if (!!keyValue) {
- $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/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]);
- $('#Contents').html(data[id].Contents);
- }
- }
- $("#lrUploader_uploadBtn_Url").hide();
- });
- }
- }
- };
- // 保存数据
- acceptClick = function (callBack) {
- if (!$('body').lrValidform()) {
- return false;
- }
- var postData = {
- strEntity: JSON.stringify($('body').lrGetFormData())
- };
- $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/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_ReceiveFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js
index 369dd4cdc..d7e830102 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js
@@ -215,6 +215,7 @@ var bootstrap = function ($, learun) {
param.StartTime = startTime;
param.EndTime = endTime;
param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+ param.STypeId = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexDocument.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexDocument.js
index fca840687..c7a3c952a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexDocument.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexDocument.js
@@ -142,7 +142,7 @@ var bootstrap = function ($, learun) {
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListDocument',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
headData: [
{ label: "发送人", name: "Sender", width: 100, align: "left" },
{ label: "主题", name: "Title", width: 300, align: "left" },
@@ -193,6 +193,7 @@ var bootstrap = function ($, learun) {
param.StartTime = startTime;
param.EndTime = endTime;
param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+ param.STypeId = 2;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.cshtml.30963.1.2019-10-25.09-36-12.0482 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.cshtml
similarity index 87%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.cshtml.30963.1.2019-10-25.09-36-12.0482
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.cshtml
index 1a88e3984..7d0c09a4a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.cshtml.30963.1.2019-10-25.09-36-12.0482
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.cshtml
@@ -2,7 +2,7 @@
ViewBag.Title = "公文收发";
Layout = "~/Views/Shared/_Index.cshtml";
}
-
+
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.js.30964.1.2019-10-25.09-36-12.0522 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js
similarity index 72%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.js.30964.1.2019-10-25.09-36-12.0522
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js
index 9b69ce514..d85c98cff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.js.30964.1.2019-10-25.09-36-12.0522
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js
@@ -79,6 +79,22 @@ var bootstrap = function ($, learun) {
});
}
});
+ // 指定接收人
+ $('#lr_SpecifyReceiver').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('RFileId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'formSys_ReceiveFile',
+ title: '指定接收人',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SpecifyReceiverForm?keyValue=' + keyValue,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
// 删除
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('RFileId');
@@ -117,10 +133,10 @@ var bootstrap = function ($, learun) {
if (selectedRow.ReadFlag == false) {
//判断附件
//if (selectedRow.Url == null || selectedRow.Url == "") {
- //自动已读
- learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Read', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
+ //自动已读
+ learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Read', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
//}
}
},
@@ -135,10 +151,18 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
headData: [
- { label: "发送人", name: "Sender", width: 100, align: "left" },
+ {
+ label: "发送人", name: "SenderId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user', {
+ key: value,
+ callback: function (_data) {
+ callback(_data.name);
+ }
+ });
+ }},
{ label: "主题", name: "Title", width: 300, align: "left" },
{ label: "发送时间", name: "SendTime", width: 130, align: "left" },
{
@@ -152,6 +176,30 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+ function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user',
+ {
+ key: value,
+ callback: function (_data) {
+ if (_data.length > 0) {
+ var text = '';
+ $.each(_data,
+ function (i, item) {
+ if (item) {
+ text += item.name + ',';
+ }
+ });
+ text = text.substring(0, text.lastIndexOf(','));
+ callback(text);
+ } else {
+ callback(_data.name);
+ }
+ }
+ });
+ }
+ },
{
label: "状态", name: "ReadFlag", width: 100, align: "left",
formatter: function (cellvalue, row) {
@@ -175,6 +223,7 @@ var bootstrap = function ($, learun) {
param.StartTime = startTime;
param.EndTime = endTime;
param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+ param.STypeId = 4;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.js
index d95840123..1e4a6f349 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.js
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListParty',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
headData: [
{ label: "发送人", name: "Sender", width: 100, align: "left" },
{ label: "主题", name: "Title", width: 300, align: "left" },
@@ -175,6 +175,7 @@ var bootstrap = function ($, learun) {
param.StartTime = startTime;
param.EndTime = endTime;
param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+ param.STypeId=3
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml
index 18adff4de..f97bd71d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml
@@ -29,10 +29,10 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
index 4f2f9e528..65148062e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
@@ -125,6 +125,7 @@ var bootstrap = function ($, learun) {
search: function (param) {
param = param || {};
param.SFileId = keyValue;
+ param.STypeId = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListDocument.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListDocument.js
index c4524153b..32bf1e7c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListDocument.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListDocument.js
@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListDocument',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
headData: [
{
label: "接收人", name: "Receiver", width: 150, align: "left"
@@ -89,6 +89,8 @@ var bootstrap = function ($, learun) {
search: function (param) {
param = param || {};
param.SFileId = keyValue;
+ param.STypeId = 2;
+
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListParty.js
index 21a9e3a25..64f49ecd1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListParty.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadListParty.js
@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListParty',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
headData: [
{
label: "接收人", name: "Receiver", width: 150, align: "left"
@@ -57,6 +57,8 @@ var bootstrap = function ($, learun) {
search: function (param) {
param = param || {};
param.SFileId = keyValue;
+ param.STypeId = 3;
+
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
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 5f39f2e32..39523b40d 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
@@ -977,13 +977,17 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js
index dd05d41fb..0e1a5ee34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js
@@ -299,7 +299,7 @@
var data = storage.get("userData").data || {};
var keys = op.key.split(',');
var array=new Array();
- if (keys.length > 0) {
+ if (keys.length > 1) {
$.each(keys,
function (i, item) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
index b469337c9..6b1d55c5b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
@@ -19,11 +19,13 @@ namespace Learun.Application.WebApi.Modules
{
Get["/stuInfoFreshEntity"] = GetStuInfoFreshEntity;
Get["/stuInfoFresh"] = GetStuInfoFresh;
- Get["/stuInfoFreshEntityByStuNo"] = GetStuInfoFreshEntityByStuNo;
Get["/saveStuInfoFresh"] = GetSaveStuInfoFresh;
Get["/saveLoan"] = GetSaveLoan;
Post["/savePhoto"] = GetSavePhoto;
Get["/payFeeDetail"] = GetPayFeeDetail;
+ Get["/pageList"] = GetPageList;
+ Get["/form"] = GetForm;
+ Post["/save"] = SaveForm;
}
@@ -35,6 +37,7 @@ namespace Learun.Application.WebApi.Modules
private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
private AccommodationIBLL accdormitoryIBLL = new AccommodationBLL();
private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL();
+ private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL();
///
- 
- 
- 
- 
- 
- 
+ 
+ 
+