修正ts类型

src/views/system/user/addUser.vue

@@ -8,21 +8,27 @@
           <el-form-item label="员工姓名" prop="nickName">
             <el-input v-model.trim="form.nickName" placeholder="请输入员工姓名" />
           </el-form-item>
-          <el-form-item label="登录账号" prop="userName">
+          <el-form-item label="登录账号" v-if="form.userId == undefined" prop="userName">
             <el-input v-model.trim="form.userName" placeholder="请输入登录账号" />
           </el-form-item>
-          <el-form-item label="登录密码" prop="password">
-            <el-input v-model.trim="form.password" placeholder="请输入" />
+          <el-form-item label="登录密码" v-if="form.userId == undefined" prop="password">
+            <el-input type="password" clearable v-model.trim="form.password" placeholder="请输入" />
           </el-form-item>
-          <el-form-item label="员工头像" prop="chargeScope"></el-form-item>
+          <!-- <el-form-item label="员工头像" prop="chargeScope"></el-form-item> -->
           <el-form-item label="员工性别" prop="chargeScope">
             <el-select v-model="form.sex" placeholder="请选择">
               <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="员工角色" prop="roleIds">
-            <el-select v-model="form.roleIds" multiple>
-              <el-option v-for="(item, index) in roleOptions" :key="index" :value="item.roleId" :label="item.roleName"></el-option>
+          <el-form-item label="员工角色" prop="roleIds" v-if="form.userId == null || form.userId != useUserStore().userId">
+            <el-select v-model="form.roleIds">
+              <el-option
+                :disabled="item.status == '1'"
+                v-for="(item, index) in roleOptions"
+                :key="index"
+                :value="item.roleId"
+                :label="item.roleName"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="管理小区" prop="checkvillage">
@@ -57,6 +63,7 @@ import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getCommunitylistAPI } from '@/api/system/community';
 import { validator } from '@/utils/Reg';
+import { useUserStore } from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -79,7 +86,7 @@ const form = ref({
   'sex': '', // 0男 1女 2未知
   'status': '0', // （0正常 1停用）
   'password': '', // 密码
-  'roleIds': [], // 角色组
+  'roleIds': '', // 角色组
   'remark': ''
 });
 const rules = ref({
@@ -124,7 +131,7 @@ async function init() {
         'phonenumber': res.data.user.phonenumber, // 手机号码
         'sex': res.data.user.sex, // 0男 1女 2未知
         'password': '', // 密码
-        'roleIds': res.data.roleIds ?? [], // 角色组
+        'roleIds': res.data.roleIds[0], // 角色组
         'remark': ''
       };
       roleOptions.value = [];
@@ -157,15 +164,19 @@ function handleChangeVillage(value: string[]) {
 
 // !== 提交 =============================================================================
 const submitForm = () => {
+  const obj = {
+    ...form.value,
+    'roleIds': [form.value.roleIds]
+  };
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       if (userid.value) {
-        api.updateUser(form.value).then(() => {
+        api.updateUser(obj).then(() => {
           ElMessage.success('编辑成功');
           cancelForm();
         });
       } else {
-        api.addUser(form.value).then(() => {
+        api.addUser(obj).then(() => {
           ElMessage.success('添加成功');
           cancelForm();
         });

src/views/system/user/authRole.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="p-2">
+  <div class="p-2 h-full flex flex-col">
+    <pageheader> </pageheader>
     <div class="panel">
       <h4 class="panel-title">基本信息</h4>
       <el-form :model="form" :inline="true">
@@ -17,9 +18,9 @@
         </el-row>
       </el-form>
     </div>
-    <div class="panel">
+    <div class="panel flex-1 flex flex-col">
       <h4 class="panel-title">角色信息</h4>
-      <div>
+      <div class="flex-1">
         <el-table
           ref="tableRef"
           v-loading="loading"
@@ -49,7 +50,6 @@
           <el-button type="primary" @click="submitForm()">提交</el-button>
           <el-button @click="close()">返回</el-button>
         </div>
-        <div></div>
       </div>
     </div>
   </div>
@@ -144,3 +144,11 @@ onMounted(() => {
   getList();
 });
 </script>
+<style scoped lang="scss">
+.panel {
+  margin-top: 20px;
+  .el-table {
+    height: calc(100% - 160px);
+  }
+}
+</style>

src/views/system/user/index.vue

@@ -60,10 +60,11 @@
               </template>
             </el-dropdown>
           </el-col> -->
-          <right-toolbar more-title="更多" v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="getList">
+
+          <right-toolbar :show-add="checkPermi(['system:user:add'])" @update:add="handleAdd" more-title="更多" :columns="columns">
             <template #dropdown>
-              <el-dropdown-item @click="handleUpdate()">修改</el-dropdown-item>
-              <el-dropdown-item @click="handleDelete()">删除</el-dropdown-item>
+              <el-dropdown-item v-if="checkPermi(['system:user:edit'])" :disabled="single" @click="handleUpdate()">修改</el-dropdown-item>
+              <el-dropdown-item v-if="checkPermi(['system:user:remove'])" :disabled="multiple" @click="handleDelete()">删除</el-dropdown-item>
               <el-dropdown-item @click="importTemplate">下载模板</el-dropdown-item>
               <!-- 注意 由于el-dropdown-item标签是延迟加载的 所以v-has-permi自定义标签不生效 需要使用v-if调用方法执行 -->
               <el-dropdown-item v-if="checkPermi(['system:user:import'])" @click="handleImport">导入数据</el-dropdown-item>
@@ -454,7 +455,7 @@ const handleResetPwd = async (row: UserVO) => {
   );
   if (!err && res) {
     await api.resetUserPwd(row.userId, res.value);
-    proxy?.$modal.msgSuccess('修改成功，新密码是：' + res.value);
+    proxy?.$modal.msgSuccess('修改成功');
   }
 };