From 85225fa7d8257fc97526b9bfd36af714c1e8d842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Mon, 19 Sep 2022 15:30:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?app2.0=20=E9=80=9A=E8=AE=AF=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=EF=BC=88=E5=B7=B2=E9=9A=90=E8=97=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/common/js/uni-copy.js | 42 +++++++++++++++++++ .../components/learun-app/organize-tree.vue | 25 ++++++++++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/uni-copy.js diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/uni-copy.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/uni-copy.js new file mode 100644 index 000000000..6ceb60488 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/uni-copy.js @@ -0,0 +1,42 @@ +export default function uniCopy({content,success,error}) { + if(!content) return error('复制的内容不能为空 !') + content = typeof content === 'string' ? content : content.toString() // 复制内容,必须字符串,数字需要转换为字符串 + /** + * 小程序端 和 app端的复制逻辑 + */ + //#ifndef H5 + uni.setClipboardData({ + data: content, + success: function() { + success("复制成功~") + console.log('success'); + }, + fail:function(){ + success("复制失败~") + } + }); + //#endif + + /** + * H5端的复制逻辑 + */ + // #ifdef H5 + if (!document.queryCommandSupported('copy')) { //为了兼容有些浏览器 queryCommandSupported 的判断 + // 不支持 + error('浏览器不支持') + } + let textarea = document.createElement("textarea") + textarea.value = content + textarea.readOnly = "readOnly" + document.body.appendChild(textarea) + textarea.select() // 选择对象 + textarea.setSelectionRange(0, content.length) //核心 + let result = document.execCommand("copy") // 执行浏览器复制命令 + if(result){ + success("复制成功~") + }else{ + error("复制失败,请检查h5中调用该方法的方式,是不是用户点击的方式调用的,如果不是请改为用户点击的方式触发该方法,因为h5中安全性,不能js直接调用!") + } + textarea.remove() + // #endif +} diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue index a507b580b..125e56741 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue @@ -28,6 +28,8 @@ {{ tagName }} + + @@ -57,6 +59,7 @@ + + From 59f52333e443288d401aff3d791dcf2adc8d17b7 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 20 Sep 2022 18:15:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B6=E5=9B=BE=E7=89=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Views/Notice/FormFlow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js index 21eed58c4..157c9d654 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js @@ -42,7 +42,7 @@ var bootstrap = function ($, learun) { } } }); - $('#F_NewsImage').lrUploader(); + $('#F_NewsImage').lrUploader({ extensions:'gif,jpeg,jpg,png,bmp'}); $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' }); $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' }); $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' }); From d9656fea37742c2c03a29836ce1b6bcf361a6741 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 20 Sep 2022 18:17:41 +0800 Subject: [PATCH 5/6] --- .../Views/ScoreCheckInfo/Form.cshtml | 2 +- .../Views/ScoreCheckInfo/Form.js | 19 ++++++++++--------- .../Views/ScoreCheckInfo/FormAudit.cshtml | 2 +- .../Views/ScoreCheckInfo/Index.cshtml | 4 ++-- .../Views/ScoreCheckInfo/Index.js | 10 +++------- .../ScoreCheckInfo/ScoreCheckInfoService.cs | 4 ++-- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml index 70f12d569..7552d614d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml @@ -2,7 +2,7 @@ ViewBag.Title = "学业成绩考核记录表"; Layout = "~/Views/Shared/_Form.cshtml"; } -
+
学年*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js index b8098fbb9..7d70a1a52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js @@ -41,7 +41,7 @@ var bootstrap = function ($, learun) { text: 'stuname', headData: [ - { label: "学号", name: "stuno", width: 100, align: "left" }, + { label: "学号", name: "stuno", width: 140, align: "left" }, { label: "姓名", name: "stuname", width: 100, align: "left" }, { label: "班级", name: "classno", width: 100, align: "left", @@ -110,19 +110,20 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { - if (!$('body').lrValidform()) { + if (!$('form').lrValidform()) { return false; } var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) + //postData.StuName= + strEntity: JSON.stringify($('form').lrGetFormData()) }; console.log(postData,"postData") - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); + //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // // 保存成功后才回调 + // if (!!callBack) { + // callBack(); + // } + //}); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml index ee2059da1..7439b013e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml @@ -9,7 +9,7 @@
备注
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml index 2fb2091b1..3150c036e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml @@ -50,14 +50,14 @@  新增  编辑  删除 -  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js index c57fd3c74..ef753c8f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js @@ -131,7 +131,7 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf('1') != -1) { + if (CheckMark.indexOf(',') != -1) { learun.alert.warning("选中记录中包含已审核项目,已审核不能删除!"); return; } @@ -152,13 +152,9 @@ var bootstrap = function ($, learun) { $('#lr_lock').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - //if (keyValue.indexOf(',') != -1) { - // learun.alert.warning("只能选择一条记录进行编辑!"); - // return; - //} var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark != "1") { - learun.alert.warning("当前项不可审核!"); + if (CheckMark.indexOf(',') != "-1") { + learun.alert.warning("选中项不可审核!"); return; } learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs index f02370456..7cfcd9cfb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs @@ -114,7 +114,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.StuName == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo); + return this.BaseRepository("CollegeMIS").FindEntity(x => x.StuNo == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo); } catch (Exception ex) { @@ -270,7 +270,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration foreach (var item in keyValueArr) { var model = db.FindEntity(x => x.ID == item); - model.CheckStatus = "2"; + model.CheckStatus = entity.CheckStatus; model.CheckTime = DateTime.Now; model.CheckUser = userlogin.userId; model.UpdateTime = DateTime.Now; From c6bb61bfcc08ace3851d60e64df26b4b21fab280 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 20 Sep 2022 18:23:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?app2.0=E9=80=9A=E8=AE=AF=E5=BD=95=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/components/learun-app/organize-tree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue index d1f65275a..1a25c8b3c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue @@ -29,7 +29,7 @@ {{ tagName }} - + 复制