增加了新的模块

feige

2024-08-21 f81e83fca9cfca4d5149450433d9650b9dd59197

增加了新的模块

 ruoyi-ui/src/api/clanManager/ancestor/index.js

New file
@@ -0,0 +1,138 @@
import request from '@/utils/request'

// 查询所有保洁收纳
export function listAncestor(query) {
  return request({
    url: '/ZfAncestor/all',
    method: 'get',
    params: query
  })
}
export function listClan()
{
    return request({
      url: '/ZfClan/allZfInfo',
      method: 'get',
	  
    })
}
// 根据id查询所有保洁收纳详细信息
export function getCLeanInfo(id) {
  return request({
    url: '/zfClean/' + id,
    method: 'get',

  })
}
//新增信息
export function addAncestor(data) {
    return request({
      url: '/ZfAncestor',
      method: 'post',
      data: data
    })
  }

// 删除资产信息
export function delClean(Ids) {
  return request({
    url: '/zfClean/' + Ids,
    method: 'delete'
  })
}
//修改信息
export function updateClan(data) {
  return request({
    url: '/ZfClan',
    method: 'put',
    data: data
  })
}
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/uploads',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}

//拿到类别
export function getCategory()
{
  return request({
    url: '/zDict/byId',
    method: 'get',
    params: {'id':22}
  })
}


//导入
export function enload(data) {
  return request({
    url: '/zfClean/importData',
    method: 'post',
    data: data
  })
}

// -------------------------------
// 分享
export function share(data) {
  return request({
    url: '/zfCleanShare/share',
    method: 'post',
    data: data
  })
}
// 查看分享给谁了什么数据
export function shareToWho(data,query) {
  return request({
    url: '/zfCleanShare/getInfoByUserId',
    method: 'post',
    data: data,
    params: query
  })
}
// 查看谁分享了数据
export function getWhoShare(query) {
  return request({
    url: '/zfCleanShare/getInfoByShareId',
    method: 'get',
    params: query
  })
}
// 下载分享的数据
export function downShareData(data) {
  return request({
    url: '/zfCleanShare/downloadDate',
    method: 'post',
    data: data
  })
}
// 收回分享数据
export function deleteShareData(data) {
  return request({
    url: '/zfCleanShare/deleteInfoByUserId',
    method: 'post',
    data: data
  })
}
// 展示下载的数据
export function showShareData(query) {
  return request({
    url: '/zfCleanShare/all',
    method: 'get',
    params: query
  })
}

 ruoyi-ui/src/api/clanManager/clan/index.js

New file
@@ -0,0 +1,130 @@
import request from '@/utils/request'

// 查询所有保洁收纳
export function listClan(query) {
  return request({
    url: '/ZfClan/all',
    method: 'get',
    params: query
  })
}
// 根据id查询所有保洁收纳详细信息
export function getCLeanInfo(id) {
  return request({
    url: '/zfClean/' + id,
    method: 'get',

  })
}
//新增信息
export function addClan(data) {
    return request({
      url: '/ZfClan',
      method: 'post',
      data: data
    })
  }

// 删除资产信息
export function delClean(Ids) {
  return request({
    url: '/zfClean/' + Ids,
    method: 'delete'
  })
}
//修改信息
export function updateClan(data) {
  return request({
    url: '/ZfClan',
    method: 'put',
    data: data
  })
}
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/uploads',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}

//拿到类别
export function getCategory()
{
  return request({
    url: '/zDict/byId',
    method: 'get',
    params: {'id':22}
  })
}


//导入
export function enload(data) {
  return request({
    url: '/zfClean/importData',
    method: 'post',
    data: data
  })
}

