Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-06-10 b6929a606c64d1b6063521ed8a183da88463a5e1

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

@@ -2,31 +2,7 @@
  <div class="app-container">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
        <div class="head-container">
          <el-input
            v-model="deptName"
            placeholder="请输入部门名称"
            clearable
            size="small"
            prefix-icon="el-icon-search"
            style="margin-bottom: 20px"
          />
        </div>
        <div class="head-container">
          <el-tree
            :data="deptOptions"
            :props="defaultProps"
            :expand-on-click-node="false"
            :filter-node-method="filterNode"
            ref="tree"
            node-key="id"
            default-expand-all
            highlight-current
            @node-click="handleNodeClick"
          />
        </div>
      </el-col>

      <!--用户数据-->
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -111,7 +87,7 @@
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['system:user:remove']"
            >删除</el-button>
            >停用</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
@@ -141,7 +117,7 @@
          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />

          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
            <template slot-scope="scope">
@@ -178,7 +154,7 @@
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:user:remove']"
              >删除</el-button>
              >停用</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">
@@ -212,35 +188,22 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="归属部门" prop="deptId">
              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
            <el-form-item label="角色" prop="roleIds">
              <el-select v-model="rt" placeholder="请选择角色" @change="getRole">

                <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>
          <el-col :span="12">
            <el-form-item label="手机号码" prop="phonenumber">
              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="12">
            <el-form-item label="用户性别">
@@ -268,31 +231,78 @@
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="岗位">
              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                <el-option
                  v-for="item in postOptions"
                  :key="item.postId"
                  :label="item.postName"
                  :value="item.postId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="角色">
              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                <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 v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>

        <el-col :span="12">
          <el-form-item label="家庭号">
            <el-select v-model="fid"   placeholder="请选择家庭号" @change="handleChange">

  <el-option
      key="-1"
      label="无"
      value="-1"
              ></el-option>
              <el-option
                v-for="item in famiInfo"
                :key="item.id"
                :label="item.name"
                :value="item.id"

              ></el-option>
            </el-select>

          </el-form-item>
        </el-col>

         </el-row>

        <el-row v-if="isshowMar">

          <el-col :span="12">
            <el-form-item label="是否本家" prop="isMyFamily">
              <el-select v-model="form.isMyFamily"   placeholder="请输入是否本家"  @change="handleFamily">


                <el-option
                  key=1
                  label="是"
                  value=1
                ></el-option>
                <el-option
                  key=0
                  label="否"
                  value=0
                ></el-option>
              </el-select>

            </el-form-item>
          </el-col>

        </el-row>
        <el-row v-if="isshowMri">
          <el-col :span="12">
             <el-form-item label="配偶信息" prop="spouseId">
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息">
                <el-option
                  v-for="item in allInfo"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
              </el-select>

             </el-form-item>
           </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
@@ -341,7 +351,10 @@
</template>

