租户修改

src/views/organizationManagement/organization/organizationAdd.vue

@@ -21,17 +21,22 @@
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="管理员姓名" prop="userName">
-              <el-input v-model="sysform.userName" placeholder="请输入管理员姓名" />
+              <el-input v-model="sysform.userName" placeholder="请输入管理员姓名" :disabled="userNameShow" />
+              <span style="opacity: 0;">x</span>
             </el-form-item>
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="管理员账号" prop="userAccount">
-              <el-input v-model="sysform.userAccount" placeholder="请输入登录账号" />
+              <el-input  style="display: none;"  type="password"  />
+              <el-input v-model="sysform.userAccount" placeholder="请输入登录账号"  type="text" name="formerEmployer" autocomplete="new-password"  @blur="userAccountblur" />
+              <span style="font-size: 0.7rem;color: #999;">管理员手机号手机号将作为登录账号使用</span>
             </el-form-item>
           </ElCol>
           <ElCol :md="24" :lg="12" v-if="!id">
             <el-form-item label="登录密码" prop="password">
-              <el-input v-model="sysform.password" placeholder="请输入登录密码" show-password type="password" />
+              <el-input  style="display: none;"  type="text"  />
+
+              <el-input v-model="sysform.password" placeholder="请输入登录密码" show-password type="password"  autocomplete="new-password" />
             </el-form-item>
           </ElCol>
 
@@ -126,7 +131,7 @@
       <ElButton type="primary" size="large" @click="submitForm(ruleFormRef)">
         保存
       </ElButton>
-      <ElButton size="large">
+      <ElButton size="large" @click="router.back()">
         取消
       </ElButton>
     </FixedActionBar>
@@ -153,6 +158,7 @@ const dialogImageUrl = ref('')
 const dialogVisible = ref(false)
 const ruleFormRef = ref<FormInstance>()
 const fromSize = ref<ComponentSize>('large')
+const userNameShow = ref(false)
 const props = {
   expandTrigger: 'hover' as const,
 }
@@ -249,6 +255,16 @@ onBeforeMount(() => {
     detailQuery();
   }
 });
+const userAccountblur = (event: any) => {
+  api.tenantApi.userGetPhone(event.target.value).then((res: any) => {
+    if (res.code == '200' && res.data.length) {
+      sysform.value.userName = res.data[0].username;
+      userNameShow.value = true;
+    } else {
+    }
+  });
+
+}
 //详情查询
 const detailQuery = () => {
   api.tenantApi.sysGet({ id: id.value }).then((res: any) => {
@@ -293,7 +309,7 @@ const provinceChange = (value: any) => {
 }
 const handleRemove = (file: UploadFile) => {
   console.log(file)
-  sysIconList.url='';
+  sysIconList.url = '';
   uploadDisabled.value = false;
 
 }
@@ -329,12 +345,19 @@ const submitForm = async (formEl: FormInstance | undefined) => {
               type: 'success',
               message: res.msg,
               plain: true,
+            })
+            router.back();
+
+          } else {
+            ElMessage({
+              type: 'error',
+              message: res.msg,
+              plain: true,
 
             })
           }
         })
       }
-      router.back();
     } else {
 
     }

src/views/organizationManagement/organization/organizationlist.vue

@@ -43,7 +43,7 @@
         <template v-slot:table-title-btn>
           <RouterLink :to="{ name: 'OrganizationAdd' }">
             <el-button type="primary" v-auth="'organizationlist.add'">
-              添加机构
+              添加租户
               <template #icon>
                 <el-icon>
                   <Plus />

src/views/organizationManagement/organization/subOrganizatioAdd.vue

@@ -59,7 +59,7 @@
       <ElButton type="primary" size="large" @click="submitForm(deptFormRef)">
         保存
       </ElButton>
-      <ElButton size="large">
+      <ElButton size="large" @click='router.back()'>
         取消
       </ElButton>
     </FixedActionBar>

src/views/organizationManagement/tenantPermissions.vue

@@ -35,15 +35,15 @@
           <ElDivider style="margin-top: 10px;"></ElDivider>
           <div v-if="roleInfo.systemCode">
             <el-checkbox v-model="treekAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">