// -------------------------------
// 分享
export function share(data) {
  return request({
    url: '/zfCleanShare/share',
    method: 'post',
    data: data
  })
}
// 查看分享给谁了什么数据
export function shareToWho(data,query) {
  return request({
    url: '/zfCleanShare/getInfoByUserId',
    method: 'post',
    data: data,
    params: query
  })
}
// 查看谁分享了数据
export function getWhoShare(query) {
  return request({
    url: '/zfCleanShare/getInfoByShareId',
    method: 'get',
    params: query
  })
}
// 下载分享的数据
export function downShareData(data) {
  return request({
    url: '/zfCleanShare/downloadDate',
    method: 'post',
    data: data
  })
}
// 收回分享数据
export function deleteShareData(data) {
  return request({
    url: '/zfCleanShare/deleteInfoByUserId',
    method: 'post',
    data: data
  })
}
// 展示下载的数据
export function showShareData(query) {
  return request({
    url: '/zfCleanShare/all',
    method: 'get',
    params: query
  })
}

 ruoyi-ui/src/router/index.js

@@ -109,6 +109,34 @@
      }
    ]
  },
  {
    path: '/ancestor',
    component: Layout,
    hidden: true,
    redirect: 'noredirect',
    children: [
      {
        path: 'ancestor',
        component: () => import('@/views/clanManager/ancestor/index'),
        name: 'ancestor',
        meta: { title: '祖先管理', icon: 'user' }
      }
    ]
  },
  {
    path: '/clan',
    component: Layout,
    hidden: true,
    redirect: 'noredirect',
    children: [
      {
        path: 'clan',
        component: () => import('@/views/clanManager/clan/index'),
        name: 'clan',
        meta: { title: '家族号管理', icon: 'user' }
      }
    ]
  },
  // {
  //   path: '',
  //   component: Layout,

 ruoyi-ui/src/store/getters.js

@@ -1,6 +1,7 @@
const getters = {
  sidebar: state => state.app.sidebar,
  size: state => state.app.size,
  clanId: state => state.user.clanId,
  device: state => state.app.device,
  dict: state => state.dict.dict,
  visitedViews: state => state.tagsView.visitedViews,

 ruoyi-ui/src/store/modules/user.js

@@ -6,6 +6,7 @@
    token: getToken(),
    name: '',
    avatar: '',
    clanId: '',
    roles: [],
    permissions: []
  },
@@ -25,7 +26,10 @@
    },
    SET_PERMISSIONS: (state, permissions) => {
      state.permissions = permissions
    }
    },
    SET_CLANID: (state, clanId) => {
      state.clanId = clanId
    },
  },

  actions: {
@@ -63,9 +67,14 @@
          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
            commit('SET_ROLES', res.roles)
            commit('SET_PERMISSIONS', res.permissions)
			
		
          } else {
            commit('SET_ROLES', ['ROLE_DEFAULT'])
          }
         // console.log(res)
         // alert(res.user.clanId)
              commit('SET_CLANID', res.user.clanId)
          commit('SET_NAME', user.userName)
          commit('SET_AVATAR', avatar)
          resolve(res)

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

