Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into vert push -usion_report

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)

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)

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 {

src/views/modules/result/report/index.vue

@@ -25,7 +25,7 @@
         label="当前进度">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === 0" size="small" type="danger">未提交</el-tag>
-          <el-tag v-if="scope.row.status === 4" size="small" type="success">已完成</el-tag>
+          <el-tag v-if="scope.row.status === 2 || scope.row.status === 4 || scope.row.status === 7" size="small" type="success">已完成</el-tag>
           <el-tag v-if="scope.row.status === 1 || scope.row.status === 3 || scope.row.status === 5 || scope.row.status === 6" size="small" type="primary">审核中</el-tag>
         </template>
       </el-table-column>
@@ -48,7 +48,7 @@
       </el-table-column>
 
       <el-table-column
-        prop="version"
+        prop="businessScore"
         header-align="center"
         align="center"
         width="200"
@@ -57,13 +57,14 @@
       </el-table-column>
 
       <el-table-column
-        prop="deployTime"
+        prop="valueScore"
         header-align="center"
         align="center"
         width="200"
         label="价值观得分30%">
       </el-table-column>
       <el-table-column
+        prop="allScore"
         header-align="center"
         align="center"
         width="120"
@@ -71,6 +72,7 @@
       </el-table-column>
 
       <el-table-column
+        prop="scoreLevel"
         header-align="center"
         align="center"
         width="120"
@@ -141,7 +143,7 @@
           'level': this.level,
           'type': this.type
         }).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 {