diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js index 27f07365d..81eebed9e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js @@ -94,15 +94,15 @@ text: 'classname' })); _$item.append($('

线上缴费状态:

').dataFormatter({ - value: _item.PayFeeStatus, - type: 'dataItem', - code: 'PayStatus' - })); - _$item.append($('

线上缴费时间:

').dataFormatter({ - value: _item.PayFeeDate, - type: 'datetime', - dateformat: 'yyyy-MM-dd hh:mm:ss' + value: _item.PayFeeStatus == "1" ? "已缴费" : "未缴费" + //type: 'dataItem', + //code: 'PayStatus' })); + //_$item.append($('

线上缴费时间:

').dataFormatter({ + // value: _item.PayFeeDate, + // type: 'datetime', + // dateformat: 'yyyy-MM-dd hh:mm:ss' + //})); _$item.append($('

贷款回执码:

').dataFormatter({ value: _item.StudentLoan })); _$item.append($('

助学贷款状态:

').dataFormatter({ value: _item.StudentLoanStatus == "1" ? "已审核" : "未审核" })); _$item.append($('

现场缴费状态:

').dataFormatter({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js index 05c2b3162..1b9f3015a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js @@ -83,9 +83,14 @@ if (!$page.find('.lr-form-container').lrformValid()) { return false; } + var data = $page.find('.lr-form-container').lrformGet(); + data.StudentLoanStatus = "0"; + if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { + data.StudentLoanStatus = "1"; + } var _postData = {} _postData.keyValue = keyValue; - _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + _postData.strEntity = JSON.stringify(data); learun.layer.loading(true, '正在提交数据'); learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => { learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index ad02f4cf6..555a73aad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -10,10 +10,8 @@ //数据绑定 learun.layer.loading(true, '获取数据中'); - // learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", '2019010102', (data) => { + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { - console.log(data); //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一； var entity = data["StuInfoFreshEntity"]; if (entity.RegisterStatus == "1") { @@ -43,18 +41,17 @@ $('.sQrList strong').eq(1).html(data.StuInfoFreshEntity.DeptNo); $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo); $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo); + $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName); //班主任 - $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName); + $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); //辅导员 - $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName); + $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : ""); $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile); - // $('#sQrList strong').eq(0).html(data.StuInfoFreshEntity.StuName); //二维码 - // learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account }); learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo }); - + learun.layer.loading(false); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index ac2289a21..a07fb1e1d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -28,8 +28,12 @@ $page.find('#saveBtn').on('tap', function () { var postdata = { ID: $('#ID').val(), - StudentLoan: $('#StudentLoan').val() + StudentLoan: $('#StudentLoan').val(), + StudentLoanStatus: "0" }; + if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { + postdata.StudentLoanStatus = "1"; + } learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => { if (data) { learun.layer.toast('保存成功'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js index f0399d93b..fb72bb734 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js @@ -38,9 +38,14 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } + var data = $('[data-table="StuInfoFresh"]').lrGetFormData(); + data.StudentLoanStatus = "0"; + if ($("#StudentLoan").val().trim() != null && $("#StudentLoan").val().trim() != "" && $("#StudentLoan").val().trim() != undefined) { + data.StudentLoanStatus = "1"; + } var postData = {}; - postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData()); + postData.strEntity = JSON.stringify(data); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml index 79f2cb5e8..3fe7da42e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml @@ -5,16 +5,12 @@
发送人
- +
主题
-
-
接收对象
-
-
发送时间
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index 22b6ce1ae..fbadefa2a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -16,6 +16,12 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#SenderId').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); $('#SendType').lrDataItemSelect({ code: 'FileSendType' }); if (selectedRow.ReadFlag == true) {//已读 $('#Url').lrUploader(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml index b266ec6c7..6312927ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml @@ -7,14 +7,26 @@
主题*
- @*
-
已接收人*
-
+
+
接收对象*
+
-
未接收人*
-
-
*@ +
接收人*
+
+
+
+
接收部门*
+
+
+
+
接收岗位*
+
+
+
+
接收校区*
+
+
文件
@@ -24,4 +36,4 @@
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js") +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js index 1985e9447..87802f8ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js @@ -26,8 +26,70 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - //$('#ReceiverId').lrUserSelect({ type: '1' }); - //$('#NoReceiver').lrUserSelect({ type: '1' }); + $('#CompanyId').lrCompanySelect({ type: 'multiple' }); + $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' }); + $('#PostId').lrPostSelect({ type: 'treemultiple' }); + $('#ReceiverUserId').lrUserSelect({ type: '1' }); + $('#SendType').lrDataItemSelect({ + code: 'FileSendType', select: function (item) { + if (item != null && item != undefined) { + if (item.id === 1 || item.id === "1") { + $("#CompanyIddiv").show(); + $("#CompanyId").attr("isvalid", "yes"); + $("#CompanyId").attr("checkexpession", "NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } else if (item.id === 2 || item.id === "2") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").show(); + $("#DeptId").attr("isvalid", "yes"); + $("#DeptId").attr("checkexpession", "NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } else if (item.id === 3 || item.id === "3") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").show(); + $("#PostId").attr("isvalid", "yes"); + $("#PostId").attr("checkexpession", "NotNull"); + } else { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").show(); + $("#ReceiverUserId").attr("isvalid", "yes"); + $("#ReceiverUserId").attr("checkexpession", "NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } + } + } + }); + $('#SendType').lrselectSet("1"); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; @@ -41,6 +103,63 @@ var bootstrap = function ($, learun) { } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); + if (data[id].SendType === 1 || data[id].SendType == "1") { + $("#CompanyIddiv").show(); + $("#CompanyId").attr("isvalid", "yes"); + $("#CompanyId").attr("checkexpession", "NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#CompanyId").lrselectSet(data[id].ReceiverId); + } else if (data[id].SendType === 2 || data[id].SendType == "2") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").show(); + $("#DeptId").attr("isvalid", "yes"); + $("#DeptId").attr("checkexpession", "NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#DeptId").lrselectSet(data[id].ReceiverId); + } else if (data[id].SendType === 3 || data[id].SendType === "3") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").show(); + $("#PostId").attr("isvalid", "yes"); + $("#PostId").attr("checkexpession", "NotNull"); + $("#PostId").lrselectSet(data[id].ReceiverId); + } else { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").show(); + $("#ReceiverUserId").attr("isvalid", "yes"); + $("#ReceiverUserId").attr("checkexpession", "NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId); + } } } @@ -61,6 +180,63 @@ var bootstrap = function ($, learun) { keyValue = data[id].SFileId; } $('[data-table="' + id + '"]').lrSetFormData(data[id]); + if (data[id].SendType === 1 || data[id].SendType == "1") { + $("#CompanyIddiv").show(); + $("#CompanyId").attr("isvalid", "yes"); + $("#CompanyId").attr("checkexpession", "NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#CompanyId").lrselectSet(data[id].ReceiverId); + } else if (data[id].SendType === 2 || data[id].SendType == "2") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").show(); + $("#DeptId").attr("isvalid", "yes"); + $("#DeptId").attr("checkexpession", "NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#DeptId").lrselectSet(data[id].ReceiverId); + } else if (data[id].SendType === 3 || data[id].SendType === "3") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").show(); + $("#PostId").attr("isvalid", "yes"); + $("#PostId").attr("checkexpession", "NotNull"); + $("#PostId").lrselectSet(data[id].ReceiverId); + } else { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").show(); + $("#ReceiverUserId").attr("isvalid", "yes"); + $("#ReceiverUserId").attr("checkexpession", "NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId); + } } } }); @@ -76,6 +252,20 @@ var bootstrap = function ($, learun) { // 保存数据 save = function (processId, callBack, i) { var formData = $('body').lrGetFormData(); + var sendtype = $('#SendType').lrselectGet(); + if (sendtype == "1") { + formData.ReceiverId = $("#CompanyId").lrselectGet(); + formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); + } else if (sendtype == "2") { + formData.ReceiverId = $("#DeptId").lrselectGet(); + formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); + } else if (sendtype == "3") { + formData.ReceiverId = $("#PostId").lrselectGet(); + formData.Receiver = $("#PostId").find(".lr-select-placeholder").text(); + } else { + formData.ReceiverId = $("#ReceiverUserId").lrformselectGet(); + formData.Receiver = $("#ReceiverUserId").find("span").text(); + } if (!!processId) { formData.SProcessId = processId; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml index 0f8eb81cf..70dba3553 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml @@ -3,17 +3,25 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
主题*
- +
-
+
+
接收对象*
+
+
+
+
接收人*
+ +
+
文件
-
+
-
+
正文
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js") +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js index 0ceb8014a..e604d9df6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js @@ -27,6 +27,9 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#SendType').lrDataItemSelect({ + code: 'FileSendType' + }); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; @@ -78,21 +81,13 @@ var bootstrap = function ($, learun) { }; // 保存数据 save = function (processId, callBack, i) { - - var formData = $('body').lrGetFormData(); - var postData = { - strEntity: JSON.stringify(formData) - }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(res, i); - } - }); - - - - + var formData = {}; + var res = {}; + res.code = 200; + if (!!processId) { + formData.SProcessId = processId; + } + callBack(res, i); }; page.init(); } 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 f97bd71d4..820e37035 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,8 @@
  提交 -   查看 -  下发审批指定接收人 -  结束下发 -   查阅情况 +   查看 +   查阅情况
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index c2b347179..eb523302a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -138,51 +138,6 @@ var bootstrap = function ($, learun) { }); } }); - - // 下发审批指定接收人 - $('#lr_IssueSpecifyReceiver').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('SFileId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '下发审批指定接收人', - url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/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('SFileId'); - if (learun.checkrow(keyValue)) { - var SendFlag = $('#gridtable').jfGridValue('SendFlag'); - if (SendFlag !== 2) { - learun.alert.warning("当前公文未审批通过，请耐心等待审批！"); - return; - } - learun.layerConfirm('是否结束下发！', function (res) { - if (res) { - processId = learun.newGuid(); - learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) { - refreshGirdData(res, {}); - }); - } - }); - } - }); }, // 初始化列表 initGird: function () { @@ -190,21 +145,34 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', headData: [ { label: "主题", name: "Title", width: 300, align: "left" }, - { label: "已接收", name: "Receiver", width: 300, align: "left" }, - { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" }, - { label: "下发人", name: "Sender", width: 100, align: "left" }, - { label: "下发时间", name: "SendTime", width: 150, align: "left" }, + { + label: "接收对象", name: "SendType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'FileSendType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "接收人", name: "Receiver", width: 300, align: "left" + }, + { + label: "下发人", name: "Sender", width: 100, align: "left" + }, + { + label: "下发时间", name: "SendTime", width: 150, align: "left" + }, { label: "状态", name: "SendFlag", width: 100, align: "left", formatter: function (cellvalue, row) { if (cellvalue === 1) { return '审批中'; } else if (cellvalue === 2) { - return '审批通过'; - } else if (cellvalue === 3) { - return '审批失败'; - } else if (cellvalue === 4) { - return '下发完毕'; + return '已下发'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml index 7321389a5..d3f0e2c7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml @@ -17,7 +17,6 @@
-  下发
@@ -26,4 +25,4 @@ -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js") +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js") \ No newline at end of file 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 65148062e..da100e6ee 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 @@ -24,40 +24,6 @@ var bootstrap = function ($, learun) { $('#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_SendFile/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 () { @@ -70,30 +36,6 @@ var bootstrap = function ($, learun) { { 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) { @@ -103,16 +45,6 @@ var bootstrap = function ($, learun) { return '未读'; } } - }, - { - label: "下发状态", name: "SendStatus", width: 100, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue === true) { - return '已下发'; - } else { - return '未下发'; - } - } } ], mainId: 'RFileId', @@ -125,7 +57,6 @@ 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/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml index bd37293b2..f19e0fd41 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml @@ -27,7 +27,6 @@ 被委托人：@ViewBag.UserName(身份证号码：@ViewBag.IDCard)
- (签字)
委托人：关亮(身份证号码：110111196506121035) @@ -57,8 +56,8 @@