修改性别

feige

2024-11-23 2d881714a7b35ec6208946a06243c9db6690aff7

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

@@ -15,7 +15,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
<!--          <el-form-item label="手机号码" prop="phonenumber">
            <el-input
              v-model="queryParams.phonenumber"
              placeholder="请输入手机号码"
@@ -23,7 +23,7 @@
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          </el-form-item> -->
          <el-form-item label="状态" prop="status">
            <el-select
              v-model="queryParams.status"
@@ -87,9 +87,9 @@
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['system:user:remove']"
            >删除</el-button>
            >停用</el-button>
          </el-col>
          <el-col :span="1.5">
    <!--      <el-col :span="1.5">
            <el-button
              type="info"
              plain
@@ -98,7 +98,7 @@
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          </el-col> -->
          <el-col :span="1.5">
            <el-button
              type="warning"
@@ -115,10 +115,14 @@
        <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="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="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户姓名" align="center" key="userName" prop="userName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible" :show-overflow-tooltip="true" >

          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
   <template slot-scope="scope">{{scope.row.sex==0? '男': '女'}}</template>

        </el-table-column>
<!--          <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">
              <el-switch
@@ -154,7 +158,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">
@@ -179,35 +183,27 @@
    </el-row>

    <!-- 添加或修改用户配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <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="nickName">
              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
            <el-form-item label="用户名称" prop="nickName">
              <el-input v-model="form.nickName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="角色" prop="roleIds">
              <el-select v-model="rt" placeholder="请选择角色" @change="getRole">
        <el-col :span="12">
          <el-form-item label="用户姓名" prop="userName">
            <el-input v-model="form.userName" placeholder="请输入用户姓名" maxlength="30" />
          </el-form-item>
        </el-col>

                <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="用户性别">
              <el-select v-model="form.sex" placeholder="请选择性别">
              <el-select v-model="form.sex" placeholder="请选择性别" @change="getSex">
                <el-option
                  v-for="dict in dict.type.sys_user_sex"
                  :key="dict.value"
@@ -230,72 +226,83 @@
          </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-col :span="12">
         <el-form-item label="角色" prop="role">
           <el-select v-model="form.role" 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-col :span="12" v-if="form.role == 102">
        <el-form-item label="是否本家" prop="isMyFamily" >
          <el-select v-model="form.isMyFamily"   placeholder="请输入是否本家"  @change="handleFamily">

      <el-option
        v-for="item in famOptions"
        :key="item.opsi"
        :label="item.opName"
        :value="item.opsi"

      ></el-option>

          </el-select>

        </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-row v-if="form.role != 2 && form.isMyFamily == 1">


    <el-col :span="12">
             <el-form-item label="父亲" prop="fid">
              <el-select v-model="form.fid"   placeholder="请选择父亲"  @change="hanldeLoop">
                <el-option
                  key=1
                  label="是"
                  value=1
                ></el-option>
                <el-option
                  key=0
                  label="否"
                  value=0
                  v-for="item in fathorInfo"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
              </el-select>

            </el-form-item>
          </el-col>
             </el-form-item>
               </el-col>
              <el-col  :span="12">
          <el-form-item label="母亲" prop="mid">
           <el-select v-model="form.mid"   placeholder="请选择母亲" @change="hanldeLoopMon">
             <el-option
               v-for="item in motherInfo"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
             ></el-option>
           </el-select>

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

        <el-row >



        </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-row v-if="form.role == 102  && form.isMyFamily == 0">
          <el-col :span="12" >
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo"
                  :key="item.userId"
                  v-for="(item, index) in allInfo2"
                  :key="index"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
@@ -354,7 +361,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect } from "@/api/system/user";
 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";
