修改了一些bug

feige

2024-09-03 63b70dbc269b7b9d20a7a88f3dd7c8bb0934d3f4

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

@@ -115,9 +115,13 @@
        <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" >

   <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">
@@ -183,13 +187,13 @@
      <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="userName">
            <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
          <el-form-item label="用户姓名" prop="userName">
            <el-input v-model="form.userName" placeholder="请输入用户姓名" maxlength="30" />
          </el-form-item>
        </el-col>

@@ -369,6 +373,7 @@
  data() {
    return {
      // 修改配偶时的用户id和sex
     originRole: undefined,
      sex:'',
      pOID:'',
      a:undefined,
@@ -543,24 +548,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')
    },
    // 关闭弹窗后
@@ -593,8 +601,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 +647,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,12 +675,33 @@
   },
    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 => {
       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++)
      {
@@ -682,8 +712,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){
@@ -820,19 +852,31 @@
    },
    /** 修改按钮操作 */
    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.data)
        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])
@@ -860,11 +904,20 @@
             _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)
@@ -916,6 +969,11 @@
        fm.sex = this.form.sex
        // alert(fm.sex)
        fm.status = this.form.status
        if(this.originRole==102 && fm.roleId==2)
        {
           this.$modal.msgSuccess("家庭用户不能修改为普通用户");
           return
        }
        fm.fid = this.form.fid
        fm.mid = this.form.mid
   //   alert(this.form.isMyFamily)
@@ -924,7 +982,8 @@
        fm.spouseId = this.form.spouseId
        fm.sysId = this.form.userId
        fm.userName = this.form.userName
      fm.remark = this.form.remark
        fm.remark = this.form.remark
        fm.clanId = this.$store.state.user.clanId
      // alert(fm.remark)

        console.log(fm,'fmfmfmfmfmfmfmfm')
@@ -951,6 +1010,7 @@
                this.open = false;
                this.getList();
                _this.rt = undefined
             this.getAllIn()
                // this.isshowMar = false
                // this.isshowMri = false
              });