新增之后，修改用户

feige

2024-08-31 4f66e0e7c89dfdbc02ecb300feb20de1ca38022e

 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>

@@ -297,8 +301,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>
@@ -447,6 +451,7 @@
        pageSize: 10,
        userName: undefined,
        phonenumber: undefined,
      clanId: undefined,
        status: undefined,
        deptId: undefined
      },
@@ -542,20 +547,22 @@
      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':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 +573,7 @@
    handleClose(){
      this.pOID = ''
      this.allInfo2 = []
      // this.reset();
      // alert(this.pOID)
    },

@@ -611,6 +619,8 @@
            //alert(fid)
            _this.$set(_this.form,'fid',_this.orfid);
            this.$modal.msgSuccess("不能选择子孙为父亲！");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
@@ -655,17 +665,40 @@
            //alert(fid)
            _this.$set(_this.form,'mid',_this.ormid);
            this.$modal.msgSuccess("不能选择子孙为母亲！");
        this.form.fid = undefined
        this.form.mid = undefined
         }
      })
   },
    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++)
      {
@@ -676,8 +709,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){
@@ -699,6 +734,9 @@
    /** 查询用户列表 */
    getList() {
      this.loading = true;
    // alert(this.state.clanId)
   // alert(this.state.name)
   this.queryParams.clanId = this.$store.state.user.clanId
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          this.userList = response.rows;
          console.log(this.userList,'userList')
@@ -802,7 +840,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 +861,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 +878,7 @@
     getIndividual(userId).then(response => {
           //  alert(123)
         // console.log('++++++++-----0000((((((9999))))))')
     //          console.log(response.data)
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
            {

@@ -912,10 +953,11 @@
        fm.spouseId = this.form.spouseId
        fm.sysId = this.form.userId
        fm.userName = this.form.userName
      fm.remark = this.form.remark
      alert(fm.remark)
        fm.remark = this.form.remark
        fm.clanId = this.$store.state.user.clanId
      // alert(fm.remark)

        console.log(fm)
        console.log(fm,'fmfmfmfmfmfmfmfm')
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {
@@ -924,7 +966,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
@@ -939,6 +981,7 @@
                this.open = false;
                this.getList();
                _this.rt = undefined
             this.getAllIn()
                // this.isshowMar = false
                // this.isshowMri = false
              });