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__') {