-            全选
-          </el-checkbox>
-          <el-checkbox-group v-model="checkedCities" class="flex f-c" @change="handleCheckedCitiesChange">
-            <el-checkbox v-for="item in treeDatalevelOne" :key="item" :label="item" :value="item">
-              {{ item }}
+              全选
             </el-checkbox>
-          </el-checkbox-group>
+            <el-checkbox-group v-model="checkedCities" class="flex f-c" @change="handleCheckedCitiesChange">
+              <el-checkbox v-for="item in treeDatalevelOne" :key="item" :label="item" :value="item">
+                {{ item }}
+              </el-checkbox>
+            </el-checkbox-group>
           </div>
-          <el-empty v-else  image="../../../src/assets/images/empty.png" />
+          <el-empty v-else image="../../../src/assets/images/empty.png" />
         </ElCol>
       </ElRow>
 
@@ -61,6 +61,7 @@ import api from '@/api'
 onBeforeMount(() => {
   findpage()//租户列表
   getMenu();//获取租户菜单
+
 });
 interface tenantList {
   sysName: string,
@@ -76,7 +77,7 @@ const roleInfo = reactive<{
   permsStr: '',//菜单json
   perms: [],//权限标识
 });
-const treekAll = ref(true)//全选
+const treekAll = ref(false)//全选
 const isIndeterminate = ref(true)
 const checkedCities = ref([])//默认选中
 const PageNum = ref<number>(1);//页数
@@ -98,26 +99,27 @@ const handleCheckedCitiesChange = (value: string[]) => {
 const treeDatalevelFun = () => {
   let list: any = [];
   treeData.value.map((val: any) => {
-    list.push(val.title)
+    list.push(val.meta.title)
   })
   treeDatalevelOne.value = list;
-  checkedCities.value = treekAll.value ? treeDatalevelOne.value : []
 }
-
 const dataSetProcessing = () => {
   let menuList: any = [];
   treeData.value.map(value => {
     checkedCities.value.map(val => {
-      if (value.title === val) {
+      if (value.meta.title === val) {
         menuList.push(value)
       }
     })
   })
   roleInfo.perms = menuList;
-  roleInfo.permsStr = JSON.stringify(menuList);
+  if (menuList.length) {
+    roleInfo.permsStr = JSON.stringify(menuList);
+
+  }
 }
 const getMenu = () => {
-  api.tenantApi.getSystemConfig().then((res: any) => {
+  api.tenantApi.getSystemConfig({ systemCode: 'PLATFORM' }).then((res: any) => {
     if (res.code == '200') {
       treeData.value = JSON.parse(res.data.sysConfig)
       treeDatalevelFun();
@@ -141,11 +143,24 @@ async function roleSubmit() {
 }
 //租户列表事件
 async function roleitemClick(item: { sysCode: string }) {
+  getMenu();//获取租户菜单
   roleInfo.systemCode = item.sysCode;
-  api.tenantApi.getSystemPerms({ systemCode: item.sysCode }).then((res: any) => {
+  api.tenantApi.getTenantConfig({ systemCode: item.sysCode }).then((res: any) => {
     if (res.code == '200') {
-      findpage()//租户列表
-      getMenu();//获取租户菜单
+      let list: any = [];
+      if (res.data.sysConfig) {
+        let tree = JSON.parse(res.data.sysConfig);
+        console.log(tree)
+        tree.map((val: any) => {
+          list.push(val.meta.title)
+        })
+        checkedCities.value = list;
+        treekAll.value = true;
+      } else {
+        checkedCities.value = [];
+        treekAll.value = false;
+
+      }
     } else {
     }
   });

src/views/personnel/roleManagement.vue

@@ -99,6 +99,7 @@ onBeforeMount(() => {
   // 对 asyncRoutes 进行预处理并转换为树形结构
   const processedRoutes = preprocessRoutes(asyncRoutes);
   treeData.value = convertToTreeData(0, processedRoutes);
+
 });
 interface roleList {
   id: string,