数据资产登记bug修改

@@ -288,7 +288,6 @@ const getDetailInfo = () => {
     Promise.all(ps).then(() => {
     Promise.all(ps).then(() => {
       fullscreenLoading.value = false;
       fullscreenLoading.value = false;
       tenantDetail.value = tentData;
       tenantDetail.value = tentData;
-      console.log(tentData);
     }).catch(() => {
     }).catch(() => {
       fullscreenLoading.value = false;
       fullscreenLoading.value = false;
     });
     });

@@ -12,6 +12,7 @@ import useUserStore from "@/store/modules/user";
 import {
 import {
   getAreaData,
   getAreaData,
   getTenantInfo,
   getTenantInfo,
+  getTenantDetailInfo,
   getServiceTenants,
   getServiceTenants,
   getTenantAttach,
   getTenantAttach,
   getSingleList
   getSingleList
@@ -166,10 +167,26 @@ const tenantDetail: any = ref({});
 
 
 /** 获取当前登录会员，服务商，企业等详情。 */
 /** 获取当前登录会员，服务商，企业等详情。 */
 const getTenantDetail = () => {
 const getTenantDetail = () => {
-  getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
-    if (res.code == proxy.$passCode) {
-      const data = res.data ?? {};
-      tenantDetail.value = data;
+  let ps: any = [], tentData = {};
+    ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }));
+    ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }))
+
+    Promise.all(ps).then(() => {
+      tenantDetail.value = tentData;
       propertyFormItems.value.forEach((item, index) => {
       propertyFormItems.value.forEach((item, index) => {
         if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
         if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
           item.default = tenantDetail.value[item.field];
           item.default = tenantDetail.value[item.field];
@@ -186,10 +203,9 @@ const getTenantDetail = () => {
           }
           }
         }
         }
       });
       });
-    } else {
-      ElMessage.error(res.msg);
-    }
-  });
+    }).catch(() => {
+      fullscreenLoading.value = false;
+    });
 }
 }
 
 
 const setBaseFormItemsValue = (info) => {
 const setBaseFormItemsValue = (info) => {