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"
@@ -89,7 +89,7 @@
              v-hasPermi="['system:user:remove']"
            >停用</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
@@ -369,6 +373,7 @@
  data() {
    return {
      // 修改配偶时的用户id和sex
     originRole: undefined,
      sex:'',
      pOID:'',
      a:undefined,
@@ -470,7 +475,10 @@
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
      roleIds: [
        { required: true, message: "用户角色不能为空", trigger: "blur" }
      ],
        role: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
@@ -543,24 +551,27 @@
      if(value != undefined){
        this.sex = value
      }
      // alert(this.sex)
     //  alert(this.sex)
      const tpfid = this.pOID
     let clanId = this.$store.state.user.clanId
      // 新增a=1,修改a=2
      if(this.a == 1){
        addPO(this.sex).then(response =>{
      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')
        })
      }
     // 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')
    },
    // 关闭弹窗后
@@ -573,6 +584,7 @@
   hanldeLoop(){
      let fid = this.form.fid
      //alert(fid)
      let _this = this
      if(this.cuid==undefined)
      {
@@ -593,8 +605,8 @@
      }
      //alert(this.cuid)
      let clanId = this.$store.state.user.clanId
      //alert(fid)
      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
@@ -639,8 +651,9 @@
                        _this.$set(_this.form,'fid','');
      return;
      }
      //alert(fid)
      let clanId = this.$store.state.user.clanId
      // alert(fid)
      // alert(this.cuid)
      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
@@ -666,8 +679,24 @@
   },
    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(){
       let clanId = this.$store.state.user.clanId
@@ -675,6 +704,8 @@
        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++)
      {
@@ -685,8 +716,10 @@
            this.motherInfo.push(this.allInfo[i])
      }
   //   alert(98)
      //console.log(this.fathorInfo)
      //console.log('----sdfdsfds')
      console.log(this.fathorInfo)
      console.log('----sdfdsfds')
      console.log(this.motherInfo)
      })
    },
    getRole(value){
@@ -782,7 +815,7 @@
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
    //  this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // 多选框选中数据
@@ -812,7 +845,7 @@
        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")
@@ -823,19 +856,35 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
       this.reset();
      this.a = 2
      this.pOID = row.userId
      this.sex = row.sex
      this.getSex();
      this.reset();
     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,'formformformformform')
        console.log(this.form.spouseId,'伴侣id')
      //  console.log(_this.form.spouseId,'伴侣id')
        this.postOptions = response.posts;
        this.roleOptions= []
        this.roleOptions.push(response.roles[1])
@@ -848,9 +897,15 @@
        // 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,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
@@ -863,15 +918,27 @@
             _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);
           }
          }
        );
@@ -918,9 +985,18 @@
        fm.roleId = this.form.role
        fm.sex = this.form.sex
        // alert(fm.sex)
        fm.status = this.form.status
        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
@@ -955,6 +1031,7 @@
                this.open = false;
                this.getList();
                _this.rt = undefined
             this.getAllIn()
                // this.isshowMar = false
                // this.isshowMri = false
              });