修改了对应bug

feige

2024-10-26 46a0fb1d9ab9a48a40a7c8cc9d8917bf271713de

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

@@ -15,7 +15,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
<!--          <el-form-item label="手机号码" prop="phonenumber">
            <el-input
              v-model="queryParams.phonenumber"
              placeholder="请输入手机号码"
@@ -23,7 +23,7 @@
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          </el-form-item> -->
          <el-form-item label="状态" prop="status">
            <el-select
              v-model="queryParams.status"
@@ -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"
@@ -122,7 +122,7 @@
   <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="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">
              <el-switch
@@ -373,6 +373,7 @@
  data() {
    return {
      // 修改配偶时的用户id和sex
     originRole: undefined,
      sex:'',
      pOID:'',
      a:undefined,
@@ -474,7 +475,10 @@
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
      roleIds: [
        { required: true, message: "用户角色不能为空", trigger: "blur" }
      ],
        role: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
@@ -580,6 +584,7 @@

   hanldeLoop(){
      let fid = this.form.fid
      //alert(fid)
      let _this = this
      if(this.cuid==undefined)
      {
@@ -600,8 +605,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 +651,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 +912,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)
@@ -959,9 +972,17 @@
        fm.roleId = this.form.role
        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