细节处理

src/router/modules/personnel.ts

@@ -5,7 +5,7 @@ const Layout = () => import('@/layouts/index.vue')
 const routes: RouteRecordRaw = {
   path: '/personnel',
   component: Layout,
-  redirect: '/personnel/member',
+  redirect: '/personnel/memberManagement',
   name: 'Personnel',
   meta: {
     title: '成员管理',

src/views/organizationManagement/organization/organizationAdd.vue

@@ -15,7 +15,7 @@
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="名称" prop="sysName">
-              <el-input v-model="sysform.sysName" placeholder="请输入名称" />
+              <el-input v-model="sysform.sysName" placeholder="请输入名称" maxlength="20" show-word-limit />
               <span style="opacity: 0;">x</span>
             </el-form-item>
           </ElCol>
@@ -27,16 +27,18 @@
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="管理员账号" prop="userAccount">
-              <el-input  style="display: none;"  type="password"  />
-              <el-input v-model="sysform.userAccount" placeholder="请输入登录账号"  type="text" name="formerEmployer" autocomplete="new-password"  @blur="userAccountblur" />
+              <el-input style="display: none;" type="password" />
+              <el-input v-model="sysform.userAccount" placeholder="请输入登录账号" maxlength="11" show-word-limit 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  style="display: none;"  type="text"  />
+              <el-input style="display: none;" type="text" />
 
-              <el-input v-model="sysform.password" placeholder="请输入登录密码" show-password type="password"  autocomplete="new-password" />
+              <el-input v-model="sysform.password" placeholder="请输入登录密码" show-password type="password"
+                autocomplete="new-password" />
             </el-form-item>
           </ElCol>
 
@@ -53,7 +55,7 @@
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="sysform.address" placeholder="请输入" />
+              <el-input v-model="sysform.address" placeholder="请输入详细地址" />
             </el-form-item>
           </ElCol>
           <ElCol :md="24" :lg="12">
@@ -76,7 +78,7 @@
               <el-upload action="#" list-type="picture-card" :auto-upload="false" :on-change="sysIconupload"
                 ref="upload1" :limit="1" :class="{ disabled: uploadDisabled }" :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <img v-if="sysIconList.url" :src="sysIconList.url" class="avatar" />
+                <img v-if="sysIconList.url" :src="sysIconList.url" class="avatar" style="width: 100%;height: 100%;" />
                 <el-icon v-else class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
@@ -320,11 +322,11 @@ const detailUpdate = () => {
   });
 }
 const provinceChange = (value: any) => {
-  if ( value && value[0] != null && value[1] != null && value[2] != null) {
+  if (value && value[0] != null && value[1] != null && value[2] != null) {
     sysform.value.provinceId = value[0];
     sysform.value.cityId = value[1];
     sysform.value.districtId = value[2];
-  }else{
+  } else {
     sysform.value.provinceId = "";
     sysform.value.cityId = "";
     sysform.value.districtId = "";

src/views/organizationManagement/organization/organizationDetail.vue

@@ -5,7 +5,7 @@
       <div class="parentContainer flex  a-start" ref="mainElement">
         <div class="flex j-start f-c a-c ContainerLeft" :style="{ height: containerLeftHeight }">
           <div class="row-top flex f-c a-c ">
-            <img :src="tenantInfo.sysIconUrl" alt="">
+            <img :src="tenantInfo.sysIconUrl" alt="租户logo">
             <span class="name">{{ tenantInfo.shortName }}</span>
             <el-tag type="primary" style="margin-bottom: 16px;" v-if="tenantInfo.available == 1">已启用</el-tag>
             <el-tag type="danger" style="margin-bottom: 16px;" v-else>已禁用</el-tag>
@@ -168,7 +168,7 @@ const columns = [
     }
   },
   { prop: "division", label: "所属地区" },
-  { prop: "leaderId", label: "负责人", width: '120', },
+  { prop: "leaderName", label: "负责人", width: '120', },
 
 ];
 const sysTypelist = ref([
@@ -396,6 +396,7 @@ const deptAdd = () => {
       >img {
         width: 84px;
         height: 84px;
+        border-radius: 50%;
       }
 
       .name {

src/views/organizationManagement/organization/organizationlist.vue

@@ -17,7 +17,7 @@
           </ElCol>
           <ElCol :md="8">
             <ElFormItem label="类型">
-              <el-select v-model="formInline.sysType" placeholder="Activity zone" clearable class="el-inputs">
+              <el-select v-model="formInline.sysType" placeholder="选择类型" clearable class="el-inputs">
                 <el-option v-for="(item, index) in sysTypelist" :key="index" :label="item.name" :value="item.id" />
               </el-select>
             </ElFormItem>
@@ -160,7 +160,7 @@ const sysTypelist = ref([
 const formInline = reactive({
   searchValue: '',
   contactValue: '',
-  sysType: 0,
+  sysType: '',
   provinceId: "",
   cityId: "",
   districtId: "",
@@ -200,7 +200,7 @@ function findpage() {
 const columns = [
   { prop: "sysCode", label: "编码", width: '120', },
   {
-    prop: "sysName", label: "租户名称", width: '120', component: "RouterLink",
+    prop: "sysName", label: "租户名称", width: '200', component: "RouterLink",
     formatter: (row: any) => ({ name: 'OrganizationDetail', query: { id: row.id, code: row.sysCode, typeName: 'tenantInfo' } })
   },
   { prop: "sysIconUrl", label: "租户图标", width: '120', component: 'Image' },
@@ -390,7 +390,7 @@ const resetForm = () => {
   formInline.provinceId = '';
   formInline.cityId = '';
   formInline.districtId = '';
-  formInline.sysType = 0;
+  formInline.sysType = '';
 
 }