diff --git a/src/views/modules/result/chart/componments/chart-form/index.vue b/src/views/modules/result/chart/componments/chart-form/index.vue
index 0a203c0..28c85e2 100644
--- a/src/views/modules/result/chart/componments/chart-form/index.vue
+++ b/src/views/modules/result/chart/componments/chart-form/index.vue
@@ -77,7 +77,12 @@
if (e.name === '已完成') {
this.status = 109
}
- this.$router.push({name: 'resultReport', query: { status: this.status }}, () => {
+ if (this.title === '绩效结果进度') {
+ this.type = 2
+ } else {
+ this.type = 1
+ }
+ this.$router.push({name: 'resultReport', query: { status: this.status, type: this.type }}, () => {
this.mainTabsActiveName = this.$route.name
})
console.log('---------' + e.name)
diff --git a/src/views/modules/result/chart/index.vue b/src/views/modules/result/chart/index.vue
index c3e62f4..ab0286b 100644
--- a/src/views/modules/result/chart/index.vue
+++ b/src/views/modules/result/chart/index.vue
@@ -54,7 +54,7 @@ export default {
setTimeout(() => {
loading.close()
}, 500)
- if (result.code === 0) {
+ if (result && result.code === 0) {
this.dataInfo = result.data
} else {
this.$message.error(result.msg)
diff --git a/src/views/modules/result/distribution/index.vue b/src/views/modules/result/distribution/index.vue
index 22e92f5..8e33846 100644
--- a/src/views/modules/result/distribution/index.vue
+++ b/src/views/modules/result/distribution/index.vue
@@ -182,7 +182,7 @@
'departmentId': this.departmentId,
'selectMonthTime': this.selectMonthTime
}).then(res => {
- if (res && res.code === 0) {
+ if (res && res.code === 0 && res.page) {
this.dataList = res.page.list
this.totalPage = res.page.totalCount
} else {
diff --git a/src/views/modules/result/report/index.vue b/src/views/modules/result/report/index.vue
index 424a348..ee92e3a 100644
--- a/src/views/modules/result/report/index.vue
+++ b/src/views/modules/result/report/index.vue
@@ -25,7 +25,7 @@
label="当前进度">
未提交
- 已完成
+ 已完成
审核中
@@ -48,7 +48,7 @@
{
- if (res && res.code === 0) {
+ if (res && res.code === 0 && res.page) {
this.dataList = res.page.list
this.totalPage = res.page.totalCount
} else {