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

yz3456

2024-07-09 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b

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

@@ -179,7 +179,7 @@
    </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">
@@ -199,7 +199,7 @@
        <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"
@@ -292,12 +292,12 @@


        </el-row>
        <el-row v-if="form.role != 2  && form.isMyFamily == 0">
        <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="请选择配偶信息">
              <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} 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";
@@ -368,6 +368,10 @@
  components: { Treeselect },
  data() {
    return {
      // 修改配偶时的用户id和sex
      sex:'',
      pOID:'',
      a:undefined,
      // 遮罩层
      loading: true,
      //角色保存
@@ -413,6 +417,7 @@
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      allInfo2:[],
      faid: 0,
      maid: 0,
      form: {},
@@ -512,15 +517,11 @@
    });
  },
  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)
@@ -531,6 +532,41 @@
      else{
        this.isshowMar = false
      }
    },

    handleSpouse(value){

    },
    // 获取性别
    getSex(value){
      if(value != undefined){
        this.sex = value
      }
      // alert(this.sex)
      const tpfid = this.pOID
      // 新增a=1,修改a=2
      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})
          }
          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})
          }
          console.log(this.allInfo2,'修改a=2修改a=2修改a=2')
        })
      }
      // console.log(sex,'sexsexsex')
    },
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // alert(this.pOID)
    },

   hanldeLoop(){
@@ -630,7 +666,7 @@
    getAllIn(){
      getAllInfo().then(response => {
        this.allInfo = response.data;
        console.log(response.data)
        console.log(response.data,'allInfoallInfoallInfoallInfo')
      for(var i = 0; i < this.allInfo.length; i++)
      {
         //alert(this.allInfo[i].sex == 1)
@@ -758,6 +794,7 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
@@ -774,6 +811,10 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.a = 2
      this.pOID = row.userId
      this.sex = row.sex
      this.getSex();
      this.reset();
      const userId = row.userId || this.ids;
     this.cuid= row.userId || this.ids;
@@ -781,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)
@@ -858,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
@@ -871,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=>{
@@ -894,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("普通角色不能拥有家庭号！");