New file
@@ -0,0 +1,749 @@
<template>
  <div class="app-container">
    <el-row :gutter="20">
      <!--部门数据-->

      <!--用户数据-->
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="用户名称" prop="userName">
            <el-input
              v-model="queryParams.userName"
              placeholder="请输入用户名称"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
            <el-input
              v-model="queryParams.phonenumber"
              placeholder="请输入手机号码"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="状态" prop="status">
            <el-select
              v-model="queryParams.status"
              placeholder="用户状态"
              clearable
              style="width: 240px"
            >
              <el-option
                v-for="dict in dict.type.sys_normal_disable"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="dateRange"
              style="width: 240px"
              value-format="yyyy-MM-dd"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>

        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              @click="handleAdd"
              v-hasPermi="['system:user:add']"
            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="success"
              plain
              icon="el-icon-edit"
              size="mini"
              :disabled="single"
              @click="handleUpdate"
              v-hasPermi="['system:user:edit']"
            >修改</el-button>
          </el-col>
        
          <el-col :span="1.5">
            <el-button
              type="info"
              plain
              icon="el-icon-upload2"
              size="mini"
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-download"
              size="mini"
              @click="handleExport"
              v-hasPermi="['system:user:export']"
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
        </el-row>

        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="用户编号" align="center" key="id" prop="id"  />
          <el-table-column label="用户名称" align="center" key="name" prop="name"  :show-overflow-tooltip="true" />
          <el-table-column label="家族号" align="center" key="clanName" prop="clanName"  :show-overflow-tooltip="true" />

          <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" width="120" />
      <el-table-column label="性别" align="center" key="sex" prop="sex"  width="120" >
            <template slot-scope="scope">{{scope.row.sex==0? '女': '男'}}</template>
            
          </el-table-column>
      
          <el-table-column
            label="操作"
            align="center"
            width="160"
            class-name="small-padding fixed-width"
          >
            <template slot-scope="scope" v-if="scope.row.userId !== 1">
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['system:user:edit']"
              >修改</el-button>
              
              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                </el-dropdown-menu>
              </el-dropdown>
            </template>
          </el-table-column>
        </el-table>

        <pagination
          v-show="total>0"
          :total="total"
          :page.sync="queryParams.pageNum"
          :limit.sync="queryParams.pageSize"
          @pagination="getList"
        />
      </el-col>
    </el-row>

    <!-- 添加或修改用户配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body @close="handleClose">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
			
            <el-col :span="12" >
              <el-form-item label="家族名称" prop="clanId">
                <el-select v-model="form.clanId"   placeholder="请输入家族名称">
			
            <el-option
              v-for="item in famOptions"
              :key="item.clanId"
              :label="item.clanName"
              :value="item.clanId"
			
            ></el-option>
			
                </el-select>
			
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="角色" prop="role"  >
                <el-select v-model="form.roleId" placeholder="请选择角色" @change="changeRole">
			
                  <el-option
                    v-for="item in roleOptions"
                    :key="item.roleId"
                    :label="item.roleName"
                    :value="item.roleId"
                    :disabled="item.status == 1"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
			
        </el-row>
        <el-row v-if="!isShowAn">
          <el-col :span="12">
            <el-form-item label="用户名称" prop="name">
              <el-input v-model="form.name" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="用户性别">
        <el-select v-model="form.sex" placeholder="请选择性别">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          ></el-option>
        </el-select>
      </el-form-item>
    </el-col>

        </el-row>
    <el-row v-if="isShowAn">
          <el-col :span="12">
            <el-form-item label="祖先名称" prop="name">
              <el-input v-model="form.name" placeholder="请输入祖先名称" maxlength="30" />
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="用户性别">
        <el-select v-model="form.sex" placeholder="请选择性别">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          ></el-option>
        </el-select>
      </el-form-item>
    </el-col>

        </el-row>
  <el-divider v-if="isShowAn" ></el-divider>
        <el-row v-if="isShowAn">

  <el-col :span="12">
          <el-form-item label="祖先名称" prop="fname">
            <el-input v-model="form.fname" placeholder="请输入祖先名称" maxlength="30" />
          </el-form-item>
        </el-col>
  <el-col :span="12">
    <el-form-item label="祖先性别">
      <el-select v-model="form.fsex" placeholder="请选择性别">
        <el-option
          v-for="dict in dict.type.sys_user_sex"
          :key="dict.value"
          :label="dict.label"
          :value="dict.value"
        ></el-option>
      </el-select>
    </el-form-item>
  </el-col>
  

        </el-row>
  
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>


  </div>
</template>

<script>
import {listAncestor,listClan ,addAncestor} from "@/api/clanManager/ancestor/index"
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect ,updateFM, updatePO, addPO} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

