修改了多个bug

feige

2024-09-22 80e0b09695493b7f811f746dfb7158244088afe3

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

@@ -89,7 +89,7 @@
              v-hasPermi="['system:user:remove']"
            >停用</el-button>
          </el-col>
          <el-col :span="1.5">
    <!--      <el-col :span="1.5">
            <el-button
              type="info"
              plain
@@ -98,7 +98,7 @@
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          </el-col> -->
          <el-col :span="1.5">
            <el-button
              type="warning"
@@ -373,6 +373,7 @@
  data() {
    return {
      // 修改配偶时的用户id和sex
     originRole: undefined,
      sex:'',
      pOID:'',
      a:undefined,
@@ -580,6 +581,7 @@

   hanldeLoop(){
      let fid = this.form.fid
      alert(fid)
      let _this = this
      if(this.cuid==undefined)
      {
@@ -600,8 +602,8 @@
      }

      //alert(this.cuid)
      let clanId = this.$store.state.user.clanId

      //alert(fid)
      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
@@ -646,8 +648,9 @@
                        _this.$set(_this.form,'fid','');
      return;
      }

      //alert(fid)
      let clanId = this.$store.state.user.clanId
      alert(fid)
      alert(this.cuid)
      updateFM(this.cuid, fid).then(response => {
         //alert(response.data)
         if(!response.data)
@@ -906,9 +909,16 @@
            console.log("==============_________________000000000")
            _this.$set(_this.form,'spouseId',response.data.spouseId);
            if(response.data.roleId==3)
            {
               _this.originRole = 102
					
               _this.$set(_this.form,'role',102);
               }
            else
            {
               _this.originRole = 2
               _this.$set(_this.form,'role',response.data.roleId);
               }
         //  alert(_this.form.fid)
           _this.zinfid = response.data.userId
         //  alert(78)
@@ -960,8 +970,15 @@
        fm.sex = this.form.sex
        // alert(fm.sex)
        fm.status = this.form.status
        if(this.originRole==102 && fm.roleId==2)
        {
           this.$modal.msgSuccess("家庭用户不能修改为普通用户");
           return
        }
        fm.fid = this.form.fid
        fm.mid = this.form.mid
        alert(this.form.fid)
        alert(this.form.mid)
   //   alert(this.form.isMyFamily)
        fm.isMyFamily = this.form.isMyFamily=='1'?1:0