yz3456
2024-08-06 e8cdd22396d68871bed48610530a89063d63bb40
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">
@@ -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 allInfo"
                  :key="item.userId"
                  v-for="(item, index) in allInfo2"
                  :key="index"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
@@ -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: {},
@@ -533,8 +538,36 @@
    },
    // 获取性别
    getSex(){
    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': 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')
        })
      }
      // console.log(sex,'sexsexsex')
    },
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // this.reset();
      // alert(this.pOID)
    },
   hanldeLoop(){
@@ -579,6 +612,8 @@
            //alert(fid)
            _this.$set(_this.form,'fid',_this.orfid);
            this.$modal.msgSuccess("不能选择子孙为父亲!");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
@@ -623,6 +658,8 @@
            //alert(fid)
            _this.$set(_this.form,'mid',_this.ormid);
            this.$modal.msgSuccess("不能选择子孙为母亲!");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
@@ -634,7 +671,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)
@@ -762,6 +799,7 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
@@ -769,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 = "添加用户";
@@ -778,6 +816,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;
@@ -785,11 +827,14 @@
        //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(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)
@@ -800,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)
            {
@@ -862,10 +907,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
@@ -875,20 +920,19 @@
        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)
        console.log(fm,'fmfmfmfmfmfmfmfm')
          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=>{
              //      this.$modal.msgSuccess("修改成功");
                   this.$modal.msgSuccess("修改成功");
              //      this.open = false;
              //      this.getList();
              //      _this.rt = undefined
@@ -898,20 +942,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("普通角色不能拥有家庭号!");