yz3456
2024-08-06 e8cdd22396d68871bed48610530a89063d63bb40
ruoyi-ui/src/views/system/user/index.vue
@@ -297,8 +297,8 @@
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo2"
                  :key="item.userId"
                  v-for="(item, index) in allInfo2"
                  :key="index"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
@@ -548,14 +548,14 @@
      if(this.a == 1){
        addPO(this.sex).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
            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':i})
            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
          }
          console.log(this.allInfo2,'修改a=2修改a=2修改a=2')
        })
@@ -566,6 +566,7 @@
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // this.reset();
      // alert(this.pOID)
    },
@@ -611,6 +612,8 @@
            //alert(fid)
            _this.$set(_this.form,'fid',_this.orfid);
            this.$modal.msgSuccess("不能选择子孙为父亲!");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
@@ -655,6 +658,8 @@
            //alert(fid)
            _this.$set(_this.form,'mid',_this.ormid);
            this.$modal.msgSuccess("不能选择子孙为母亲!");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
@@ -802,7 +807,7 @@
          this.roleOptions= []
        this.roleOptions.push(response.roles[1])
          this.roleOptions.push(response.roles[3])
        console.log(this.roleOptions)
        console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
        console.log("0-009888")
        this.open = true;
        this.title = "添加用户";
@@ -823,10 +828,13 @@
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data,'formformformformform')
      // console.log(response.data)
        console.log(this.form.spouseId,'伴侣id')
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
      console.log(this.roleOptions)
        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)
@@ -837,7 +845,7 @@
     getIndividual(userId).then(response => {
           //  alert(123)
         // console.log('++++++++-----0000((((((9999))))))')
     //          console.log(response.data)
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
            {
@@ -913,9 +921,9 @@
        fm.sysId = this.form.userId
        fm.userName = this.form.userName
      fm.remark = this.form.remark
      alert(fm.remark)
      // alert(fm.remark)
        console.log(fm)
        console.log(fm,'fmfmfmfmfmfmfmfm')
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {
@@ -924,7 +932,7 @@
                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
              //      this.$modal.msgSuccess("修改成功");
                   this.$modal.msgSuccess("修改成功");
              //      this.open = false;
              //      this.getList();
              //      _this.rt = undefined