1

fhKeeper/formulahousekeeper/timesheet/index.html

@@ -71,12 +71,12 @@
             .projectSelectPopperClass .el-select-dropdown__item span:nth-child(1){
                 font-size: 13px;
                 height: 34px;
-                width: 35%;
+                max-width: 350px;
             }
             .projectSelectPopperClass .el-select-dropdown__item span:nth-child(2){
                 font-size: 13px;
                 height: 34px;
-                width: 65%;
+                max-width: 650px;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;

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

@@ -945,6 +945,7 @@
                         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 ? 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) {
@@ -1018,6 +1019,7 @@
                         else if(this.theCustomListFlg) {
                             // this.allListData = res.data.list ? res.data.list : []
                             this.total = this.allListData.list ? this.allListData.list.length : 0
+                            console.log('jieliu_echarts',this.allListData);
                             list = this.total ? this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1)) : []
                             // list = res.data.list
                             
@@ -1043,10 +1045,10 @@
                         } 
                         else {
                             //自定义列表：data:{cost:3, costMoney:222}
-                            this.total = this.allListData.costList ? this.allListData.costList.length : 0
+                            this.total = this.allListData ? this.allListData.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))
+                                list = this.allListData.slice(0+50*(this.page-1),49+50*(this.page-1))
                             // }else{
                             //     list = 
                             // }