@@ -365,6 +372,11 @@
  components: { Treeselect },
  data() {
    return {
      // 修改配偶时的用户id和sex
     originRole: undefined,
      sex:'',
      pOID:'',
      a:undefined,
      // 遮罩层
      loading: true,
      //角色保存
@@ -402,10 +414,15 @@
      postOptions: [],
      // 角色选项
      roleOptions: [],
     famOptions:[{"opsi":1,"opName":"是"},{"opsi":0,"opName":"否"}],
      // 表单参数
     cuid: undefined,
     orfid: undefined,
     ormid: undefined,
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      allInfo2:[],
      faid: 0,
      maid: 0,
      form: {},
@@ -435,6 +452,7 @@
        pageSize: 10,
        userName: undefined,
        phonenumber: undefined,
      clanId: undefined,
        status: undefined,
        deptId: undefined
      },
@@ -457,7 +475,10 @@
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
      roleIds: [
        { required: true, message: "用户角色不能为空", trigger: "blur" }
      ],
        role: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
@@ -466,9 +487,7 @@
        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' }
@@ -501,21 +520,17 @@
    this.getFamlilyInfo();
    this.getDeptTree();
    //拿到自己定义的用户信息
   // this.getAllIn();
    this.getAllIn();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
    });
  },
  methods: {
    handleChange()
    {
   //   alert(this.fid)
    handleChange(){
      if(this.fid=="无")
        this.fid = "-1"
      if(this.fid!="-1")
      {
      if(this.fid!="-1"){
        //查询不是本家的时候，可以选择的配偶信息

       getInfoByFid(this.fid).then(response=>{
         console.log("--------------------")
         console.log(response.data)
@@ -527,19 +542,187 @@
        this.isshowMar = false
      }
    },
    handleFamily()
    {

    handleSpouse(value){

    },
    // 获取性别
    getSex(value){
      if(value != undefined){
        this.sex = value
      }
     //  alert(this.sex)
      const tpfid = this.pOID
     let clanId = this.$store.state.user.clanId
      // 新增a=1,修改a=2
      this.allInfo2 = []
      if(this.a ===1){
        addPO(this.sex, clanId).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
          }
          console.log(this.allInfo2,'新增a=1新增a=1新增a=1')
        })
      }
     // else{
   //      updatePO(tpfid,this.sex).then(response =>{
   //        for(let i in response.data[0]){
   //          this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
   //        }
   //        console.log(this.allInfo2,'修改a=2修改a=2修改a=2')
   //      })
   //    }
      // console.log(sex,'sexsexsex')
    },
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // this.reset();
      // alert(this.pOID)
    },

   hanldeLoop(){
      let fid = this.form.fid
      //alert(fid)
      let _this = this
      if(this.cuid==undefined)
      {
               let jsd = true
         for(var i = 0; i < _this.allInfo.length; i++)
         {
            if(_this.allInfo[i].userId==_this.form.fid)
            {
               //_this.form.mid = _this.allInfo[i].spouseId
               _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
               jsd = false

            }
            if(jsd == true)
                           _this.$set(_this.form,'mid','');
         }
            return;
      }

      //alert(this.cuid)
      let clanId = this.$store.state.user.clanId

      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
         {
            for(var i = 0; i < _this.allInfo.length; i++)
            {
               if(_this.allInfo[i].userId==_this.form.fid)
               {
                  //_this.form.mid = _this.allInfo[i].spouseId
                  _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);

               }
            }
         }else
         {
            //alert(fid)
            _this.$set(_this.form,'fid',_this.orfid);
            this.$modal.msgSuccess("不能选择子孙为父亲！");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
   hanldeLoopMon(){
      //alert(this.cuid)
      let fid = this.form.mid
      let _this = this
      if(this.cuid==undefined)
      {
         let jsd = true
         for(var i = 0; i < _this.allInfo.length; i++)
         {
            if(_this.allInfo[i].userId==_this.form.mid)
            {
               //_this.form.fid = _this.allInfo[i].spouseId
               jsd = false
               _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);

            }
         }
         if(jsd == true)
                        _this.$set(_this.form,'fid','');
      return;
      }
      let clanId = this.$store.state.user.clanId
      // alert(fid)
      // alert(this.cuid)
      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
         {
            for(var i = 0; i < _this.allInfo.length; i++)
            {
               if(_this.allInfo[i].userId==_this.form.mid)
               {
                  //_this.form.fid = _this.allInfo[i].spouseId
                  _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);

               }
            }
         }else
         {
            //alert(fid)
            _this.$set(_this.form,'mid',_this.ormid);
            this.$modal.msgSuccess("不能选择子孙为母亲！");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
    handleFamily(value)
    {
     if(this.form.sex==undefined){
      this.$modal.msgSuccess("请先选择性别！");
      return;
      }
      else{
      let clanId = this.$store.state.user.clanId
          this.allInfo2 = []
         //alert(this.form.sex)
         addPO(this.form.sex, clanId).then(response =>{
           for(let i in response.data[0]){
             this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
           }
           console.log(this.allInfo2,'新增a=1新增a=1新增a=1')
         })
      if(this.form.isMyFamily=="0")
        this.isshowMri = true

      }
    },
    getAllIn(){
      getAllInfo().then(response => {
       // this.allInfo = response.data;
      //  console.log(response.data)
       let clanId = this.$store.state.user.clanId
      getAllInfo(clanId).then(response => {
        console.log(response)
        console.log('-------00000000000000000-----------')
        this.allInfo = response.data;
      this.fathorInfo = []
      this.motherInfo = []
        console.log(response.data,'allInfoallInfoallInfoallInfo')
      for(var i = 0; i < this.allInfo.length; i++)
      {
         //alert(this.allInfo[i].sex == 1)
         if(this.allInfo[i].sex == 0)
            this.fathorInfo.push(this.allInfo[i])
         else
            this.motherInfo.push(this.allInfo[i])
      }
   //   alert(98)
      console.log(this.fathorInfo)
      console.log('----sdfdsfds')

      console.log(this.motherInfo)
      })
    },
    getRole(){
    getRole(value){
      this.form.roleIds = []
      this.form.roleIds.push(this.rt)
    },
@@ -558,8 +741,12 @@
    /** 查询用户列表 */
    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')
          this.total = response.total;
          this.loading = false;
        }
@@ -628,7 +815,7 @@
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
    //  this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // 多选框选中数据
@@ -652,13 +839,16 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
        // this.roleOptions = response.roles;
          this.roleOptions= []
        this.roleOptions.push(response.roles[1])
      //  this.roleOptions.push(response.roles[1])
          this.roleOptions.push(response.roles[3])
        console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
        console.log("0-009888")
        this.open = true;
        this.title = "添加用户";
        this.form.password = this.initPassword;
@@ -666,34 +856,92 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const userId = row.userId || this.ids;
       this.reset();
      this.a = 2
      this.pOID = row.userId
      this.sex = row.sex

      this.getSex();

     this.getAllIn()
    
      const userId = row.userId || this.ids;
     this.cuid= row.userId || this.ids;
    
     let clanId = this.$store.state.user.clanId
         this.allInfo2 = []
        //alert(this.form.sex)
        addPO(this.sex, clanId).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
          }
        })
      //  this.fid = response.data.familyId
        //alert(this.fid)
     let _this = this
      getUser(userId).then(response => {
        console.log(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

        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
        // alert(response.data.roles[0].roleName)
      // console.log(response.data.role)
  //        if(response.data.role!=102)
  //       {
  //         return
  //       }
     getIndividual(userId).then(response => {
           //  alert(123)
         console.log('++++++++-----0000((((((9999))))))')
              console.log(response.data)
            
			
         // console.log('++++++++-----0000((((((9999))))))')
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
            {
              _this.fid = response.data.familyId;

            _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);
            console.log(response.data.spouseId)
            console.log("==============_________________000000000")
            _this.$set(_this.form,'spouseId',response.data.spouseId);
            if(response.data.roleId==3)
            {
               _this.originRole = 102

               _this.$set(_this.form,'role',102);
               }
            else
            {
               _this.originRole = 2
               _this.$set(_this.form,'role',response.data.roleId);
               }
         //  alert(_this.form.fid)
           _this.zinfid = response.data.userId
         //  alert(78)
              }
           else{
              _this.$set(_this.form,'role',2);
           }
          }
        );
        this.$set(this.form, "postIds", response.postIds);
        this.$set(this.form, "roleIds", response.roleIds);

        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
@@ -724,52 +972,51 @@

        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
        }
		
        let _this = this


        if(ps)
        {
          let fm = {}
          fm.userId = _this.zinfid;
        fm.nickName = this.form.nickName
        fm.roleId =this.rt
        // alert(this.form.role)
        fm.roleId = this.form.role
        fm.sex = this.form.sex
        // alert(fm.sex)

        fm.status = this.form.status
        fm.familyId = this.fid
		  
        fm.isMyFamily = this.form.isMyFamily
        if(this.originRole==102 && fm.roleId==2)
        {
        this.originRole = undefined
           this.$modal.msgSuccess("家庭用户不能修改为普通用户");
           return
        }
        fm.fid = this.form.fid
        fm.mid = this.form.mid
        // alert(this.form.fid)
        // alert(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
	
          if(_this.fid==="无")
            fm.familyId= -1
          else
            fm.familyId = _this.fid
          this.form.familyId = fm.familyId
        console.log(fm)
        fm.userName = this.form.userName
        fm.remark = this.form.remark
        fm.clanId = this.$store.state.user.clanId
      // alert(fm.remark)

        console.log(fm,'fmfmfmfmfmfmfmfm')
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {

 this.open = false;
                  this.open = false;
                   this.getList();
                   _this.rt = undefined
                   _this.fid = "无"
                   this.isshowMar = false
                   this.isshowMri = false
                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
              //      this.$modal.msgSuccess("修改成功");
                   this.$modal.msgSuccess("修改成功");
              //      this.open = false;
              //      this.getList();
              //      _this.rt = undefined
@@ -779,25 +1026,22 @@
              //   })
               });
            } else {
  
              addUser(this.form).then(response => {
              addUser(fm).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined
                _this.fid = "无"
                this.isshowMar = false
                this.isshowMri = false
             this.getAllIn()
                // this.isshowMar = false
                // this.isshowMri = false
              });
            }
            }


        }
        else{
          this.$modal.msgSuccess("普通角色不能拥有家庭号！");
        //  _this.rt = undefined
          _this.fid = "无"
         // _this.fid = "无"
          _this.isshowMar = false
        }
      });