export default {
  name: "User",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
    return {
      // 修改配偶时的用户id和sex
      sex:'',
      pOID:'',
      a:undefined,
      // 遮罩层
      loading: true,
      //角色保存
      rt: undefined,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      isShowAn: false,
      // 总条数
      total: 0,
      isshowMri: false,
      isshowMar: false,
      // 用户表格数据
      userList: null,
      // 弹出层标题
      title: "",
      // 部门树选项
      deptOptions: undefined,
      // 是否显示弹出层
      open: false,
      // 部门名称
      deptName: undefined,
      // 默认密码
      initPassword: undefined,
      // 日期范围
      dateRange: [],
      //家庭号
      famiInfo:[],
      fid: "无",
      // 岗位选项
      postOptions: [],
      // 角色选项
      roleOptions: [
          {"roleId":4,"roleName":"祖先"},{"roleId":2,"roleName":"家族管理员"}
      ],
      famOptions:[],
      // 表单参数
      cuid: undefined,
      orfid: undefined,
      ormid: undefined,
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      allInfo2:[],
      faid: 0,
      maid: 0,
      form: {},
      zinfid: undefined,
      defaultProps: {
        children: "children",
        label: "label"
      },
      // 用户导入参数
      upload: {
        // 是否显示弹出层（用户导入）
        open: false,
        // 弹出层标题（用户导入）
        title: "",
        // 是否禁用上传
        isUploading: false,
        // 是否更新已经存在的用户数据
        updateSupport: 0,
        // 设置上传的请求头部
        headers: { Authorization: "Bearer " + getToken() },
        // 上传的地址
        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
      },
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        name: undefined,
        role: undefined,
        sex: undefined,
  
      },
      // 列信息
   
      // 表单校验
      rules: {
        userName: [
          { required: true, message: "用户名称不能为空", trigger: "blur" },
          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
        ],
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
          { required: true, message: "是否外嫁不能为空", trigger: "blur" }
        ],
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],

        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
        ],
        email: [
          {
            type: "email",
            message: "请输入正确的邮箱地址",
            trigger: ["blur", "change"]
          }
        ],
        phonenumber: [
          {
            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
            message: "请输入正确的手机号码",
            trigger: "blur"
          }
        ]
      }
    };
  },
  watch: {
    // 根据名称筛选部门树
    deptName(val) {
      this.$refs.tree.filter(val);
    }
  },
  created() {
    this.getList();
    this.getFamOptions();
    // this.getFamlilyInfo();
    // this.getDeptTree();
    // //拿到自己定义的用户信息
    // this.getAllIn();
    // this.getConfigKey("sys.user.initPassword").then(response => {
    //   this.initPassword = response.msg;
    // });
  },
  methods: {
    changeRole(){
        let fid = this.form.roleId
        let _this = this
        //管理员
        if(fid==2)
        {
            this.isShowAn = false
        }
        else
        {
            this.isShowAn = true; 
        }
        return;
    },
    getFamOptions()
    {
        listClan().then(response =>{
            console.log(this.famOptions)
            this.famOptions = response.data
        })
    },
    
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // this.reset();
      // alert(this.pOID)
    },



    /** 查询用户列表 */
    getList() {
      this.loading = true;
      //alert(this.queryParams.pageNum)
      listAncestor(this.queryParams).then(response => {
          this.userList = response.data.data;
          console.log(response)
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    /** 查询部门下拉树结构 */
    getDeptTree() {
      deptTreeSelect().then(response => {
        this.deptOptions = response.data;
      });
    },
    // 筛选节点
    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },
    // 节点单击事件
    handleNodeClick(data) {
      this.queryParams.deptId = data.id;
      this.handleQuery();
    },
    // 用户状态修改
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
        return changeUserStatus(row.userId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
  
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
  
        name: undefined,
        fname: undefined,
        fsex: undefined,
        sex: undefined,
        roleId: undefined,
        clanId: undefined
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.userId);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
    },
    // 更多操作触发
    handleCommand(command, row) {
      switch (command) {
        case "handleResetPwd":
          this.handleResetPwd(row);
          break;
        case "handleAuthRole":
          this.handleAuthRole(row);
          break;
        default:
          break;
      }
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
        this.open = true;
    //   getUser().then(response => {
    //     this.postOptions = response.posts;
    //     // this.roleOptions = response.roles;
        
          // console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
          // console.log("0-009888")
    //     this.open = true;
    //     this.title = "添加用户";
    //     this.form.password = this.initPassword;
    //   });
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.a = 2
      this.pOID = row.userId
      this.sex = row.sex
    //  this.getSex();
      this.reset();
      const userId = row.userId || this.ids;
      this.cuid= row.userId || this.ids;
      //  this.fid = response.data.familyId
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data,'formformformformform')
        console.log(this.form.spouseId,'伴侣id')
        this.postOptions = response.posts;
        this.roleOptions= []
        this.roleOptions.push(response.roles[1])
        this.roleOptions.push(response.roles[3])
        // this.roleOptions = response.roles;
        console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
        // this.$set(this.form, "postIds", response.postIds);
        // this.$set(this.form, "roleIds", response.roleIds);
       // alert(response.roleIds.length)
        // if(response.roleIds.length!=0)
        // this.rt = response.roleIds[0]
        let _this = this

     getIndividual(userId).then(response => {
           //  alert(123)
           // console.log('++++++++-----0000((((((9999))))))')
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
            {

                _this.orfid = response.data.fatherId
                _this.ormid = response.data.momId
                //alert(response.data.roleId)

                _this.$set(_this.form,'fid',response.data.fatherId);
                _this.$set(_this.form,'mid',response.data.momId);
                _this.$set(_this.form,'isMyFamily',response.data.isMyFamily);
                _this.$set(_this.form,'spouseId',response.data.spouseId);
                if(response.data.roleId==3)
                    _this.$set(_this.form,'role',102);
                else
                    _this.$set(_this.form,'role',response.data.roleId);
            //  alert(_this.form.fid)
              _this.zinfid = response.data.userId
            //  alert(78)
              }
          }
        );

        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
      });
    },
    /** 重置密码按钮操作 */
    handleResetPwd(row) {
      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        closeOnClickModal: false,
        inputPattern: /^.{5,20}$/,
        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
            this.$modal.msgSuccess("修改成功，新密码是：" + value);
          });
        }).catch(() => {});
    },
    /** 分配角色操作 */
    handleAuthRole: function(row) {
      const userId = row.userId;
      this.$router.push("/system/user-auth/role/" + userId);
    },
    /** 提交按钮 */
    submitForm: function() {
      this.$refs["form"].validate(valid => {

      

        let _this = this
          let fm = {}
          console.log(this.form)
 //          fm.userId = _this.zinfid;
    //       fm.nickName = this.form.nickName
    //       // alert(this.form.role)
    //       fm.roleId = this.form.role
    //       fm.sex = this.form.sex
    //       // alert(fm.sex)
    //       fm.status = this.form.status
    //       fm.fid = this.form.fid
    //       fm.mid = this.form.mid
    // //    alert(this.form.isMyFamily)
    //       fm.isMyFamily = this.form.isMyFamily=='1'?1:0

    //       fm.spouseId = this.form.spouseId
    //       fm.sysId = this.form.userId
    //       fm.userName = this.form.userName
 //      fm.remark = this.form.remark
      // alert(fm.remark)

          console.log(fm,'fmfmfmfmfmfmfmfm')
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {
                  this.open = false;
                   this.getList();
                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
                   this.$modal.msgSuccess("修改成功");
              //      this.open = false;
              //      this.getList();
              //      _this.rt = undefined
              //      _this.fid = "无"
              //      this.isshowMar = false
              //      this.isshowMri = false
              //   })
               });
            } else {
              addAncestor(this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                this.isShowAn = false
               // _this.rt = undefined
                // this.isshowMar = false
                // this.isshowMri = false
              });
            }
            }
        
       
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const userIds = row.userId || this.ids;
      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
        return delUser(userIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('system/user/export', {
        ...this.queryParams
      }, `user_${new Date().getTime()}.xlsx`)
    },
    /** 导入按钮操作 */
    handleImport() {
      this.upload.title = "用户导入";
      this.upload.open = true;
    },
    /** 下载模板操作 */
    importTemplate() {
      this.download('system/user/importTemplate', {
      }, `user_template_${new Date().getTime()}.xlsx`)
    },
    // 文件上传中处理
    handleFileUploadProgress(event, file, fileList) {
      this.upload.isUploading = true;
    },
    // 文件上传成功处理
    handleFileSuccess(response, file, fileList) {
      this.upload.open = false;
      this.upload.isUploading = false;
      this.$refs.upload.clearFiles();
      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
      this.getList();
    },
    // 提交上传文件
    submitFileForm() {
      this.$refs.upload.submit();
    }
  }
};
</script>

 ruoyi-ui/src/views/clanManager/clan/index.vue

