Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -765,7 +765,9 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             }
         },
         created() {
-            this.saberTenantId = JSON.parse(localStorage.getItem('saber-tenantId')).content
+            console.log(JSON.parse(localStorage.getItem('saber-tenantId')))
+            let Obj=JSON.parse(localStorage.getItem('saber-tenantId'))
+            this.saberTenantId = Obj?Obj.content:0;
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
             this.roleName =  localStorage.getItem('roleName').split(',')
             // 判断是否员id, 有id 就不显示