From 6133218662aed358c4fda00f05cdae6f4bb2c28b Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 21 Oct 2022 18:33:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=9C=B0=E5=9D=80,app2.0=E6=89=8B=E6=9C=BA=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=AE=A1=E6=A0=B8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/NewWorkFlowApi.cs | 40 +++++++++++++++++++ .../LearunApp-2.2.0/config.js | 6 +-- 2 files changed, 43 insertions(+), 3 deletions(-) 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..94509397a 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(); @@ -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,8 @@ namespace Learun.Application.WebApi.Modules /// 签字图片信息 /// public string signUrl { get; set; } + + public string stamp { get; set; } } /// diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 185c5d9b1..4ae06eb55 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,11 +21,11 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - // "http://cyzjzx.gnway.cc:30626/"//测试地址 - // "http://cyzjzx.gnway.cc:29615/"//正式地址 + // "http://cyzjzx.gnway.cc:31218/"//测试地址接口 + // "http://cyzjzx.gnway.cc:29904/"//正式地址接口 "http://192.168.10.58:8012/" ], - // "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址 + // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址 //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址 "webHost":"http://192.168.10.31:8087/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 From 506beb7b2bd336661573fb6b078ffba67bc38e4c Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 24 Oct 2022 10:27:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=EF=BC=9A=E6=B8=85=E7=A9=BA=E5=AE=BF=E8=88=8D?= =?UTF-8?q?=E6=97=B6=E6=B8=85=E7=A9=BA=E6=88=BF=E9=97=B4=E5=85=A5=E4=BD=8F?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=EF=BC=9B=E6=AF=95=E4=B8=9A=E8=AF=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=EF=BC=9A=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/CreateGraduateNo.js | 1 + .../StuInfoBasic/StuInfoBasicService.cs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js index 092c8f045..fa86afe08 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js @@ -79,6 +79,7 @@ var bootstrap = function ($, learun) { headData: [ { label: "学号", name: "StuNo", width: 150, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, + { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 53f6a37f3..d03f0f719 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -1127,6 +1127,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dormitory.StudentID = ""; dormitory.StuName = ""; db.Update(dormitory); + //宿舍上一级房间，入住人数-1 + var room = db.FindEntity(x => x.ID == dormitory.ParentID); + if (room != null) + { + if (room.CheckInStu.HasValue && room.CheckInStu.Value>0) + { + room.CheckInStu--; + db.Update(room); + } + } } //班级置为已毕业班级 var classInfo = db.FindEntity(x => x.ClassNo == item.ClassNo); From f2560485ad0972239dcbca4bfd29759a37017c8f Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 10:41:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js index 06af73f83..d75a72e86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js @@ -75,8 +75,8 @@ var bootstrap = function ($, learun) { learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoList', {}, function (data) { schemeList = data; //增加资产申请项目 - schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' }); - schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' }); + //schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' }); + //schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' }); render(); }); From b81b58340e72c6f01b227f111e0f02a47a59dfe4 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 14:47:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=BE=E5=AD=97+=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js index 281f6bd19..58999ebf9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js @@ -271,7 +271,7 @@ setTimeout(function () { (b.operaSupport && a.browser.opera ? c : e[0].contentWindow).print(); c && c.close() - }, 1E3) + }, 3000) } From 0613772e64ad18505a4202fb0cb9ee83f1460bfc Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 15:15:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pc=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4=E5=90=8C=E6=84=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 efff7aa67..2d358bbf2 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 @@ -1342,6 +1342,7 @@ var bootstrap = function ($, learun) { var _department = departmentMap[userMap[_jitem.Id].departmentId]; if (_department) { name = '【' + _department.name + '】' + name; + //name = '【' + _department.name + '】' + name; } nameList.push(name); @@ -1435,7 +1436,7 @@ var bootstrap = function ($, learun) { name = '【' + _department.name + '】' + name; } } - var content = item.F_OperationName; + var content = ''; if (item.F_Des) { content += '【审批意见】' + item.F_Des; }