<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -354,6 +367,8 @@
    return {
      // 遮罩层
      loading: true,
      //角色保存
      rt: undefined,
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -364,6 +379,8 @@
      showSearch: true,
      // 总条数
      total: 0,
      isshowMri: false,
      isshowMar: false,
      // 用户表格数据
      userList: null,
      // 弹出层标题
@@ -378,12 +395,21 @@
      initPassword: undefined,
      // 日期范围
      dateRange: [],
      //家庭号
      famiInfo:[],
      fid: "无",
      // 岗位选项
      postOptions: [],
      // 角色选项
      roleOptions: [],
      // 表单参数
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      faid: 0,
      maid: 0,
      form: {},
     zinfid: undefined,
      defaultProps: {
        children: "children",
        label: "label"
@@ -431,6 +457,18 @@
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
          { required: true, message: "是否外嫁不能为空", trigger: "blur" }
        ],
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        spouseId: [
          { required: true, message: "配偶信息不能为空", trigger: "blur" }
        ],
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@@ -460,17 +498,69 @@
  },
  created() {
    this.getList();
    this.getFamlilyInfo();
    this.getDeptTree();
    //拿到自己定义的用户信息
   // this.getAllIn();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
    });
  },
  methods: {
    handleChange()
    {
   //   alert(this.fid)
      if(this.fid=="无")
        this.fid = "-1"
      if(this.fid!="-1")
      {
        //查询不是本家的时候，可以选择的配偶信息

       getInfoByFid(this.fid).then(response=>{
         console.log("--------------------")
         console.log(response.data)
         this.allInfo = response.data
       })
        this.isshowMar = true
      }
      else{
        this.isshowMar = false
      }
    },
    handleFamily()
    {

      if(this.form.isMyFamily=="0")
        this.isshowMri = true
    },
    getAllIn(){
      getAllInfo().then(response => {
       // this.allInfo = response.data;
      //  console.log(response.data)
      })
    },
    getRole(){
      this.form.roleIds = []
      this.form.roleIds.push(this.rt)
    },
    getFamlilyInfo(){
      let _this = this
      getAllFamilys().then(response => {
       // console.log(response.data)
      //  alert(response.data[0])
         _this.famiInfo= response.data.filter(function(item){
   return item.name !== "一号家庭";
});


      })
    },
    /** 查询用户列表 */
    getList() {
      this.loading = true;
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          this.userList = response.rows;
          console.log(this.userList,'userList')
          this.total = response.total;
          this.loading = false;
        }
@@ -506,6 +596,9 @@
    // 取消按钮
    cancel() {
      this.open = false;
      this.fid = "无"
      this.isshowMar = false
      this.isshowMri = false
      this.reset();
    },
    // 表单重置
@@ -563,7 +656,10 @@
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        // this.roleOptions = response.roles;
          this.roleOptions= []
        this.roleOptions.push(response.roles[1])
          this.roleOptions.push(response.roles[3])
        this.open = true;
        this.title = "添加用户";
        this.form.password = this.initPassword;
@@ -573,10 +669,30 @@
    handleUpdate(row) {
      this.reset();
      const userId = row.userId || this.ids;

      //  this.fid = response.data.familyId
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data)
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
       // 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)
            if(response.data!=undefined)
            {
              _this.fid = response.data.familyId;
           _this.zinfid = response.data.userId
              }
          }
        );
        this.$set(this.form, "postIds", response.postIds);
        this.$set(this.form, "roleIds", response.roleIds);
        this.open = true;
@@ -606,20 +722,84 @@
    /** 提交按钮 */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addUser(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }

        let ps = true

        if(this.fid=="无")
          this.fid = -1
        let _this = this
        if(this.rt===2 && (this.fid!=-1))
        {
          ps = false

        }
        if(this.rt!=2&&this.fid==-1)
        {
           this.$modal.msgSuccess("家庭成员，必须要拥有家庭号！");
           return
        }
		
        if(ps)
        {
          let fm = {}
          fm.userId = _this.zinfid;
        fm.nickName = this.form.nickName
        fm.roleId =this.rt
        fm.sex = this.form.sex
        fm.status = this.form.status
        fm.familyId = this.fid
		  
        fm.isMyFamily = this.form.isMyFamily
        fm.spouseId = this.form.spouseId
        fm.sysId = this.form.userId
	
          if(_this.fid==="无")
            fm.familyId= -1
          else
            fm.familyId = _this.fid
          this.form.familyId = fm.familyId
        console.log(fm)
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {

 this.open = false;
                   this.getList();
                   _this.rt = undefined
                   _this.fid = "无"
                   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 {
  
              addUser(this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined
                _this.fid = "无"
                this.isshowMar = false
                this.isshowMri = false
              });
            }
            }


        }
        else{
          this.$modal.msgSuccess("普通角色不能拥有家庭号！");
        //  _this.rt = undefined
          _this.fid = "无"
          _this.isshowMar = false
        }
      });
    },
@@ -667,4 +847,4 @@
    }
  }
};
</script>
</script>