Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -533,7 +533,7 @@
                 let data = this.allListData
                 var _this = this;
                 this.hasReportUserList = data.userList;
-                this.total = data.list.length
+                this.total = data.list ? data.list.length : 0
 
                 var totalHours = 0.0;
                 var xList = [] , yList = [] , list = data.list.slice(0+50*(this.page-1),49+50*(this.page-1)), array = [] , series = [];
@@ -944,7 +944,7 @@
                         var totalHours = 0.0;
                         if(this.radio == this.$t('other.project') || this.radio == this.$t('projectclassification') || this.radio==this.$t('lable.department') || this.radio == this.$t('zhu-xiang-mu')) {
                             // this.allListData = res.data.costList
-                            this.total = this.allListData.costList.length
+                            this.total = this.allListData.costList ? this.allListData.costList.length : 0
                             list = this.allListData.costList.slice(0+50*(this.page-1),49+50*(this.page-1))
                             for(var i in list) {
                                 if(i>20) {
@@ -1017,7 +1017,7 @@
                         } 
                         else if(this.theCustomListFlg) {
                             // this.allListData = res.data.list ? res.data.list : []
-                            this.total = this.allListData.list.length
+                            this.total = this.allListData.list ? this.allListData.list.length : 0
                             list = this.total ? this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1)) : []
                             // list = res.data.list
                             
@@ -1043,7 +1043,7 @@
                         } 
                         else {
                             //自定义列表：data:{cost:3, costMoney:222}
-                            this.total = this.allListData.costList.length
+                            this.total = this.allListData.costList ? this.allListData.costList.length : 0
                             console.log('slice',this.allListData);
                             // if(this.total){
                                 list = this.allListData.costList.slice(0+50*(this.page-1),49+50*(this.page-1))