当执行人为多人时的处理方式:
@@ -137,7 +138,8 @@ export default {
list = list.map(i => {
i.isShow = false
i = Object.assign({}, this.handleOptType(i), i)
- i.isActive = i.optType === 0 ? 0 : 1
+ console.log('i: ', i)
+ i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
return j
@@ -162,6 +164,7 @@ export default {
return obj
}
if (i.optType === -1) {
+ obj.name = '被考核人'
return obj
} else {
obj.name = this.options.filter(j => j.id === i.optType)[0].name
@@ -239,10 +242,10 @@ export default {
arr = arr.map(i => {
i.roleIds = ''
i.roleDtos.map(j => {
- if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
+ if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
})
i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
- i.optType = i.isActive === 0 ? 0 : i.optType
+ i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
return i
})
console.log('arr: ', arr)
@@ -266,15 +269,17 @@ export default {
handler (n, o) {
const arr = n
console.log('arr: ', arr)
- if (arr.isActive !== 0) {
- if (arr.optType === 0) arr.optType = 1
+ if (arr.isActive !== 0 && arr.isActive !== -1) {
+ if (arr.optType < 1) arr.optType = 1
arr.name = this.options.filter(i => i.id === arr.optType)[0].name
- } else {
+ } else if (arr.isActive === 0) {
if (arr.list) {
arr.name = this.handleTitle(arr.list)
} else {
arr.name = '未指定成员'
}
+ } else {
+ arr.name = '被考核人自己'
}
// this.$emit('update:info', this.list)
// n.roleIds = ''
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
index e867f90..acc2f05 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
@@ -239,7 +239,7 @@ export default {
n.map(i => {
i.roleIds = ''
i.roleDtos.map(j => {
- if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
+ if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
})
i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
})
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
index 2e1ed14..b927bc3 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
@@ -36,8 +36,7 @@ import Perform from './Perform'
import Entry from './Entry'
import Score from './Score'
import Approval from './Approval'
-import {getByFlowManagerId, saveDetailProcs} from '@/api/workbench'
-console.log('saveDetailProcs: ', saveDetailProcs)
+import {getByFlowManagerId} from '@/api/workbench'
export default {
props: ['processInfo'],
data () {
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
index f362d38..cbf486b 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
@@ -22,7 +22,6 @@ import basis from './components/basis'
import process from './components/process'
import templateSet from './components/templateSet'
import {saveBaseSet, saveTemSet, saveDetailProcs} from '@/api/workbench'
-console.log('saveDetailProcs: ', saveDetailProcs)
export default {
data () {
diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
index 4d2ab4b..50d46f5 100644
--- a/src/views/kpi/workbench/todo/index.vue
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -149,7 +149,7 @@ export default {
this.handleGetList()
},
handleRowClick (row) {
- this.$router.push({ name: 'assessment-stepList', query: { id: row.recordId } })
+ this.$router.push({ name: 'assessment-performance', query: { id: row.recordId } })
}
},
watch: {}