人员管理提交

ele-admin-template/src/api/system/organization/index.js

@@ -1,40 +1,42 @@
 import request from '@/utils/request';
 
+
 /**
- * 分页查询机构
+ * 查询机构列表
  * @param params 查询条件
  */
-export async function pageOrganizations(params) {
-  const res = await request.get('/system/organization/page', {
-    params
-  });
-  if (res.data.code === 0) {
+export async function listOrganizations(params) {
+  const res = await request.get('/main/group/getGroupList', params);
+  if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
 /**
- * 查询机构列表
+ * 查询人员列表
  * @param params 查询条件
  */
-export async function listOrganizations(params) {
-  const res = await request.get('/system/organization', {
-    params
-  });
-  if (res.data.code === 0) {
-    return res.data.data;
+export async function getUserPage(params) {
+  let par = new URLSearchParams(params)
+  const res = await request.get(`/main/user/getUserPage?`+par, {});
+  if (res.data.code == 0) {
+    return {
+      list: res.data.data.records,
+      count: res.data.data.total
+    };
   }
   return Promise.reject(new Error(res.data.message));
 }
 
+
 /**
  * 添加机构
  * @param data 机构信息
  */
 export async function addOrganization(data) {
-  const res = await request.post('/system/organization', data);
-  if (res.data.code === 0) {
+  const res = await request.post('/main/group/save', data);
+  if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
@@ -45,8 +47,8 @@ export async function addOrganization(data) {
  * @param data 机构信息
  */
 export async function updateOrganization(data) {
-  const res = await request.put('/system/organization', data);
-  if (res.data.code === 0) {
+  const res = await request.put('/main/group/update', data);
+  if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
@@ -54,12 +56,18 @@ export async function updateOrganization(data) {
 
 /**
  * 删除机构
- * @param id 机构id
+ * @param params 机构id数组
  */
-export async function removeOrganization(id) {
-  const res = await request.delete('/system/organization/' + id);
-  if (res.data.code === 0) {
+export async function removeOrganization(params) {
+  const res = await request.post('/main/group/delete' , params );
+  if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+
+
+
+

ele-admin-template/src/components/RegionsSelect/index.vue

@@ -17,7 +17,7 @@
   export default {
     name: 'RegionsSelect',
     props: {
-      value: Array,
+      value: [Array,String],
       placeholder: String,
       options: Array,
       valueField: {

ele-admin-template/src/views/system/organization/components/org-edit.vue

@@ -18,54 +18,16 @@
               placeholder="请选择上级机构"
             />
           </el-form-item>
-          <el-form-item label="机构名称:" prop="organizationName">
+        </el-col>
+        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
+          <el-form-item label="机构名称:" prop="name">
             <el-input
               clearable
               :maxlength="20"
-              v-model="form.organizationName"
+              v-model="form.name"
               placeholder="请输入机构名称"
             />
           </el-form-item>
-          <el-form-item label="机构全称:" prop="organizationFullName">
-            <el-input
-              clearable
-              :maxlength="100"
-              v-model="form.organizationFullName"
-              placeholder="请输入机构全称"
-            />
-          </el-form-item>
-          <el-form-item label="机构代码:" prop="organizationCode">
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.organizationCode"
-              placeholder="请输入机构代码"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="机构类型:" prop="organizationType">
-            <org-type-select v-model="form.organizationType" />
-          </el-form-item>
-          <el-form-item label="排序号:" prop="sortNumber">
-            <el-input-number
-              :min="0"
-              :max="99999"
-              v-model="form.sortNumber"
-              controls-position="right"
-              placeholder="请输入排序号"
-              class="ele-fluid ele-text-left"
-            />
-          </el-form-item>
-          <el-form-item label="备注:">
-            <el-input
-              :rows="4"
-              type="textarea"
-              :maxlength="200"
-              v-model="form.comments"
-              placeholder="请输入备注"
-            />
-          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -94,20 +56,16 @@
       // 修改回显的数据
       data: Object,
       // 上级id
-      parentId: Number,
+      parentId: [Number,String],
       // 机构数据
       organizationList: Array
     },
     data() {
       const defaultForm = {
-        organizationId: null,
+        id: null,
         parentId: null,
-        organizationName: '',
-        organizationFullName: '',
-        organizationCode: '',
-        organizationType: null,
-        sortNumber: null,
-        comments: ''
+        name: '',
+        type:1,
       };
       return {
         defaultForm,
@@ -115,41 +73,7 @@
         form: { ...defaultForm },
         // 表单验证规则
         rules: {
-          organizationName: [
-            {
-              required: true,
-              message: '请输入机构名称',
-              trigger: 'blur'
-            }
-          ],
-          organizationFullName: [
-            {
-              required: true,
-              message: '请输入机构全称',
-              trigger: 'blur'
-            }
-          ],
-          organizationCode: [
-            {
-              required: true,
-              message: '请输入机构代码',
-              trigger: 'blur'
-            }
-          ],
-          organizationType: [
-            {
-              required: true,
-              message: '请选择机构类型',
-              trigger: 'blur'
-            }
-          ],
-          sortNumber: [
-            {
-              required: true,
-              message: '请输入排序号',
-              trigger: 'blur'
-            }
-          ]
+          name: [{required: true,message: '请输入机构名称',trigger: 'blur'}]
         },
         // 提交状态
         loading: false,
@@ -175,6 +99,9 @@
             ...this.form,
             parentId: this.form.parentId || 0
           };
+          if(!this.isUpdate){
+            delete data.id
+          }
           const saveOrUpdate = this.isUpdate
             ? updateOrganization
             : addOrganization;
@@ -200,7 +127,13 @@
       visible(visible) {
         if (visible) {
           if (this.data) {
-            this.$util.assignObject(this.form, this.data);
+            this.$util.assignObject(
+               this.form, 
+               {
+                 ...this.data,
+                 parentId: this.data.parentId == 0 ? '' : this.data.parentId ?? ''
+               }
+            );
             this.isUpdate = true;
           } else {
             this.form.parentId = this.parentId;

ele-admin-template/src/views/system/organization/components/org-select.vue

@@ -4,8 +4,8 @@
     clearable
     :value="value || ''"
     :data="data"
-    label-key="organizationName"
-    value-key="organizationId"
+    label-key="name"
+    value-key="id"
     default-expand-all
     :placeholder="placeholder"
     @input="updateValue"
@@ -16,7 +16,7 @@
   export default {
     props: {
       // 选中的数据(v-model)
-      value: Number,
+      value: [Number,String],
       // 提示信息
       placeholder: {
         type: String,

ele-admin-template/src/views/system/organization/components/org-user-edit.vue

@@ -1,7 +1,7 @@
 <!-- 用户编辑弹窗 -->
 <template>
   <ele-modal
-    width="680px"
+    width="800px"
     :visible="visible"
     :close-on-click-modal="true"
     custom-class="ele-dialog-form"
@@ -15,42 +15,95 @@
             <org-select
               :data="organizationList"
               placeholder="请选择所属机构"
-              v-model="form.organizationId"
+              v-model="form.groupId"
             />
           </el-form-item>
-          <el-form-item label="用户账号:" prop="username">
+          <el-form-item label="用户账号:" prop="accountId">
+            <el-select
+              clearable
+              class="ele-block"
+              v-model="form.accountId"
+              placeholder="请选择用户账号"
+            >
+              <el-option
+                v-for="item in accountList"
+                :key="item.id"
+                :label="item.loginName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="性别:" prop="sex">
+            <el-select
+              clearable
+              class="ele-block"
+              v-model="form.sex"
+              placeholder="请选择性别"
+            >
+              <el-option label="男" :value="1" />
+              <el-option label="女" :value="2" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="籍贯:" prop="address">
+             <regions-select style="width: 100%;" v-model="form.address" placeholder="请选择省市区"/>
+          </el-form-item>
+          <el-form-item label="生日:" prop="age">
+            <el-date-picker style="width: 100%;"
+              clearable
+              v-model="form.birthday"
+              type="date"
+              placeholder="请选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="毕业院校:" prop="school">
             <el-input
               clearable
-              :maxlength="20"
-              :disabled="isUpdate"
-              v-model="form.username"
-              placeholder="请输入账号"
+              :maxlength="100"
+              v-model="form.school"
+              placeholder="请输入毕业院校"
             />
           </el-form-item>
-          <el-form-item label="用户名:" prop="nickname">
+          <el-form-item label="微信号:" prop="wxId">
+            <el-input
+              clearable
+              :maxlength="100"
+              v-model="form.wxId"
+              placeholder="请输入微信号"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
+          <el-form-item label="工号:" prop="jobNumber">
+            <el-input
+              clearable
+              :maxlength="100"
+              v-model="form.jobNumber"
+              placeholder="请输入工号"
+            />
+          </el-form-item>
+          <el-form-item label="姓名:" prop="name">
             <el-input
               clearable
               :maxlength="20"
-              v-model="form.nickname"
-              placeholder="请输入用户名"
+              v-model="form.name"
+              placeholder="请输入姓名"
             />
           </el-form-item>
-          <el-form-item label="性别:" prop="sex">
+          <el-form-item label="员工状态:" prop="status">
             <el-select
               clearable
               class="ele-block"
-              v-model="form.sex"
-              placeholder="请选择性别"
+              v-model="form.status"
+              placeholder="请选择员工状态"
             >
-              <el-option label="男" value="1" />
-              <el-option label="女" value="2" />
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="角色:" prop="roleIds">
-            <role-select v-model="form.roleIds" />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
           <el-form-item label="手机号:" prop="phone">
             <el-input
               clearable
@@ -67,23 +120,23 @@
               placeholder="请输入邮箱"
             />
           </el-form-item>
-          <el-form-item v-if="!isUpdate" label="登录密码:" prop="password">
+          <el-form-item label="年龄:" prop="age">
             <el-input
-              show-password
-              :maxlength="20"
-              v-model="form.password"
-              placeholder="请输入登录密码"
+              clearable
+              :maxlength="100"
+              v-model="form.age"
+              placeholder="请输入年龄"
             />
           </el-form-item>
-          <el-form-item label="个人简介:">
+          <el-form-item label="岗位名称:" prop="postName">
             <el-input
-              :rows="4"
-              type="textarea"
-              :maxlength="200"
-              v-model="form.introduction"
-              placeholder="请输入个人简介"
+              clearable
+              :maxlength="100"
+              v-model="form.postName"
+              placeholder="请输入岗位名称"
             />
           </el-form-item>
+
         </el-col>
       </el-row>
     </el-form>
@@ -100,10 +153,11 @@
   import { emailReg, phoneReg } from 'ele-admin';
   import OrgSelect from './org-select.vue';
   import RoleSelect from '@/views/system/user/components/role-select.vue';
+  import RegionsSelect from '@/components/RegionsSelect/index.vue';
   import { addUser, updateUser, checkExistence } from '@/api/system/user';
-
+  import { pageUsers } from '@/api/system/user';
   export default {
-    components: { OrgSelect, RoleSelect },
+    components: { OrgSelect, RoleSelect , RegionsSelect },
     props: {
       // 弹窗是否打开
       visible: Boolean,
@@ -112,20 +166,18 @@
       // 全部机构
       organizationList: Array,
       // 机构id
-      organizationId: Number
+      organizationId: [Number,String]
     },
     data() {
       const defaultForm = {
-        userId: null,
-        organizationId: null,
-        username: '',
-        nickname: '',
+        id: null,
+        groupId: null,
+        name: '',
         sex: null,
-        roleIds: [],
         email: '',
         phone: '',
-        password: '',
-        introduction: ''
+        age:'',
+        accountId:''
       };
       return {
         defaultForm,
@@ -133,72 +185,28 @@
         form: { ...defaultForm },
         // 表单验证规则
         rules: {
-          username: [
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (_rule, value, callback) => {
-                if (!value) {
-                  return callback(new Error('请输入用户账号'));
-                }
-                checkExistence('username', value, this.data?.username)
-                  .then(() => {
-                    callback(new Error('账号已经存在'));
-                  })
-                  .catch(() => {
-                    callback();
-                  });
-              }
-            }
-          ],
-          nickname: [
-            {
-              required: true,
-              message: '请输入用户名',
-              trigger: 'blur'
-            }
-          ],
-          sex: [
-            {
-              required: true,
-              message: '请选择性别',
-              trigger: 'blur'
-            }
-          ],
-          roleIds: [
-            {
-              required: true,
-              message: '请选择角色',
-              trigger: 'blur'
-            }
-          ],
-          email: [
-            {
-              pattern: emailReg,
-              message: '邮箱格式不正确',
-              trigger: 'blur'
-            }
-          ],
-          password: [
-            {
-              required: true,
-              pattern: /^[\S]{5,18}$/,
-              message: '密码必须为5-18位非空白字符',
-              trigger: 'blur'
-            }
-          ],
-          phone: [
-            {
-              pattern: phoneReg,
-              message: '手机号格式不正确',
-              trigger: 'blur'
-            }
-          ]
+          name: [{ required: true, message: '请输入姓名',trigger: 'blur'}],
+          accountId: [{ required: true, message: '请选择用户账号',trigger: 'blur'}],
+          sex: [{required: true, message: '请选择性别',trigger: 'blur'}],
+          email: [ { pattern: emailReg,message: '邮箱格式不正确',trigger: 'blur'}],
+          phone: [ { pattern: phoneReg,message: '手机号格式不正确',trigger: 'blur'}],
+          jobNumber: [{ required: true, message: '请输入工号',trigger: 'blur'}],
+          status:[{ required: true, message: '请选择员工状态',trigger: 'blur'}]
         },
         // 提交状态
         loading: false,
         // 是否是修改
-        isUpdate: false
+        isUpdate: false,
+        city: [],
+        statusOptions:[
+          {value:1,label:'全职'},
+          {value:2,label:'兼职'},
+          {value:3,label:'实习'},
+          {value:4,label:'正式'},
+          {value:5,label:'试用'},
+          {value:6,label:'离职'}
+        ],
+        accountList:[]
       };
     },
     computed: {
@@ -208,6 +216,15 @@
       }
     },
     methods: {
+      getAccountList(){
+        const params = {
+           pageNum:1,
+           size:99999999
+        }
+        pageUsers(params).then(res=>{
+            this.accountList = res.list
+        })
+      },
       /* 保存编辑 */
       save() {
         this.$refs.form.validate((valid) => {
@@ -217,10 +234,9 @@
           this.loading = true;
           const data = {
             ...this.form,
-            roles: this.form.roleIds.map((d) => {
-              return { roleId: d };
-            })
           };
+          console.log('data',data)
+          return
           const saveOrUpdate = this.isUpdate ? updateUser : addUser;
           saveOrUpdate(data)
             .then((msg) => {
@@ -243,15 +259,19 @@
     watch: {
       visible(visible) {
         if (visible) {
+          this.getAccountList()
           if (this.data) {
-            this.$util.assignObject(this.form, {
-              ...this.data,
-              roleIds: this.data.roles.map((d) => d.roleId),
-              password: ''
-            });
+            // this.$util.assignObject(this.form, {
+            //   ...this.data,
+            //   password: ''
+            // });
+            this.form = {...this.data}
+            // this.form.address = ["130000","130300","130304"]
+             this.form.address = "130304"
+            console.log('this.form',this.form)
             this.isUpdate = true;
           } else {
-            this.form.organizationId = this.organizationId;
+            this.form.groupId = this.organizationId;
             this.isUpdate = false;
           }
         } else {

ele-admin-template/src/views/system/organization/components/org-user-list.vue

@@ -37,14 +37,14 @@
         </el-tag>
       </template>
       <!-- 状态列 -->
-      <template v-slot:status="{ row }">
+<!--      <template v-slot:status="{ row }">
         <el-switch
           :active-value="0"
           :inactive-value="1"
           v-model="row.status"
           @change="editStatus(row)"
         />
-      </template>
+      </template> -->
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
         <el-link
@@ -82,13 +82,13 @@
 <script>
   import OrgUserSearch from './org-user-search.vue';
   import OrgUserEdit from './org-user-edit.vue';
-  import { pageUsers, removeUser, updateUserStatus } from '@/api/system/user';
+  import { getUserPage } from '@/api/system/organization';
 
   export default {
     components: { OrgUserSearch, OrgUserEdit },
     props: {
       // 机构id
-      organizationId: Number,
+      organizationId: [Number,String],
       // 全部机构
       organizationList: Array
     },
@@ -105,39 +105,41 @@
             fixed: 'left'
           },
           {
-            prop: 'username',
-            label: '用户账号',
+            prop: 'name',
+            label: '姓名',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'nickname',
-            label: '用户名',
+            prop: 'loginName',
+            label: '用户账号',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'sexName',
+            prop: 'sex',
             label: '性别',
             sortable: 'custom',
             showOverflowTooltip: true,
-            minWidth: 80
+            minWidth: 80,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue==1?'男':(cellValue==2?'女':'');
+            }
           },
           {
-            prop: 'phone',
-            label: '手机号',
+            prop: 'status',
+            label: '状态',
+            align: 'center',
             sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            columnKey: 'roles',
-            label: '角色',
-            showOverflowTooltip: true,
-            minWidth: 110,
-            slot: 'roles'
+            width: 80,
+            formatter: (_row, _column, cellValue) => {
+               	const dom = this.statusOptions.find(item => {
+               		return item.value == cellValue
+               	})
+                return dom?dom.label:'';
+            }
           },
           {
             prop: 'createTime',
@@ -149,15 +151,6 @@
               return this.$util.toDateString(cellValue);
             }
           },
-          {
-            prop: 'status',
-            label: '状态',
-            align: 'center',
-            sortable: 'custom',
-            width: 80,
-            resizable: false,
-            slot: 'status'
-          },
           {
             columnKey: 'action',
             label: '操作',
@@ -171,23 +164,31 @@
         // 当前编辑数据
         current: null,
         // 是否显示编辑弹窗
-        showEdit: false
+        showEdit: false,
+        statusOptions:[
+          {value:1,label:'全职'},
+          {value:2,label:'兼职'},
+          {value:3,label:'实习'},
+          {value:4,label:'正式'},
+          {value:5,label:'试用'},
+          {value:6,label:'离职'}
+        ],
       };
     },
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return pageUsers({
+        return getUserPage({
           ...where,
           ...order,
-          page,
-          limit,
-          organizationId: this.organizationId
+          pageNum:page,
+          size:limit,
+          groupId: this.organizationId
         });
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where: where });
+        this.$refs.table.reload({ pageNum: 1, where: where });
       },
       /* 显示编辑 */
       openEdit(row) {

ele-admin-template/src/views/system/organization/components/org-user-search.vue

@@ -12,7 +12,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.username"
+            v-model="where.loginName"
             placeholder="请输入用户账号"
           />
         </el-form-item>
@@ -22,8 +22,8 @@
           <el-input
             clearable
             size="small"
-            v-model="where.nickname"
-            placeholder="请输入用户名"
+            v-model="where.name"
+            placeholder="请输入姓名"
           />
         </el-form-item>
       </el-col>
@@ -50,8 +50,8 @@
     data() {
       // 默认表单数据
       const defaultWhere = {
-        username: '',
-        nickname: ''
+        loginName: '',
+        name: ''
       };
       return {
         // 表单数据

ele-admin-template/src/views/system/organization/index.vue

@@ -46,8 +46,8 @@
               ref="tree"
               :data="data"
               highlight-current
-              node-key="organizationId"
-              :props="{ label: 'organizationName' }"
+              node-key="id"
+              :props="{ label: 'name' }"
               :expand-on-click-node="false"
               :default-expand-all="true"
               @node-click="onNodeClick"
@@ -58,7 +58,7 @@
           <org-user-list
             v-if="current"
             :organization-list="data"
-            :organization-id="current.organizationId"
+            :organization-id="current.id"
           />
         </template>
       </ele-split-layout>
@@ -113,7 +113,7 @@
             this.loading = false;
             this.data = this.$util.toTreeData({
               data: list,
-              idField: 'organizationId',
+              idField: 'id',
               parentIdField: 'parentId'
             });
             this.$nextTick(() => {
@@ -129,8 +129,8 @@
       onNodeClick(row) {
         if (row) {
           this.current = row;
-          this.parentId = row.organizationId;
-          this.$refs.tree.setCurrentKey(row.organizationId);
+          this.parentId = row.id;
+          this.$refs.tree.setCurrentKey(row.id);
         } else {
           this.current = null;
           this.parentId = null;
@@ -148,7 +148,7 @@
         })
           .then(() => {
             const loading = this.$loading({ lock: true });
-            removeOrganization(this.current.organizationId)
+            removeOrganization([this.current.id])
               .then((msg) => {
                 loading.close();
                 this.$message.success(msg);