*

dsk-operate-ui/src/api/enterpriseManagement/enterpriseManagement.js

@@ -78,6 +78,13 @@ export function deleteTenant(ids) {
     method: 'Delete',
   })
 }
+//租户请求企业套餐下拉
+export function selectTenant(ids) {
+  return request({
+    url: '/system/tenant/package/selectList',
+    method: 'Get',
+  })
+}
 
 
 

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -215,7 +215,7 @@
 </template>
 
 <script>
-  import { getTenantList,getTenant,getTenantPackage,editTenant,saveTenant,deleteTenant} from "@/api/enterpriseManagement/enterpriseManagement";
+  import { getTenantList,getTenant,selectTenant,editTenant,saveTenant,deleteTenant} from "@/api/enterpriseManagement/enterpriseManagement";
 
   export default {
     name: "index",
@@ -292,9 +292,9 @@
     methods: {
       //获取企业方案列表
       getpack(){
-        getTenantPackage().then(res=>{
+        selectTenant().then(res=>{
           if(res.code = 200){
-            this.packageList = res.rows
+            this.packageList = res.data
           }
         })
       },

dsk-operate-ui/src/views/system/role/index.vue

@@ -382,7 +382,7 @@ export default {
     /** 根据角色ID查询菜单树结构 */
     getRoleMenuTreeselect(roleId) {
       return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
+        this.menuOptions = response.data.menus;
         return response;
       });
     },
@@ -505,25 +505,21 @@ export default {
       this.title = "添加角色";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    async handleUpdate(row) {
       this.reset();
       const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
+      const roleMenu = await this.getRoleMenuTreeselect(roleId);
+      const roles = await getRole(roleId)
+        this.form = roles.data;
         this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                    this.$refs.menu.setChecked(v, true ,false);
-                })
-            })
-          });
-        });
+        await this.$nextTick();
+        let checkedKeys = roleMenu.data.checkedKeys
+        checkedKeys.forEach((v) => {
+          this.$nextTick(()=>{
+            this.$refs.menu.setChecked(v, true ,false);
+          })
+        })
         this.title = "修改角色";
-      });
     },
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {