From 83c54f08435acc7182d7a678ee69a5454c8740f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Fri, 23 Oct 2020 17:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workbench.js | 4 ++-- .../edit/components/ApprovalList.vue | 7 +++++++ .../assessmentGroup/edit/components/Confirm.vue | 6 ------ .../edit/components/ConfirmList.vue | 7 +++++++ .../assessmentGroup/edit/components/Score.vue | 6 +++--- .../edit/components/ScoreList.vue | 17 +++++++++++++---- .../workbench/assessmentGroup/edit/index.vue | 13 ++++++++++++- 7 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/api/workbench.js b/src/api/workbench.js index f59f6e4..d695c95 100644 --- a/src/api/workbench.js +++ b/src/api/workbench.js @@ -67,7 +67,7 @@ export function getByFlowManagerId (query) { export function saveDetailProcs (query) { return request({ url: '/lz_management/flowChart/saveDetailProcs', - method: 'get', - params: query + method: 'post', + data: query }) } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue index 5d9c8ab..b2ac875 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue @@ -196,6 +196,13 @@ export default { list: { deep: true, handler (n, o) { + n.map(i => { + i.roleIds = '' + i.roleDtos.map(j => { + if (j.type !== 1 && j.checked) i.roleIds += j.id + ',' + }) + i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1) + }) console.log('n: ', n) this.$emit('update:info', this.list) this.$forceUpdate() diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Confirm.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Confirm.vue index 1715711..fc276e4 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Confirm.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Confirm.vue @@ -39,14 +39,12 @@ export default { beforeMount () {}, mounted () { this.form = this.info - console.log('info: ', this.info) }, methods: {}, watch: { form: { deep: true, handler (n, o) { - console.log('n3333: ', n) this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'})) // console.log('info: ', this.info) this.$forceUpdate() @@ -55,10 +53,6 @@ export default { 'info': { deep: true, handler (n, o) { - console.log('n222: ', n) - // this.form = n - // this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n ? '' : '已禁用'})) - // console.log('info: ', this.info) this.$forceUpdate() } } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue index 5d9c8ab..b2ac875 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue @@ -196,6 +196,13 @@ export default { list: { deep: true, handler (n, o) { + n.map(i => { + i.roleIds = '' + i.roleDtos.map(j => { + if (j.type !== 1 && j.checked) i.roleIds += j.id + ',' + }) + i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1) + }) console.log('n: ', n) this.$emit('update:info', this.list) this.$forceUpdate() diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue index b570f25..b89486f 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue @@ -48,11 +48,11 @@ export default { deep: true, handler (n, o) { console.log('n: ', n) - let weight = 0 + let weight1 = 0 n.chartDetails.recordSimpleDtos.map(i => { - weight = weight + Number(i.weight) + weight1 = weight1 + Number(i.weight1) }) - this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '权重评分:' + weight + '%' : '已禁用'})) + this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '权重评分:' + weight1 + '%' : '已禁用'})) // console.log('info: ', this.info) this.$forceUpdate() } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue index 164cf24..50fdfef 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue @@ -45,7 +45,7 @@
评分权重：
- +
@@ -167,7 +167,7 @@ export default { isCick: !isC, isShow: false, label: '权重评分:0%', - weight: 0, + weight1: 0, roleDtos: JSON.parse(JSON.stringify(this.roleDtos.map(i => { if (i.type !== 1) i.checked = true return i @@ -205,6 +205,14 @@ export default { list: { deep: true, handler (n, o) { + n.map(i => { + i.roleIds = '' + i.roleDtos.map(j => { + if (j.type !== 1 && j.checked) i.roleIds += j.id + ',' + }) + i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1) + }) + console.log('n: ', n) this.$emit('update:info', this.list) this.$forceUpdate() } @@ -216,8 +224,9 @@ export default { if (n.isActive !== 0) { n.name = this.options.filter(i => i.id === n.optType)[0].name } - if (n.weight >= 0) { - n.label = '权重评分：' + n.weight + '%' + n.weight = n.weight1 / 100 + if (n.weight1 >= 0) { + n.label = '权重评分：' + n.weight1 + '%' } else { n.label = '' } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index 625ceb0..d486924 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -21,7 +21,8 @@ import basis from './components/basis' import process from './components/process' import templateSet from './components/templateSet' -import {saveBaseSet, saveTemSet} from '@/api/workbench' +import {saveBaseSet, saveTemSet, saveDetailProcs} from '@/api/workbench' +console.log('saveDetailProcs: ', saveDetailProcs) export default { data () { @@ -62,6 +63,16 @@ export default { async handSaveBasisc () { console.log('this.processInfo: ', this.processInfo) + for (let i in this.processInfo) { + console.log('processInfo: ', i) + try { + let res = await saveDetailProcs(this.processInfo[i].chartDetails) + console.log('res: ', res) + } catch (error) { + console.log('error: ', error) + } + } + // console.log('this.basisForm: ', this.basisForm) // try { // let res = await saveBaseSet(this.basisForm)