Merge branch 'blueBranch' into allTestUrgent

src/SManagement/setenterpriseInfo/index.vue

@@ -37,7 +37,7 @@
         </el-descriptions>
         <el-tabs v-model="activeName">
           <el-tab-pane :label="$t('收货地址')" name="first">
-            <setAddress :mainData="enterpriseInfo"></setAddress>
+            <setAddress ref="addressRef" :mainData="enterpriseInfo"></setAddress>
           </el-tab-pane>
           <el-tab-pane :label="$t('财务信息')" name="second">
             <financial :mainData="enterpriseInfo" height="calc(100vh - 500px)"></financial>
@@ -81,10 +81,13 @@ export default {
       const res = await this.$api.requested({
         "id": 20221022165203,
         "content": {
-          sys_enterpriseid:this.userInfo.agent.sys_enterpriseid
+          sys_enterpriseid:this.userInfo.agent?this.userInfo.agent.sys_enterpriseid:''
         }
       })
       this.enterpriseInfo = res.data
+      this.$nextTick(()=>{
+        this.$refs.addressRef.listData()
+      })
       this.show = true
     },
     //获取用户信息

src/SManagement/setenterpriseInfo/modules/address/list.vue

@@ -50,6 +50,7 @@ export default {
           }
         }
       })
+      console.log(res.data,'输出企业信息地址')
       this.list = res.data
     },
     async deleteContacts (row) {
@@ -66,7 +67,7 @@ export default {
     }
   },
   mounted () {
-    this.listData()
+    // this.listData()
   },
   watch:{
     mainData (val) {