Merge branch 'gn_approval' into debug

src/views/approve_manage/approveList.vue

@@ -188,7 +188,29 @@ export default {
         };
     },
     methods: {
-        getTableData(){  
+        handleReportClassifyId(){
+            const ids = {
+                ClassifyFirstId:0,
+                ClassifySecondId:0,
+                ClassifyThirdld:0,
+            }
+            if(this.classify.length === 2){
+                ids.ClassifyFirstId = this.classify[this.classify.length-1]||0;
+                ids.ClassifySecondId = 0;
+                ids.ClassifyThirdld = 0;
+            } else if(this.classify.length === 3){
+                ids.ClassifyFirstId = this.classify[this.classify.length-2]||0
+                ids.ClassifySecondId = this.classify[this.classify.length-1]||0
+                ids.ClassifyThirdld = 0;
+            } else {  //分类最多只有三级
+                ids.ClassifyFirstId = this.classify.length > 1 ? this.classify[this.classify.length-3]||0 : 0;
+                ids.ClassifySecondId = this.classify.length > 1 ? this.classify[this.classify.length-2]||0 : 0;
+                ids.ClassifyThirdld = this.classify.length > 1 ? this.classify[this.classify.length-1]||0 : 0;
+            }
+
+            return ids
+        },
+        getTableData(){
             this.tableLoading = true
             this.tableData=[]
             const baseParams = {
@@ -200,8 +222,9 @@ export default {
             const selectParams = {
                 //关联报告
                 ReportType:this.classify[0]||0,
-                ClassifyFirstId:this.classify[this.classify.length-2]||0,
-                ClassifySecondId:this.classify[this.classify.length-1]||0,
+                ClassifyFirstId:this.handleReportClassifyId().ClassifyFirstId||0,
+                ClassifySecondId:this.handleReportClassifyId().ClassifySecondId||0,
+                ClassifyThirdld:this.handleReportClassifyId().ClassifyThirdld||0,
                 //时间
                 TimeType:this.timeType,
                 StartTime:this.timeDate?this.timeDate[0]||'':'',