*

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -14,9 +14,9 @@
             {{ name.length>10?name.slice(0, 10)+'...':name}}
           </div>
           <el-dropdown-menu slot="dropdown" class="user-dropdown">
-            <el-dropdown-item>
+            <el-dropdown-item v-if="tenanlist.length>1">
               <span>我的企业 <img class="dir" src="@/assets/images/direction.png"> </span>
-              <div class="mycom" v-if="tenanlist.length>1">
+              <div class="mycom">
                 <div class="bg">
                   <div @click="getorther(item.tenantId)" v-for="(item,index) in tenanlist" :class="{'choose':tenantId == item.tenantId}">
                     <img src="@/assets/images/enter.png" class="logos"><span>{{item.companyName}}</span><img class="on" src="@/assets/images/tips.png">
@@ -80,7 +80,7 @@ export default {
       })
     })
     this.navbarWidth=`calc(100% - ${this.offsetWidth}px)`
-    // this.$refs.mydrodown.show()
+    this.$refs.mydrodown.show()
     this.getTetant()
   },
   methods: {
@@ -201,7 +201,7 @@ export default {
 .user-dropdown {
   padding: 12px 0;
   width: 147px;
-  height: 138px;
+  /*height: 138px;*/
   box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
   border-radius: 4px;
   .el-dropdown-menu__item{

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

@@ -215,7 +215,14 @@
 </template>
 
 <script>
-  import { getTenantList,getTenant,selectTenant,editTenant,saveTenant,deleteTenant} from "@/api/enterpriseManagement/enterpriseManagement";
+  import {
+    deleteTenant,
+    editTenant,
+    getTenant,
+    getTenantList,
+    saveTenant,
+    selectTenant
+  } from '@/api/enterpriseManagement/enterpriseManagement'
 
   export default {
     name: "EnterpriseManagement",
@@ -383,17 +390,29 @@
             this.form.expireTime = this.form.dateRange[1]
             if (this.form.id != undefined) {
               editTenant(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-                loading.close();
+                if (response.code == 200) {
+                  this.$modal.msgSuccess('修改成功')
+                  this.open = false
+                  this.getList()
+                  loading.close()
+                } else {
+                  this.$modal.msgError(response.msg)
+                }
+              }).catch(response => {
+                this.$modal.msgError(response.msg)
               });
             } else {
               saveTenant(this.form).then(response => {
+                if (response.code == 200){
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
                 loading.close();
+                }else{
+                  this.$modal.msgError(response.msg)
+                }
+              }).catch(response => {
+                this.$modal.msgError(response.msg)
               });
             }
           }

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

@@ -119,7 +119,7 @@
           <el-radio :disabled="disabled" v-model="form.status" label="0">正常</el-radio>
           <el-radio :disabled="disabled" v-model="form.status" label="1">停用</el-radio>
         </el-form-item>
-        <el-form-item label="角色授权">
+        <el-form-item label="角色授权" prop="menuIds">
           <el-checkbox :disabled="disabled" v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox :disabled="disabled" v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <el-checkbox :disabled="disabled" v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
@@ -208,6 +208,9 @@
           status: [
             { required: true, message: "状态不能为空", trigger: "blur" }
           ],
+          menuIds: [
+            { required: true, message: "权限不能为空", trigger: "blur" }
+          ],
         }
       };
     },
@@ -345,10 +348,9 @@
       },
       /** 提交按钮 */
       submitForm: function() {
+        this.form.menuIds = this.getMenuAllCheckedKeys();
         this.$refs["form"].validate(valid => {
           if (valid) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            console.log(this.form.menuIds )
             // return false
             if (this.form.packageId != undefined) {
               saveTenantPackage(this.form).then(response => {

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