From fe47b107d171e51fe53e46a7db97b7df09fe039f Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 29 Jun 2023 16:19:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91PC?= =?UTF-8?q?=E7=AB=AF=EF=BC=9A=E4=B8=AA=E4=BA=BA=E7=AD=BE=E7=AB=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AD=BE=E7=AB=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 7 + .../Controllers/StampInfoController.cs | 29 ++- .../Views/NWFProcess/NWFContainerForm.css | 10 +- .../Views/NWFProcess/NWFContainerForm.js | 11 +- .../Views/NWFProcess/SignForm.cshtml | 18 +- .../Views/NWFProcess/SignForm.js | 40 ++++ .../LR_NewWorkFlow/Views/StampInfo/Form.js | 2 + .../LR_NewWorkFlow/Views/StampInfo/Index.js | 1 + .../Views/StampInfo/StampDetailIndex.cshtml | 2 +- .../Views/StampInfo/StampDetailIndex.js | 29 ++- .../Views/StampPersonal/Form.cshtml | 43 ++++ .../Views/StampPersonal/Form.css | 21 ++ .../Views/StampPersonal/Form.js | 88 ++++++++ .../Views/StampPersonal/Index.cshtml | 61 +++++ .../Views/StampPersonal/Index.js | 210 ++++++++++++++++++ .../StampPersonal/StampDetailIndex.cshtml | 64 ++++++ .../Views/StampPersonal/StampDetailIndex.js | 88 ++++++++ .../Modules/BaseNoLoginApi.cs | 2 +- .../Modules/NewWorkFlowApi.cs | 47 +++- .../Modules/StampPersonalApi.cs | 109 +++++++++ .../LR_StampManage/LR_StampManageBLL.cs | 4 +- .../LR_StampManage/LR_StampManageEntity.cs | 21 +- .../LR_StampManage/LR_StampManageIBLL.cs | 2 +- .../LR_StampManage/LR_StampManageService.cs | 28 ++- 24 files changed, 905 insertions(+), 32 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StampPersonalApi.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index b0efa1a9e..b126a4503 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -250,6 +250,13 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers /// public ActionResult SignForm() { + ViewBag.IsHaveStampRight = false; + var loginUserInfo = LoginUserInfo.Get(); + if (loginUserInfo.Description.Contains("管理员") || loginUserInfo.roleIds.Split(',').Contains(Config.GetValue("StampRightRoleId"))) + { + ViewBag.IsHaveStampRight = true; + } + return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/StampInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/StampInfoController.cs index 6adad10d0..e89691a1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/StampInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/StampInfoController.cs @@ -47,6 +47,31 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + + /// + /// 管理页面【个人印章】 + /// + /// + public ActionResult IndexInPersonal() + { + return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml"); + } + /// + /// 表单页面【个人印章】 + /// + /// + public ActionResult FormInPersonal() + { + return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml"); + } + /// + /// 流程审批-个人印章【个人印章】 + /// + /// + public ActionResult StampDetailIndexInPersonal() + { + return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml"); + } #endregion #region 获取数据 @@ -80,9 +105,9 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers /// [HttpGet] [AjaxOnly] - public ActionResult GetList(string keyword) + public ActionResult GetList(string keyword, string userId, string category) { - var data = lr_StampManageIBLL.GetList(keyword); + var data = lr_StampManageIBLL.GetList(keyword,userId,category); return Success(data); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css index a0606381a..c04724b98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css @@ -132,7 +132,7 @@ .form-list-tabs .nav-tabs > li { white-space: nowrap; - display: inline-block !important; + /*display: inline-block !important;*/ float: initial; } @@ -236,13 +236,13 @@ .auditinfo-s { position: absolute; - top: 0; - right: 200px; - height: 100px; + top: 25px; + right: 225px; + height: 50px; } .auditinfo-s img { - height: 100px; + height: 50px; } .auditinfo-sg { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index e961cc2ba..3318d2580 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -673,6 +673,13 @@ var bootstrap = function ($, learun) { // } //}); + //需要填写审批意见时，验证审批意见的必填性 + var des = $('#des').val(); + if (btnData.isOpinion == '1' && !des) { + learun.alert.warning('请签署审批意见！'); + return false; + } + top.flowAuditfn = function (signUrl, stamp) { // 下个流程是否需要可以手动选择审核人 getNextUsers(btnData, nwflow.currentNode, '', nwflow.processId, nwflow.taskId, function (data) { @@ -709,7 +716,7 @@ var bootstrap = function ($, learun) { operationName: btnData.name, processId: nwflow.processId, taskId: nwflow.taskId, - des: $('#des').val(), + des: des, auditors: JSON.stringify(auditers), signUrl: signUrl, stamp: stamp @@ -736,7 +743,7 @@ var bootstrap = function ($, learun) { operationName: btnData.name, processId: nwflow.processId, taskId: nwflow.taskId, - des: $('#des').val(), + des: des, signUrl: signUrl, stamp: stamp }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.cshtml index 3aeb76732..cd5570622 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.cshtml @@ -4,18 +4,30 @@ }
-
+
- @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js") + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js index 5e4a3dce0..f22cc710d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js @@ -22,6 +22,7 @@ var bootstrap = function ($, learun) { $('#stamp').hide(); stampUrl = ''; }); + //学校公章 $('#btn_stamp').on('click', function () { learun.layerForm({ id: 'StampDetailIndex', @@ -39,6 +40,45 @@ var bootstrap = function ($, learun) { } }); }); + //个人印章 + $('#btn_stampPersonal').on('click', function () { + learun.layerForm({ + id: 'StampDetailIndexInPersonal', + title: '印章列表', + url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/StampDetailIndexInPersonal', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(function (imgutl) { + $('#stamp').find('img').attr('src', top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=' + imgutl); + $('#stamp').show(); + stampUrl = imgutl; + console.log(stampUrl); + }); + } + }); + }); + + function debounce(fn, delay) { + let time = null; + return function () { + if (time !== null) { + clearTimeout(time); + } + time = setTimeout(() => { + fn.call(this); + }, delay) + } + } + + //$('#btn_finish').on('click', debounce(function () { + // console.log('123456') + + // var datapair = $sigdiv.jsignature("getdata"); + // top.flowauditfn(datapair,stampurl); + // learun.layerclose(window.name); + + //},500)) function debounce(fn, delay) { let time = null; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Form.js index 4521e022a..cd75f1022 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Form.js @@ -54,6 +54,8 @@ var bootstrap = function ($, learun) { return false; } + postData.F_Category = 1; + var f = document.getElementById('uploadFile').files[0]; //是否上传图片 if (!!f) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Index.js index 4b278fec3..9dc067685 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Index.js @@ -198,6 +198,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.F_StampType = F_StampType; param.F_EnabledMark = F_EnabledMark; + param.F_Category = 1; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.cshtml index bf2a6b395..840ace914 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.cshtml @@ -11,7 +11,7 @@  查询
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js index 9c09a4ce1..34958b12e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js @@ -38,14 +38,14 @@ var bootstrap = function ($, learun) { }); }, initData: function () { - $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '', function (data) { + $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '' +'&category=1', function (data) { $('.lr-layout-wrap').lrSetFormData(data.data); $('#datagird').jfGridSet('refreshdata', data); }); }, search: function (param) { param = param || {}; - $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword, function (data) { + $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword+'&category=1', function (data) { $('.lr-layout-wrap').lrSetFormData(data.data); $('#datagird').jfGridSet('refreshdata', data); @@ -54,14 +54,35 @@ var bootstrap = function ($, learun) { }; acceptClick = function (callBack) { var keyValue = $("#datagird").jfGridValue("F_StampId"); + if (!keyValue) { + learun.alert.error("请选择印章！"); + return false; + } if (!$('.lr-item').lrValidform()) { return false; } var postData = $('.lr-item').lrGetFormData(); var F_Password = $.md5(postData.F_Password); - learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { - callBack(keyValue); + + //learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { + // callBack(keyValue); + //}); + + learun.loading(true, '正在提交数据'); + learun.httpAsyncPost(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { + learun.loading(false); + if (res.code == learun.httpCode.success) { + callBack(keyValue); + learun.alert.success(res.info); + top.layer.close(top.layer.index); + } + else { + learun.alert.error(res.info); + learun.httpErrorLog(res.info); + location.reload(); + } }); + }; page.init(); } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml new file mode 100644 index 000000000..86d7091e8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml @@ -0,0 +1,43 @@ + +@{ + ViewBag.Title = "个人印章操作"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +@Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css") +
+
+
印章名称*
+ +
+
+
印章分类*
+
+
+ +
+
密码*
+ +
+
+
排序*
+ +
+
+
图片文件
+
+ +
+
+ 上传图片尺寸为200x200，大小不超过1M。 +
+
+
+
备注
+ +
+ +
+ +@Html.AppendJsFile("/Views/LR_Content/script/lr-fileupload.js", "/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js") + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css new file mode 100644 index 000000000..9f775b33a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css @@ -0,0 +1,21 @@ +.fileEx { + width: 100%; + height: 120px; + position: relative; + overflow: hidden; +} + + .fileEx input { + position: absolute; + font-size: 120px; + right: 0; + top: 0; + opacity: 0; + cursor: pointer !important; + } + + .fileEx img { + width: 120px; + height: 120px; + cursor: pointer; + } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js new file mode 100644 index 000000000..79e01085c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js @@ -0,0 +1,88 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2022.12.05 + * 描 述：个人印章管理 + */ + +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + + function uploadImg() { + var f = document.getElementById("uploadFile").files[0];//获取文件 + var src = window.URL.createObjectURL(f); + document.getElementById('uploadPreview').src = src; + } + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + // 印章分类 + $('#F_StampType').lrDataItemSelect({ code: 'StampType' }); + //图片显示 + $('#uploadFile').on('change', uploadImg); + $('.fileEx').prepend(''); + }, + initData: function () { + if (!!selectedRow) { + selectedRow.F_Password = '*****'; + $('#form').lrSetFormData(selectedRow); + + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(keyValue); + if (postData.F_Password != '*****' || !keyValue) { + postData.F_Password = $.md5(postData.F_Password); + } + else { + delete postData.F_Password; + } + if (!keyValue && !postData.uploadFile) { + learun.alert.error("请选择图片"); + return false; + } + + postData.F_Category = 2; + + var f = document.getElementById('uploadFile').files[0]; + //是否上传图片 + if (!!f) { + learun.loading(true, '正在保存...'); + $.ajaxFileUpload({ + data: postData, + url: top.$.rootUrl + "/LR_NewWorkFlow/StampInfo/UploadFile?keyValue=" + keyValue, + secureuri: false, + fileElementId: 'uploadFile', + dataType: 'json', + success: function (data) { + if (!!callBack) { + callBack(); + } + learun.loading(false); + learun.layerClose(window.name); + } + }); + } + else { + $.lrSaveForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + } + }; + page.init(); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml new file mode 100644 index 000000000..169252463 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml @@ -0,0 +1,61 @@ + +@{ + ViewBag.Title = "个人印章管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
印章分类信息
+
+
+
+
+
+
+ 印章管理 - 未选择分类 +
+
+
+
+
+ + +
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  新增 +  编辑 + + + + +
+
+  分类管理 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js new file mode 100644 index 000000000..cc22a7e98 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js @@ -0,0 +1,210 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人： + * 日 期：2022.12.05 + * 描 述：个人印章管理 + */ +var selectedRow; +var refreshGirdData; +var F_StampType; +var F_StampName; +var F_EnabledMark; +var acceptClick; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGrid(); + page.bind(); + }, + bind: function () { + // 左侧数据加载 + $('#lr_left_tree').lrtree({ + url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailTree', + param: { itemCode: 'StampType' }, + nodeClick: function (item) { + F_StampType = item.value; + F_StampName = null;//将文本框数据设置为null，如果不设置，那么不能按照左侧分类查询 + F_EnabledMark = null;//将文本框数据设置为null，如果不设置，那么不能按照左侧分类查询 + $('#titleinfo').text(item.text); + page.search(); + } + }); + //查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + F_StampType = null; + page.search({ F_StampName: keyword }); + }); + + $('[name="isEnabled"]').on('click', function () { + var value = $(this).val(); //状态查询 + if (value == 1) { + F_EnabledMark = value; + page.search(); + } + else { + F_EnabledMark = value; + page.search(); + } + }); + //刷新 + $("#lr_refresh").on('click', function () { + location.reload(); + }); + //新增 + $("#lr_add").on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '添加印章', + url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/FormInPersonal', + width: 700, + height: 500, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + //编辑 + $("#lr_edit").on("click", function () { + selectedRow = $("#gridtable").jfGridGet("rowdata");//获取选中的当前行数据 + var keyValue = $("#gridtable").jfGridValue("F_StampId");//获取当前选中的主键值 + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'Form', + title: '编辑印章', + url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/FormInPersonal?keyValue=' + keyValue, + width: 750, + height: 500, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + //删除 + $("#lr_delete").on("click", function () { + var keyValue = $('#gridtable').jfGridValue('F_StampId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 启用 + $('#lr_enable').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_StampId'); + var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark'); + if (learun.checkrow(keyValue)) { + if (enabledMark != 1) { + learun.layerConfirm('是否确认启用该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/UpDateSate', { keyValue: keyValue, state: 1 }, function () { + refreshGirdData(); + }); + } + }); + } + else { + learun.alert.warning('该项已启用!'); + } + } + }); + // 禁用 + $('#lr_disabled').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_StampId'); + var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark'); + + if (learun.checkrow(keyValue)) { + if (enabledMark == 1) { + learun.layerConfirm('是否确认禁用该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/UpDateSate', { keyValue: keyValue, state: 0 }, function () { + refreshGirdData(); + }); + } + }); + } + else { + learun.alert.warning('该项已禁用!'); + } + } + }); + /*分类管理*/ + $('#lr_category').on('click', function () { + learun.layerForm({ + id: 'ClassifyIndex', + title: '分类管理', + url: top.$.rootUrl + '/LR_SystemModule/DataItem/DetailIndex?itemCode=StampType', + width: 800, + height: 500, + maxmin: true, + btn: null, + end: function () { + learun.clientdata.update('dataItem'); + location.reload(); + } + }); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetPageList', + headData: [ + { label: '印章名称', name: 'F_StampName', width: 150, align: "center" }, + { + label: '印章分类', name: 'F_StampType', width: 100, align: "center", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StampType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '图片', name: 'F_ImgFile', width: 110, align: "center", + formatter: function (value, row, op, $cell) { + return ''; + } + }, + { + label: '状态', name: 'F_EnabledMark', width: 60, align: "center", formatter: function (value, row, op, $cell) { + if (value == 1) { + return '启用'; + } else if (value == 0) { + return '禁用'; + } + } + }, + { label: '备注', name: 'F_Description', width: 200, align: "left" } + ], + mainId: 'F_StampId', + isPage: true, + rowHeight: 110, + sidx: 'F_EnabledMark Desc,F_Sort ASC' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.F_StampType = F_StampType; + param.F_EnabledMark = F_EnabledMark; + param.F_Category = 2; + param.F_CreateUserId = learun.clientdata.get(['userinfo']).userId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + } + refreshGirdData = function () { + page.search(); + }; + page.init(); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml new file mode 100644 index 000000000..00e9f547a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml @@ -0,0 +1,64 @@ +@{ + ViewBag.Title = "个人印章管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
+ +
+
+  查询 +
+
+ +
+
+
+
+ +@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js") + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js new file mode 100644 index 000000000..a6df6c2ff --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js @@ -0,0 +1,88 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人： + * 日 期：2022.12.05 + * 描 述：个人印章管理 + */ +var keyword; +var acceptClick; +var path = ''; +var bootstrap = function ($, learun) { + "use strict"; + // 保存数据 + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + // 订单产品信息 + $('#datagird').jfGrid({ + headData: [ + { label: '名称', name: 'F_StampName', width: 150, align: "center" }, + { + label: '印章', name: 'F_ImgFile', width: 110, align: "left", + formatter: function (value, row, op, $cell) { + return ''; + } + } + ], + mainId: 'F_StampId', + rowHeight: 110, + }); + //查询 + $('#btn_Search').on('click', function () { + keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + }, + initData: function () { + $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '' + '&category=2&userId=' + learun.clientdata.get(['userinfo']).userId, function (data) { + $('.lr-layout-wrap').lrSetFormData(data.data); + $('#datagird').jfGridSet('refreshdata', data); + }); + }, + search: function (param) { + param = param || {}; + $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword + '&category=2&userId=' + learun.clientdata.get(['userinfo']).userId, function (data) { + $('.lr-layout-wrap').lrSetFormData(data.data); + $('#datagird').jfGridSet('refreshdata', data); + + }); + } + }; + acceptClick = function (callBack) { + var keyValue = $("#datagird").jfGridValue("F_StampId"); + if (!keyValue) { + learun.alert.error("请选择印章！"); + return false; + } + if (!$('.lr-item').lrValidform()) { + return false; + } + var postData = $('.lr-item').lrGetFormData(); + var F_Password = $.md5(postData.F_Password); + + //learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { + // callBack(keyValue); + //}); + + learun.loading(true, '正在提交数据'); + learun.httpAsyncPost(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { + learun.loading(false); + if (res.code == learun.httpCode.success) { + callBack(keyValue); + learun.alert.success(res.info); + top.layer.close(top.layer.index); + } + else { + learun.alert.error(res.info); + learun.httpErrorLog(res.info); + location.reload(); + } + }); + + }; + page.init(); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseNoLoginApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseNoLoginApi.cs index f035dacb7..2ce743ead 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseNoLoginApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseNoLoginApi.cs @@ -161,7 +161,7 @@ namespace Learun.Application.WebApi ReqParameter req = this.Bind(); loginMark = req.loginMark; token = req.token; - if (path == "/learun/adms/user/login" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img") + if (path == "/learun/adms/user/login" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/StampPersonal/img") {// 登录接口，默认页面接口不做权限验证处理 return null; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs index 18cb62eee..1134f1c33 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs @@ -46,6 +46,9 @@ namespace Learun.Application.WebApi.Modules Post["/revoke"] = RevokeFlow; Post["/refer"] = ReferFlow; + Post["/instance"] = SaveInstanceForms; + Post["/auditors"] = SaveAuditors; + } private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); @@ -296,8 +299,8 @@ namespace Learun.Application.WebApi.Modules { formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); } - //TODO：移动端传参signUrl??? - nWFProcessIBLL.AuditFlow(parameter.operationCode, parameter.operationName, parameter.processId, parameter.taskId, parameter.des, parameter.auditors, "", parameter.signUrl, userInfo); + //移动端传参signUrl,stamp, + nWFProcessIBLL.AuditFlow(parameter.operationCode, parameter.operationName, parameter.processId, parameter.taskId, parameter.des, parameter.auditors, parameter.stamp, parameter.signUrl, userInfo); return Success("审批成功"); } @@ -379,6 +382,41 @@ namespace Learun.Application.WebApi.Modules nWFProcessIBLL.ReferFlow(parameter.processId, parameter.taskId, userInfo); return Success("确认成功"); } + /// + /// app保存实例 + /// + /// + /// + public Response SaveInstanceForms(dynamic _) + { + List param = this.GetReqData>(); + + foreach (var item in param) + { + formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + } + return Success("保存成功！"); + } + /// + /// app保存审核人 + /// + /// + /// + public Response SaveAuditors(dynamic _) + { + var param = this.GetReqData(); + UserInfo userInfo = LoginUserInfo.Get(); + try + { + nWFProcessIBLL.AuditFlow(param.operationCode, param.operationName, param.processId, param.taskId, param.des, param.auditors, param.stamp, param.signUrl, userInfo); + return Success("流程审批成功"); + } + catch (System.Exception ex) + { + + return Fail(ex.Message); + } + } private class flowParam { @@ -443,6 +481,11 @@ namespace Learun.Application.WebApi.Modules /// 签字图片信息 /// public string signUrl { get; set; } + + /// + /// 签章信息 + /// + public string stamp { get; set; } } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StampPersonalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StampPersonalApi.cs new file mode 100644 index 000000000..76c547731 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StampPersonalApi.cs @@ -0,0 +1,109 @@ +using Learun.Application.AppMagager; +using Learun.Util; +using Nancy; +using System.Collections.Generic; +using System.Linq; +using Learun.Application.Base.SystemModule; +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Text; +using System.Data; +using Learun.Application.WorkFlow; +using Learun.Application.OA.LR_StampManage; + + +namespace Learun.Application.WebApi.Modules +{ + + public class StampPersonalApi : BaseApi + { + + public StampPersonalApi() + : base("/learun/adms/StampPersonal") + { + Get["/list"] = GetList; + Get["/schoollist"] = GetSchoolList; + Get["/img"] = GetImg; + Post["/equalPassword"] = EqualPassword; + Get["/ishaveright"] = IsHaveStampRight; + } + private LR_StampManageIBLL lr_StampManageIBLL = new LR_StampManageBLL(); + + /// + /// 个人签章 + /// + /// + /// + public Response GetList(dynamic _) + { + SPParam param = this.GetReqData(); + var data = lr_StampManageIBLL.GetList(param.keyword, userInfo.userId, "2"); + return Success(data); + } + /// + /// 学校签章 + /// + /// + /// + public Response GetSchoolList(dynamic _) + { + SPParam param = this.GetReqData(); + var data = lr_StampManageIBLL.GetList(param.keyword, null, "1"); + return Success(data); + } + /// + /// 获取签章图片 + /// + /// + /// + public Response GetImg(dynamic _) + { + string param = this.GetReqData(); + lr_StampManageIBLL.GetImg(param); + return Success(""); + } + /// + /// 验证签章密码 + /// + /// + /// + public Response EqualPassword(dynamic _) + { + var msg = ""; + SPParam param = this.GetReqData(); + var data = lr_StampManageIBLL.EqualPassword(param.F_StampId, param.F_Password); + if (data) + { + msg = "密码验证成功！"; + } + else + { + msg = "密码不正确！"; + } + return Success(new { result = data, msg = msg }); + } + /// + /// 判断登录用户是否有“学校签章”的使用权限 + /// + /// + /// + public Response IsHaveStampRight(dynamic _) + { + var result = false; + if (userInfo.Description.Contains("管理员") || userInfo.roleIds.Split(',').Contains(Config.GetValue("StampRightRoleId"))) + { + result = true; + } + + return Success(new { result = result }); + } + + } + + public class SPParam + { + public string keyword { get; set; } + public string F_StampId { get; set; } + public string F_Password { get; set; } + } + +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageBLL.cs index 9ff55ad46..1639e2311 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageBLL.cs @@ -26,11 +26,11 @@ namespace Learun.Application.OA.LR_StampManage /// /// 查询的关键字 /// - public IEnumerable GetList(string keyWord) + public IEnumerable GetList(string keyWord, string userId, string category) { try { - return lr_StampManageService.GetList(keyWord); + return lr_StampManageService.GetList(keyWord,userId,category); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageEntity.cs index f9a1d9a48..386adc137 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageEntity.cs @@ -55,6 +55,21 @@ namespace Learun.Application.OA.LR_StampManage /// [Column("F_ENABLEDMARK")] public int? F_EnabledMark { get; set; } + /// + /// 创建人 + /// + [Column("F_CREATEUSERID")] + public string F_CreateUserId { get; set; } + /// + /// 时间 + /// + [Column("F_CREATETIME")] + public DateTime? F_CreateTime { get; set; } + /// + /// 印章分类：1学校公章2个人印章 + /// + [Column("F_CATEGORY")] + public int? F_Category { get; set; } #region 扩展方法 @@ -65,7 +80,9 @@ namespace Learun.Application.OA.LR_StampManage public void Modify(string keyValue) { this.F_StampId = keyValue; - + this.F_CreateUserId = LoginUserInfo.Get().userId; //创建人 + this.F_CreateTime = DateTime.Now; + } /// /// 新增调用 @@ -74,6 +91,8 @@ namespace Learun.Application.OA.LR_StampManage { this.F_StampId = Guid.NewGuid().ToString(); //产生印章编号 this.F_EnabledMark = 1;//默认状态为启用 + this.F_CreateUserId = LoginUserInfo.Get().userId; //创建人 + this.F_CreateTime = DateTime.Now; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageIBLL.cs index 289b67b4c..d5a7b6286 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageIBLL.cs @@ -18,7 +18,7 @@ namespace Learun.Application.OA.LR_StampManage /// /// /// - IEnumerable GetList(string keyWord); + IEnumerable GetList(string keyWord, string userId, string category); /// /// 获取列表分页数据 /// 分页参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageService.cs index 1a5e3ab06..5d72271d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LR_StampManage/LR_StampManageService.cs @@ -23,13 +23,7 @@ namespace Learun.Application.OA.LR_StampManage { //sql字段 fieldSql = @" - F_StampId, - F_StampName, - F_Description, - F_StampType, - F_ImgFile, - F_Sort, - F_EnabledMark + * "; } #endregion @@ -40,7 +34,7 @@ namespace Learun.Application.OA.LR_StampManage /// /// 名称/状态 /// - public IEnumerable GetList(string keyWord) + public IEnumerable GetList(string keyWord, string userId,string category) { try { @@ -52,6 +46,14 @@ namespace Learun.Application.OA.LR_StampManage if (!string.IsNullOrEmpty(keyWord)) {// cbb 如果没有查询条件则不需要输入 Sql.AppendFormat(" and s.F_StampName LIKE '%{0}%'", keyWord); } + if (!string.IsNullOrEmpty(userId)) + { + Sql.AppendFormat(" and s.F_CreateUserId = '{0}'", userId); + } + if (!string.IsNullOrEmpty(category)) + { + Sql.AppendFormat(" and s.F_Category = {0}", Convert.ToInt32(category)); + } Sql.Append(" Order by F_Sort"); @@ -102,6 +104,16 @@ namespace Learun.Application.OA.LR_StampManage dp.Add("F_StampType", queryParam["F_StampType"].ToString(), DbType.String); strSql.Append(" AND s.F_StampType = @F_StampType"); } + if (!queryParam["F_CreateUserId"].IsEmpty()) + { + dp.Add("F_CreateUserId", queryParam["F_CreateUserId"].ToString(), DbType.String); + strSql.Append(" AND s.F_CreateUserId = @F_CreateUserId"); + } + if (!queryParam["F_Category"].IsEmpty()) + { + dp.Add("F_Category", queryParam["F_Category"].ToString(), DbType.String); + strSql.Append(" AND s.F_Category = @F_Category"); + } } return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } From e44a511ae0121035f55852b79e7a60666a20dca2 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 30 Jun 2023 10:10:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=EF=BC=9A=E4=B8=AA=E4=BA=BA=E7=AD=BE?= =?UTF-8?q?=E7=AB=A0=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AD=BE=E7=AB=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/nworkflow/myflow/sign.vue | 985 ++++++++++++------ 1 file changed, 649 insertions(+), 336 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue index c331bdec4..2c36ce387 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue @@ -1,344 +1,657 @@ + .sign-area { + min-height: 500rpx; + margin: 23rpx; + border: 2rpx dashed #444444; + + .sign-canvas { + width: 700rpx; + height: 500rpx; + } + + .sign-action { + text-align: right; + } + } + + .pswd-uni-mask { + position: fixed; + z-index: 999; + top: 0; + right: 0; + left: 0; + bottom: 0; + background: rgba(0, 0, 0, .5); + } + + .pswd-uni-modal { + position: fixed; + z-index: 999; + width: 80%; + max-width: 300px; + top: 50%; + left: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + background-color: #fff; + text-align: center; + border-radius: 3px; + overflow: hidden; + } + + .pswd-uni-modal__hd { + padding: 1em 1.6em 0.3em; + } + + .pswd-strong { + font-weight: 400; + font-size: 18px; + } + + .pswd-uni-modal__ft { + position: relative; + line-height: 48px; + font-size: 18px; + display: -webkit-box; + display: -webkit-flex; + display: flex; + } + + .pswd-uni-modal__ft::after { + content: " "; + position: absolute; + left: 0; + top: 0; + right: 0; + height: 1px; + border-top: 1px solid #d5d5d6; + color: #d5d5d6; + -webkit-transform-origin: 0 0; + transform-origin: 0 0; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } + + .pswd-uni-modal__btn { + display: block; + -webkit-box-flex: 1; + /* -webkit-flex: 1; */ + flex: 1; + color: #3cc51f; + text-decoration: none; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + position: relative; + cursor: pointer; + } + + .pswd__btn_primary::after { + content: " "; + position: absolute; + left: 0; + top: 0; + width: 1px; + bottom: 0; + border-left: 1px solid #d5d5d6; + color: #d5d5d6; + -webkit-transform-origin: 0 0; + transform-origin: 0 0; + -webkit-transform: scaleX(.5); + transform: scaleX(.5); + } + + .pswdinp { + background: #f5f5f5; + + } + + .Signwrap { + margin: 11px; + border: 1px dashed #444444; + background: #ffffff; + } + \ No newline at end of file From d7b5beea461d6ae670634a186ce0c9df1709bb71 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 8 Sep 2023 14:18:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=EF=BC=9A=E4=B8=AA=E4=BA=BA=E7=AD=BE?= =?UTF-8?q?=E7=AB=A0=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AD=BE=E7=AB=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Learun.Application.Web.csproj | 7 +++++++ .../Learun.Application.Web/XmlConfig/system.config | 2 ++ .../Learun.Application.WebApi.csproj | 1 + .../Learun.Application.WebApi/Modules/BaseApi.cs | 2 +- .../Learun.Application.WebApi/XmlConfig/system.config | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) 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 85a6c1fe6..becfc810e 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 @@ -1650,6 +1650,10 @@ + + + + @@ -8289,6 +8293,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 190162288..ea0aaf173 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -168,6 +168,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index c77251941..96b9f332c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -227,6 +227,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs index db158f172..7652dd528 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs @@ -191,7 +191,7 @@ namespace Learun.Application.WebApi ReqParameter req = this.Bind(); loginMark = req.loginMark; token = req.token; - if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize") + if (path == "/learun/adms/user/login" || path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/user/imgfordc" || path == "/learun/adms/timetable/timeTableData" || path == "/quanjiang/sso/authorize" || path == "/learun/adms/StampPersonal/img") {// 登录接口，默认页面接口不做权限验证处理 return null; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 75541c535..8594bbdf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -111,6 +111,8 @@ + +