From cb777d117f39a377f9d51732b21e718f42ca60b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Thu, 20 Oct 2022 17:19:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9D=A5=E6=BA=90=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=EF=BC=9B=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=8C=87=E6=B4=BE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BA=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/learun-app/organize-picker.vue | 3 +- .../pages/LR_OAModule/noticeExamine.vue | 5 +- .../LearunApp-2.2.0/pages/home.vue | 2 +- .../pages/nworkflow/myflow/sign.vue | 78 ++++++++++++++++++- .../pages/nworkflow/myflow/single.vue | 4 +- 5 files changed, 86 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue index 8c7f9fa70..8f9af647f 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue @@ -64,8 +64,7 @@ export default { } const list = this.GET_GLOBAL(this.type) - - let values = this.value.split(",") + let values = this.value instanceof Array?this.value:this.value.split(",") if(values.length>1){ const orgItems = values.map(t=>list[t]?list[t].name:'').toString() return orgItems 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 43b398353..597b68ea7 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 @@ -97,6 +97,7 @@ export default { getFormData(ProgressId){ return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(async res=>{ if(res){ + res.F_SourceName = res.F_SourceName&&this.GET_GLOBAL('department')[res.F_SourceName]? this.GET_GLOBAL('department')[res.F_SourceName].name : res.F_SourceName this.formData = res let fileList = await this.getFileListById(res.F_NewsImage) if(fileList&&fileList.length){ @@ -118,7 +119,9 @@ export default { processId: currentTask.F_ProcessId, taskId: currentTask.F_Id, formreq: postData.formreq, - taskName: this.currentTask.F_Title + taskName: this.currentTask.F_Title, + currentNode:this.currentNode, + code:this.code||'' } // 不是加签 if (action.code !== '__sign__') { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue index 6037352ca..03828c8f4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue @@ -397,7 +397,7 @@ export default { }) } if(item.F_Name == "待办事项"){ - this.CornerMarker = value.length + this.CornerMarker = value.length||'0' } this.noticeData.push({ title: item.F_Name, 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 0496ef9c4..11d74ab92 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 @@ -34,6 +34,14 @@ + + + + + 确定指派 + 取消 + 提交流程{{ typeText }} @@ -56,7 +64,13 @@ export default { staff: '', remark: '', taskParam: {}, - canvas: true + canvas: true, + + modal: false, + reviewer: [], + reviewerList: [], + reviewerListId:'', + submitPostData:null, } }, @@ -86,6 +100,37 @@ export default { context.setLineJoin('round') touchs = [] }, + + // 指派审核人 + async userAssign() { + if(!this.reviewer.length){ + this.modal = false + this.TOAST('请选择审核人') + return + } + let postData = this.taskParam.formreq + const res = await this.HTTP_POST('learun/adms/newwf/instance', postData, `指派审核人时发生错误`) + if(!res){ + return + } + + this.submitPostData.auditors = {} + this.submitPostData.auditors[this.reviewerListId] = this.reviewer + const success = await this.HTTP_POST( + this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit', + this.submitPostData, + `提交[${this.typeText}]时发生错误` + ) + + if (!success) { + return + } + + this.EMIT('task-list-change') + this.NAV_BACK(2) + this.TOAST(`已成功提交${this.typeText}`, 'success') + + }, // 点击「提交」按钮 async submit() { @@ -155,6 +200,37 @@ export default { // #endif // #endif } + + // 是否需要指派审核人 + let isNext = this.taskParam.currentNode.isNext + if (this.taskParam.next == '2') { + isNext = '1'; + } + if (isNext == '1') { + let params = { + code: this.taskParam.schemeCode, + processId: this.taskParam.processId, + taskId: this.taskParam.taskId, + nodeId: this.taskParam.currentNode.id, + operationCode: this.taskParam.code, + } + const userList = await this.HTTP_GET('learun/adms/newwf/auditer', params, `获取审核人时发生错误`) + if (!userList) { + return + } + + let arr = Object.entries(userList) + this.reviewerListId = arr[0][0] + this.reviewerList = arr[0][1].map(item => { + return { + text: item.Name, + value: item.Id + } + }) + this.submitPostData = postData + this.modal = true + return + } const success = await this.HTTP_POST( this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit', 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 a32091a8a..28eae1ff5 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 @@ -307,7 +307,9 @@ export default { processId: currentTask.F_ProcessId, taskId: currentTask.F_Id, formreq: postData.formreq, - taskName: this.currentTask.F_Title + taskName: this.currentTask.F_Title, + currentNode:this.currentNode, + schemeCode:this.code||'' } // 不是加签 if (action.code !== '__sign__') { From e788ecfaa301f97b7ee77d7219272b3f2d86d734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Fri, 21 Oct 2022 10:29:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?app2.0=E5=AF=9D=E5=AE=A4=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=20=E5=85=AC=E5=85=B1=E5=8C=BA=E5=9F=9F=20=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=97=A5=E5=B8=B8=E7=AE=A1=E7=90=86=E5=A4=84=E7=90=86=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E5=92=8C=E5=AD=A6=E7=94=9F=E7=BA=A7=E8=81=94=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/common/mixins.js | 6 +---- .../Acc_DailyAssess/single.vue | 24 ++++++++++++------- .../Acc_PublicAreaHealth/single.vue | 23 +++++++++++------- .../Acc_StuDayRoutine/single.vue | 23 +++++++++++------- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index 00875baae..cb8682dab 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -205,11 +205,7 @@ export default { if (!code) { return [] } - - return await this.HTTP_GET('learun/adms/datasource/map', { - code, - ver: '' - }) + return await this.HTTP_GET('learun/adms/datasource/map', {code,ver: ''}) }, // 拉取指定规则编号的表单编码数据 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue index 3b7afe0f2..191723ece 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue @@ -215,7 +215,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -259,7 +261,8 @@ export default { this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_DailyAssess.StuNo)) }), @@ -442,14 +445,17 @@ export default { }, //多条件查询：班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_DailyAssess.ClassNo') != null && this.getValue('Acc_DailyAssess.ClassNo')!=undefined && this.getValue('Acc_DailyAssess.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_DailyAssess.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_DailyAssess.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_DailyAssess.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_DailyAssess.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_DailyAssess.StuNo = this.StuNoAll + }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_DailyAssess.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_DailyAssess.ClassNo')) } this.setValue('Acc_DailyAssess.StuNo',''); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue index 2d25b07dd..20db34900 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue @@ -157,7 +157,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -189,7 +191,8 @@ export default { this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_PublicAreaHealth.StuNo)) }), @@ -332,14 +335,16 @@ export default { }, //多条件查询：班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_PublicAreaHealth.ClassNo') != null && this.getValue('Acc_PublicAreaHealth.ClassNo')!=undefined && this.getValue('Acc_PublicAreaHealth.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_PublicAreaHealth.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_PublicAreaHealth.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_PublicAreaHealth.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_PublicAreaHealth.StuNo = this.StuNoAll }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_PublicAreaHealth.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_PublicAreaHealth.ClassNo')) } this.setValue('Acc_PublicAreaHealth.StuNo',''); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue index 9f97d5eaa..f4bdd6b18 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue @@ -157,7 +157,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -189,7 +191,8 @@ export default { this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_StuDayRoutine.StuNo)) }), @@ -332,14 +335,16 @@ export default { }, //多条件查询：班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_StuDayRoutine.ClassNo') != null && this.getValue('Acc_StuDayRoutine')!=undefined && this.getValue('Acc_StuDayRoutine.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_StuDayRoutine.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_StuDayRoutine.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_StuDayRoutine.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_StuDayRoutine.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_StuDayRoutine.StuNo = this.StuNoAll }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_StuDayRoutine.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_StuDayRoutine.ClassNo')) } this.setValue('Acc_StuDayRoutine.StuNo',''); },