fix: 权力主体改成guid
Showing
1 changed file
with
12 additions
and
5 deletions
| ... | @@ -102,7 +102,7 @@ const getArea = (node, resolve) => { | ... | @@ -102,7 +102,7 @@ const getArea = (node, resolve) => { |
| 102 | const baseInfoExpand = ref(true); | 102 | const baseInfoExpand = ref(true); |
| 103 | const assetTableInfoExpand = ref(true); | 103 | const assetTableInfoExpand = ref(true); |
| 104 | const importTableFieldRef = ref(); | 104 | const importTableFieldRef = ref(); |
| 105 | const rightMainTenantList = ref([]); //权利主体下拉列表选择 | 105 | const rightMainTenantList: any = ref([]); //权利主体下拉列表选择 |
| 106 | const baseInfoFormRef = ref(); | 106 | const baseInfoFormRef = ref(); |
| 107 | 107 | ||
| 108 | const baseInfoFormItems = ref([ | 108 | const baseInfoFormItems = ref([ |
| ... | @@ -722,8 +722,9 @@ const save = () => { | ... | @@ -722,8 +722,9 @@ const save = () => { |
| 722 | params.rightMain = detailInfo.value.rightMain; | 722 | params.rightMain = detailInfo.value.rightMain; |
| 723 | params.rightMainName = detailInfo.value.rightMainName; | 723 | params.rightMainName = detailInfo.value.rightMainName; |
| 724 | if (route.query.dataSources != '1') { | 724 | if (route.query.dataSources != '1') { |
| 725 | params.rightMain = detailInfo.value.rightMain; | 725 | params.rightMain = JSON.parse(userStore.userData).tenantGuid; |
| 726 | params.rightMainName = detailInfo.value.rightMainName; | 726 | } else { |
| 727 | params.rightMainName = rightMainTenantList.value.find(v => v.guid == params.rightMain); | ||
| 727 | } | 728 | } |
| 728 | fullscreenLoading.value = true; | 729 | fullscreenLoading.value = true; |
| 729 | registerCatalogUpdate(params).then((res: any) => { | 730 | registerCatalogUpdate(params).then((res: any) => { |
| ... | @@ -745,8 +746,14 @@ const save = () => { | ... | @@ -745,8 +746,14 @@ const save = () => { |
| 745 | fullscreenLoading.value = true; | 746 | fullscreenLoading.value = true; |
| 746 | console.log(params, 'params'); | 747 | console.log(params, 'params'); |
| 747 | let userData = JSON.parse(userStore.userData); | 748 | let userData = JSON.parse(userStore.userData); |
| 748 | params.rightMain = userData.tenantGuid; | 749 | if (route.query.dataSources != '1') { |
| 749 | params.rightMainName = userData.tenantName; | 750 | let userData = userStore.userData; |
| 751 | params.rightMain = userData.tenantGuid; | ||
| 752 | params.rightMainName = userData.tenantName; | ||
| 753 | } else { | ||
| 754 | params.rightMainName = rightMainTenantList.value.find(v => v.guid == params.rightMain); | ||
| 755 | } | ||
| 756 | // params.rightMain = JSON.parse(userStore.userData).tenantGuid; | ||
| 750 | registerCatalogSave(params).then((res: any) => { | 757 | registerCatalogSave(params).then((res: any) => { |
| 751 | fullscreenLoading.value = false; | 758 | fullscreenLoading.value = false; |
| 752 | if (res.code == proxy.$passCode) { | 759 | if (res.code == proxy.$passCode) { | ... | ... |
-
Please register or sign in to post a comment