diff --git a/src/components/ChooseInitiate/index.vue b/src/components/ChooseInitiate/index.vue index 2b183e7..593f37d 100644 --- a/src/components/ChooseInitiate/index.vue +++ b/src/components/ChooseInitiate/index.vue @@ -36,7 +36,7 @@ + > 2) value = String(parseFloat(value)) - this[form.split('.')[0]][form.split('.')[1]] = Number(value) > 100 ? 0 : value.replace(/[^.\d]/g, '') + if (String(value).split('.').length > 2) value = String(parseFloat(value)) + const a = Number(value) > 100 ? 0 : value.replace(/[^.\d]/g, '') + this[form.split('.')[0]][form.split('.')[1]] = String(a) } diff --git a/src/views/kpi/assessment/homeList/index.vue b/src/views/kpi/assessment/homeList/index.vue index e537590..e1d482c 100644 --- a/src/views/kpi/assessment/homeList/index.vue +++ b/src/views/kpi/assessment/homeList/index.vue @@ -110,35 +110,7 @@ export default { form: { cycleType: '' }, - tableData: [{ - date: '2016-05-03', - name: '2020年01月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年02月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年03月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年01月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年01月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年01月绩效考核', - number: '10' - }, { - date: '2016-05-03', - name: '2020年01月绩效考核', - number: '10' - }] + tableData: [] } }, computed: {}, diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue index 89efd09..a6ea0da 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue @@ -209,6 +209,7 @@ export default { if (this.handleGetList().length === 2) { this.itemInfo = params } + this.handleClick(params) this.$forceUpdate() console.log('this.itemInfo: ', this.itemInfo) console.log('this.list: ', this.list) @@ -333,8 +334,7 @@ export default { } } &-contant:hover{ - background: @fontBlue; - color: #fff; + background: rgb(236, 246, 253); .close{ display: block; } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue index 9c2e573..ed8ab2c 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue @@ -216,6 +216,7 @@ export default { if (this.handleGetList().length === 2) { this.itemInfo = params } + this.handleClick(params) this.$forceUpdate() console.log('this.itemInfo: ', this.itemInfo) console.log('this.list: ', this.list) @@ -345,8 +346,7 @@ export default { } } &-contant:hover{ - background: @fontBlue; - color: #fff; + background: rgb(236, 246, 253); .close{ display: block; } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue index f01c109..2f1953f 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue @@ -37,7 +37,7 @@ export default { beforeMount () {}, mounted () { this.form = Object.assign({}, this.info) - this.form.chartDetails.recordSimpleDtos = [ + this.form.chartDetails.recordSimpleDtos = this.form.chartDetails.recordSimpleDtos.length ? this.form.chartDetails.recordSimpleDtos : [ { optType: -1 } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue index 173d2f6..39d908b 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue @@ -2,7 +2,7 @@