New file
@@ -0,0 +1,534 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">

      <el-form-item label="家族号名称" prop="roleKey">
        <el-input
          v-model="queryParams.clanName"
          placeholder="请输入家族号名称"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />

      </el-form-item>


      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:role:add']"
        >新增</el-button>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:role:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
    <el-table-column type="selection" width="55"  align="center" />

    <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
    <el-table-column label="家族号名称" prop="clanName" sortable :show-overflow-tooltip="true" width="150" />

      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
        <template slot-scope="scope"  v-if="scope.row.id !== 1">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>

        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- 添加或修改角色配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form  ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="家族号名称" prop="name">
          <el-input v-model="form.clanName" placeholder="请输入家族号名称" @blur="chongf()"/>
        </el-form-item>

     <!--    <el-form-item label="本家成员"  prop="fid">
           <el-select v-model="form.fid"  :disabled="ts" placeholder="请选择" @change="handleChange">
             <el-option
               v-for="item in fatherInfo"
               :key="item.id"
               :label="item.label"
               :value="item.id"
             ></el-option>
           </el-select> -->

         </el-form-item>




      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 分配角色数据权限对话框 -->

  </div>
</template>

<script>
import {listClan,addClan,updateClan} from "@/api/clanManager/clan/index"
import {listFamily,addFam,findByFname,findInfoByFid,findInfo,updateFam,delFam} from "@/api/system/family"
import { getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { getAllInfo} from "@/api/system/user";
import {getRoot} from "@/api/root/index";

export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      fatherInfo:[],
      motherInfo:[],
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 角色表格数据
      roleList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
      menuExpand: false,
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      ts: false,
      // 日期范围
      dateRange: [],
      // 数据范围选项
      dataScopeOptions: [
        {
          value: "1",
          label: "全部数据权限"
        },
        {
          value: "2",
          label: "自定数据权限"
        },
        {
          value: "3",
          label: "本部门数据权限"
        },
        {
          value: "4",
          label: "本部门及以下数据权限"
        },
        {
          value: "5",
          label: "仅本人数据权限"
        }
      ],
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        clanName: undefined,
      
      },
      personInfos:[],
      personInfos1:[],
      // 表单参数
      form: {
          clanId: undefined,
        clanName: undefined,
      },
      defaultProps: {
        children: "children",
        label: "label"
      },
      // 表单校验
      rules: {
        clanName: [
          { required: true, message: "家族名称不能为空", trigger: "blur" }
        ],
 
      }
    };
  },
  created() {
    this.getList();
    this.getAllUser();
  },
  methods: {
    chongf(){
      //alert(2)
      if(this.form.name!=""){
      findByFname(this.form.name).then(response => {
          console.log(response.data)
       //   alert(response.data!=null)
          if(response.data!=null)
          {
            this.$set(this.form,'name',"")
            this.$modal.msgSuccess("家庭号已经存在！")
          }
         

      });
      }
    },
    handleChange(){
      let _this = this;
     // this.form.mid = "112"
   //  this.$set(this.form, 'mid', 112)

     // alert(this.form.fid)
      let id = Number(this.form.fid)
        findInfoByFid(this.form.fid).then(response => {
          console.log(response.data)
          if(response.data!=null)
          {
            _this.$set(_this.form,'fid',undefined)
            this.$modal.msgSuccess("本成员已经建立家庭号！")
          }
          //alert(this.personInfos[0].url)

      });

    },
    getAllUser(){
      getAllInfo().then(response=>{
        let fams = response.data
        let _this = this;
        console.log(fams)
        for(let i = 0; i < fams.length; i++)
        {
          if(fams[i].isMyFamily==1)
          _this.fatherInfo.push({id:fams[i].userId,label:fams[i].nickName })

          }
      })
    },
    getRowId(row){
      return row.clanId
    },
    /** 查询角色列表 */
    getList() {
      this.loading = true;
     // alert(this.queryParams.pageNum)
      listClan(this.queryParams).then(response => {
          console.log(response)
          this.roleList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    /** 查询菜单树结构 */
    getMenuTreeselect() {
      menuTreeselect().then(response => {
        this.menuOptions = response.data;
      });
    },
    // 所有菜单节点数据
    getMenuAllCheckedKeys() {
      // 目前被选中的菜单节点
      let checkedKeys = this.$refs.menu.getCheckedKeys();
      // 半选中的菜单节点
      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
      return checkedKeys;
    },
    // 所有部门节点数据
    getDeptAllCheckedKeys() {
      // 目前被选中的部门节点
      let checkedKeys = this.$refs.dept.getCheckedKeys();
      // 半选中的部门节点
      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
      return checkedKeys;
    },
    /** 根据角色ID查询菜单树结构 */
    getRoleMenuTreeselect(roleId) {
      return roleMenuTreeselect(roleId).then(response => {
        this.menuOptions = response.menus;
        return response;
      });
    },
    /** 根据角色ID查询部门树结构 */
    getDeptTree(roleId) {
      return deptTreeSelect(roleId).then(response => {
        this.deptOptions = response.depts;
        return response;
      });
    },
    // 角色状态修改
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
        return changeRoleStatus(row.roleId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 取消按钮（数据权限）
    cancelDataScope() {
      this.openDataScope = false;
      this.reset();
    },
    // 表单重置
    reset() {
      if (this.$refs.menu != undefined) {
        this.$refs.menu.setCheckedKeys([]);
      }
      this.menuExpand = false,
      this.menuNodeAll = false,
      this.deptExpand = true,
      this.deptNodeAll = false,
      this.form = {
        id: undefined,
        name: undefined,

        remark: undefined
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    // 更多操作触发
    handleCommand(command, row) {
      switch (command) {
        case "handleDataScope":
          this.handleDataScope(row);
          break;
        case "handleAuthUser":
          this.handleAuthUser(row);
          break;
        default:
          break;
      }
    },
    // 树权限（展开/折叠）
    handleCheckedTreeExpand(value, type) {
      if (type == 'menu') {
        let treeList = this.menuOptions;
        for (let i = 0; i < treeList.length; i++) {
          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
        }
      } else if (type == 'dept') {
        let treeList = this.deptOptions;
        for (let i = 0; i < treeList.length; i++) {
          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
        }
      }
    },
    // 树权限（全选/全不选）
    handleCheckedTreeNodeAll(value, type) {
      if (type == 'menu') {
        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
      } else if (type == 'dept') {
        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
      }
    },
    // 树权限（父子联动）
    handleCheckedTreeConnect(value, type) {
      if (type == 'menu') {
        this.form.menuCheckStrictly = value ? true: false;
      } else if (type == 'dept') {
        this.form.deptCheckStrictly = value ? true: false;
      }
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.ts = false;
     // this.getMenuTreeselect();
      this.open = true;
      this.title = "添加家族号";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {

      this.reset();
     // alert(row.fid)
     // this.ts = true
      //   this.$set(this.form, "fid",  row.fid);
      this.$set(this.form, "clanId",  row.clanId);
      this.$set(this.form, "clanName", row.clanName);
      this.open = true;
      this.title = "修改家族号";

    },
    /** 选择角色权限范围触发 */
    dataScopeSelectChange(value) {
      if(value !== '2') {
        this.$refs.dept.setCheckedKeys([]);
      }
    },
    /** 分配数据权限操作 */
    handleDataScope(row) {
      this.reset();
      const deptTreeSelect = this.getDeptTree(row.roleId);
      getRole(row.roleId).then(response => {
        this.form = response.data;
        this.openDataScope = true;
        this.$nextTick(() => {
          deptTreeSelect.then(res => {
            this.$refs.dept.setCheckedKeys(res.checkedKeys);
          });
        });
        this.title = "分配数据权限";
      });
    },
    /** 分配用户操作 */
    handleAuthUser: function(row) {
      const roleId = row.roleId;
      this.$router.push("/system/role-auth/user/" + roleId);
    },
    /** 提交按钮 */
    submitForm: function() {
      let _this = this
      this.$refs["form"].validate(valid => {
        if (valid) {
        //  alert(this.form.id)
          if (this.form.clanId != undefined) {
          //  alert(this.form.name)
           // this.form.menuIds = this.getMenuAllCheckedKeys();
            updateClan(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
     
              addClan(_this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              });
           // }
            // else
            //   this.$modal.msgSuccess("家庭号已经存在或者本成员已经建立家庭号！")
         //}

        }
        }
      });
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {
      if (this.form.roleId != undefined) {
        this.form.deptIds = this.getDeptAllCheckedKeys();
        dataScope(this.form).then(response => {
          this.$modal.msgSuccess("修改成功");
          this.openDataScope = false;
          this.getList();
        });
      }
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const roleIds = row.id || this.ids;
      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
        return delFam(roleIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('/ZfClan/export', {
        ...this.queryParams
      }, `family_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>

 ruoyi-ui/src/views/system/family/index.vue

@@ -2,9 +2,9 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">

      <el-form-item label="家庭名称" prop="roleKey">
      <el-form-item label="家庭名称" prop="name">
        <el-input
          v-model="queryParams.roleKey"
          v-model="queryParams.name"
          placeholder="请输入权限字符"
          clearable
          style="width: 240px"
@@ -286,6 +286,8 @@
    /** 查询角色列表 */
    getList() {
      this.loading = true;
      let clanId = this.$store.state.user.clanId
      alert(clanId)
      listFamily().then(response => {
          this.roleList = response.data;
         // this.total = response.total;

 ruoyi-ui/src/views/system/user/index.vue

@@ -447,6 +447,7 @@
        pageSize: 10,
        userName: undefined,
        phonenumber: undefined,
        clanId: undefined,
        status: undefined,
        deptId: undefined
      },
@@ -704,6 +705,9 @@
    /** 查询用户列表 */
    getList() {
      this.loading = true;
     // alert(this.state.clanId)
    // alert(this.state.name)
    this.queryParams.clanId = this.$store.state.user.clanId
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          this.userList = response.rows;
          console.log(this.userList,'userList')

 ruoyi-ui/vue.config.js

@@ -30,13 +30,14 @@
  // webpack-dev-server 相关配置
  devServer: {
    host: '0.0.0.0',
    // public: '192.168.1.2:8080', // 此处是自己电脑IP地址！
    port: port,
    open: true,
    proxy: {
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //target: `https://10.39.18.174:8080/`,
     //  target: `https://192.168.1.5:8080/`,
      // target: `https://192.168.1.3:8080/`,
       target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {