From 3fb0463555438f55e0288aa027206e6397a1c34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Wed, 24 Aug 2022 11:28:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/config.js | 6 +-- .../LearunApp-2.2.0/pages.json | 11 ++++- .../pages/LR_OAModule/noticeExamine.vue | 46 +++++++++++++++++++ 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue 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 c0c228cb7..b0a6167c7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,10 +21,10 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - "http://localhost:31173/" - // "http://192.168.10.85:8088/" + // "http://localhost:31173/" + "http://192.168.10.58:8012/" ], - "webHost":"http://localhost:20472/", + "webHost":"http://192.168.10.58:20472/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index edc93d780..e3c1ac370 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -1008,7 +1008,16 @@ - ], + ,{ + "path" : "pages/LR_OAModule/noticeExamine", + "style" : + { + "navigationBarTitleText": "通知公告", + "enablePullDownRefresh": false + } + + } + ], // 全局样式 "globalStyle": { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue new file mode 100644 index 000000000..00d89e6e7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue @@ -0,0 +1,46 @@ + + + From 3ac79611015da35416a6695a72c406f46c96751b Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 24 Aug 2022 16:21:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B5=E5=BD=B9=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/MSRIntentionManagement/Form.cshtml | 8 ++++---- .../Views/MSRMilitaryRecord/Form.cshtml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml index 529532099..3affe03d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml @@ -4,12 +4,12 @@ }
-
联系方式
- +
联系方式*
+
-
年龄
- +
年龄*
+
身高
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml index ab4f3d723..4b454669e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml @@ -4,8 +4,8 @@ }
-
参军记录
- +
参军记录*
+
备注
From 64f9cbcc1b47ec511841f1af29e4dc638ef822ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Wed, 24 Aug 2022 16:55:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/learun-app/upload-file.vue | 4 + .../pages/LR_OAModule/noticeExamine.vue | 198 ++++++++++++++++-- .../pages/nworkflow/myflow/single.vue | 3 +- 3 files changed, 187 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue index 969f835be..158427de7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue @@ -106,6 +106,10 @@ export default { }, async fileClick(index) { + if(typeof this.value[index] == "string"){ + uni.previewImage({ urls: this.value.filter(item=>typeof this.value[index] == "string"), current: this.value[index] }) + return + } const { path, type, uid, size = 0 } = this.value[index] if (this.isImgFile(type)) { uni.previewImage({ urls: [path], current: path }) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue index 00d89e6e7..397fcc0df 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue @@ -1,12 +1,41 @@ @@ -16,31 +45,166 @@ import moment from 'moment' export default { data() { return { + tab:0, + type:'view', + currentNode:null, + currentTask:null, + taskId:'', + processId:'', + processInfo:null, + processList:[], + formData:{}, ready: false, content: '', + time: '', date: '' } }, - async onLoad() { - await this.init() + async onLoad({type}) { + await this.init(type) }, methods: { - async init() { + async init(type) { + if(type){this.type = type} this.LOADING('加载中…') const noticeItem = this.GET_PARAM() + this.processList = noticeItem.logList + this.currentNode = noticeItem.currentNode + this.currentTask = noticeItem.currentTask + this.processInfo = noticeItem.processInfo + this.taskId = this.currentTask.F_TaskId + this.processId = this.currentTask.F_Id + this.LOADING('加载数据中…') + await this.getFormData(this.processList[0].F_ProcessId) + this.HIDE_LOADING(); + + // this.content = this.CONVERT_HTML(noticeItem.f_content) - this.content = this.CONVERT_HTML(noticeItem.f_content) - - this.time = moment(noticeItem.f_time).format('HH : mm') - this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日') - this.SET_TITLE(noticeItem.f_title) - - this.ready = true - this.HIDE_LOADING() - } + // this.time = moment(noticeItem.f_time).format('HH : mm') + // this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日') + // this.SET_TITLE(noticeItem.f_title) + // this.HIDE_LOADING() + }, + // 获取表单数据 + getFormData(ProgressId){ + return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(res=>{ + if(res){ + this.formData = res + this.content = res.F_NewsContent + this.ready = true + } + }) + }, + + // 点击审批相关按钮 + async audit(action) { + this.LOADING('加载中…') + const currentTask = this.processInfo.task.find(t => t.F_NodeId === this.currentNode.id) + const postData = await this.getPostData(this.formValue, this.scheme) + const pageParam = { + type: 'sign', + processId: currentTask.F_ProcessId, + taskId: currentTask.F_Id, + formreq: postData.formreq, + taskName: this.currentTask.F_Title + } + // 不是加签 + if (action.code !== '__sign__') { + Object.assign(pageParam, action) + pageParam.type = 'verify' + pageParam.auditors = JSON.stringify({}) + pageParam.isFromSignAudit = Number(this.currentTask.F_TaskType) === 3 + } + this.HIDE_LOADING() + this.NAV_TO('/pages/nworkflow/myflow/sign', pageParam, true) + }, + // 点击操作按钮（非审批类按钮） + async action(taskType) { + switch (taskType) { + // 点击「催办」/「撤销流程」/「标记已阅」按钮 + case 'urge': + case 'revoke': + case 'refer': + const actionText = { urge: '催办', revoke: '撤销', refer: '已阅' }[taskType] + const actionUrl = { urge: '/urge', revoke: '/revoke', refer: '/refer' }[taskType] + + let actionData = this.processId + if (taskType === 'refer') { + actionData = { processId: this.processId, taskId: this.taskId } + } + + if (!(await this.CONFIRM(`${actionText}确认`, `确定要提交${actionText}吗？`, true))) { + return + } + this.LOADING(`提交${actionText}中…`) + this.HTTP_POST(`/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => { + this.HIDE_LOADING() + if (success) { + this.EMIT('task-list-change') + this.TOAST(`成功提交${actionText}`, 'success') + if (taskType === 'revoke') { + this.NAV_BACK() + } + } + }) + break + // 点击「提交草稿」按钮 + case 'draft': + this.CONFIRM('不支持此操作') + return + if (!(await this.CONFIRM('提交确认', '确定要提交草稿吗？', true))) { + return + } + this.LOADING('正在提交…') + const draftFormValue = this.$refs.form.getFormValue() + const draftPostData = await this.getPostData(draftFormValue, this.scheme) + this.HTTP_POST('/newwf​/draft', draftPostData, '提交草稿失败').then(success => { + this.HIDE_LOADING() + if (success) { + this.EMIT('task-list-change') + this.NAV_BACK() + this.TOAST('草稿已保存', 'success') + } + }) + break + // 点击「发起流程」按钮 + case 'submit': + this.CONFIRM('不支持此操作') + return + const verifyResult = this.$refs.form.verifyValue() + if (verifyResult.length > 0) { + this.CONFIRM('表单验证失败', verifyResult.join('\n')) + return + } + if (!(await this.CONFIRM('提交确认', '确定要发起流程吗？', true))) { + return + } + this.LOADING('正在提交…') + const formValue = this.$refs.form.getFormValue() + const postData = await this.getPostData(formValue, this.scheme) + postData.auditors = JSON.stringify({}) + + if (this.type === 'child') { + postData.parentProcessId = this.processId + postData.parentTaskId = this.taskId + } + const errorTips = '流程发起失败' + this.HTTP_POST('/newwf/createchildflow', postData, errorTips).then(success => { + this.HIDE_LOADING() + if (success) { + this.EMIT('task-list-change') + this.NAV_BACK() + this.TOAST('流程发起成功', 'success') + } + }) + break + default: + break + } + }, } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue index 565660754..46313e97d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue @@ -110,7 +110,8 @@ export default { this.sysFormJump(appSysPage.appurl, { currentNode: this.currentNode, currentTask: this.currentTask, - logList: this.processList + logList: this.processList, + processInfo:this.processInfo }) return } From f61ad81a76c4f68e1ba2c625b0b78c273d4a0546 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 24 Aug 2022 17:16:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?app2.0=E8=8E=B7=E5=8F=96=E6=A0=A1=E5=86=85?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Post/PostBLL.cs | 20 ++++++++++ .../Post/PostIBLL.cs | 3 ++ .../Post/PostService.cs | 28 +++++++++++++ .../Modules/NewsApi.cs | 39 ++++++++++++++++++- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs index aaa9ee915..a7150a410 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs @@ -3,6 +3,8 @@ using Learun.Cache.Factory; using Learun.Util; using System; using System.Collections.Generic; +using System.Linq; + namespace Learun.Application.Organization { /// @@ -515,6 +517,24 @@ namespace Learun.Application.Organization return res; } + public List GetAllList() + { + try + { + return postService.GetAllList().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs index 84f4ffa02..306e04593 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs @@ -94,5 +94,8 @@ namespace Learun.Application.Organization /// 级数 /// List GetDownIdList(string strPostIds, int level); + + List GetAllList(); + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs index 2b35797b9..4ae6a033d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs @@ -235,5 +235,33 @@ namespace Learun.Application.Organization } } } + + + /// + /// 获取部门列表信息(根据公司Id) + /// + /// + public IEnumerable GetAllList() + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM LR_BASE_POST t WHERE t.F_DeleteMark = 0 "); + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs index 41a74b72c..ccf065c4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs @@ -8,6 +8,7 @@ using Learun.Application.TwoDevelopment.LR_Desktop; using System.Text; using System.Data; using Learun.Application.OA; +using Learun.Application.Organization; namespace Learun.Application.WebApi.Modules { @@ -15,6 +16,8 @@ namespace Learun.Application.WebApi.Modules public class NewsApi : BaseApi { private NoticeIBLL noticeIBLL = new NoticeBLL(); + private DepartmentIBLL departmentIBLL = new DepartmentBLL(); + private PostIBLL postIBLL = new PostBLL(); public NewsApi() : base("/learun/news") @@ -33,7 +36,7 @@ namespace Learun.Application.WebApi.Modules { var userinfo = LoginUserInfo.Get(); Pagination paginationobj = new Pagination(); - var newsList = noticeIBLL.GetList("", userinfo.userId,(Request.Query["F_CategoryId"]!=null?Request.Query["F_CategoryId"].ToString():"")); + var newsList = noticeIBLL.GetList("", userinfo.userId, (Request.Query["F_CategoryId"] != null ? Request.Query["F_CategoryId"].ToString() : "")); var newsListOfSelf = new List(); foreach (var newsitemEntity in newsList) @@ -95,6 +98,38 @@ namespace Learun.Application.WebApi.Modules { NoticeEntity parameter = this.GetReqData(); var shlist = noticeIBLL.GetEntityByProcessId(parameter.ProgressId); + //if (!shlist.F_SendDeptId.IsEmpty()) + //{ + var Array = shlist.F_SendPostId.Split(','); + var deept = departmentIBLL.GetAllList(); + foreach (var item in Array) + { + for (int i = 0; i < deept.Count; i++) + { + if (item == deept[i].F_CompanyId) + { + shlist.F_SendDeptId += deept[i].F_FullName + ","; + } + } + } + shlist.F_SendDeptId.Trim(','); + //} + //if (!shlist.F_SendDeptId.IsEmpty()) + //{ + var Array1 = shlist.F_SendPostId.Split(','); + var post = postIBLL.GetAllList(); + foreach (var item in Array1) + { + for (int i = 0; i < post.Count; i++) + { + if (item == post[i].F_CompanyId) + { + shlist.F_SendDeptId += post[i].F_Name + ","; + } + } + } + shlist.F_SendDeptId.Trim(','); + //} return Success(shlist); } #region 私有类 @@ -102,7 +137,7 @@ namespace Learun.Application.WebApi.Modules private class NoticeEntity { public string ProgressId { get; set; } - } + } #endregion }