Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -17,7 +17,7 @@
                 </div>
             </el-col>
 
-            <el-col :span="12" class="userinfo">
+            <el-col :span="12" class="userinfo" style="display: flex;align-items: center;justify-content: flex-end;">
                 <!-- 中英文切换入口 -->
                 <!-- <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">

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

@@ -437,15 +437,19 @@
                     this.allListData = arrlist
                     // this.gtff()
                     if(this.user.userNameNeedTranslate == '1') {
-                        let list = arrlist.list
-                        let dealWithList = []
-                        for(var i in list) {
-                            let obj = {}
-                            obj.type = list[i].type
-                            obj.id = list[i].name
-                            dealWithList.push(obj)
+                        if(arrlist.list.length > 0) {
+                            let list = arrlist.list
+                            let dealWithList = []
+                            for(var i in list) {
+                                let obj = {}
+                                obj.type = list[i].type
+                                obj.id = list[i].name
+                                dealWithList.push(obj)
+                            }
+                            this.dealWithTranslationPlone(dealWithList)
+                        } else {
+                            this.getUserCostList()
                         }
-                        this.dealWithTranslationPlone(dealWithList)
                     } else {
                         this.allListData = arrlist
                         this.gtff()