修改了一些报错，完善了用户管理配偶的选择模块

yz3456

2024-07-09 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b

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

@@ -297,7 +297,7 @@
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo"
                  v-for="item in allInfo2"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
@@ -357,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect ,updateFM, updatePO} 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";
@@ -546,11 +546,18 @@
      const tpfid = this.pOID
      // 新增a=1,修改a=2
      if(this.a == 1){
        alert('新增a=1')
        addPO(this.sex).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
          }
          console.log(this.allInfo2,'新增a=1新增a=1新增a=1')
        })
      }else{
        updatePO(tpfid,this.sex).then(response =>{
          this.allInfo2 = response.data
          console.log(this.allInfo2,'修改a=2')
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
          }
          console.log(this.allInfo2,'修改a=2修改a=2修改a=2')
        })
      }
      // console.log(sex,'sexsexsex')
@@ -558,6 +565,7 @@
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // alert(this.pOID)
    },

@@ -814,8 +822,8 @@
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data)
      console.log(response.data)
        console.log(response.data,'formformformformform')
      // console.log(response.data)
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
      console.log(this.roleOptions)
@@ -891,10 +899,10 @@
          let fm = {}
          fm.userId = _this.zinfid;
        fm.nickName = this.form.nickName
        alert(this.form.role)
        // alert(this.form.role)
        fm.roleId = this.form.role
        fm.sex = this.form.sex
        alert(fm.sex)
        // alert(fm.sex)
        fm.status = this.form.status
        fm.fid = this.form.fid
        fm.mid = this.form.mid
@@ -904,16 +912,15 @@
        fm.spouseId = this.form.spouseId
        fm.sysId = this.form.userId
        fm.userName = this.form.userName
      fm.remark = this.form.remark
      alert(fm.remark)

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

            this.open = false;
                  this.open = false;
                   this.getList();


                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
@@ -927,20 +934,16 @@
              //   })
               });
            } else {

              addUser(fm).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined

                // this.isshowMar = false
                // this.isshowMri = false
              });
            }
            }


        }
        else{
          this.$modal.msgSuccess("普通角色不能拥有家庭号！");