修改

feige

2025-04-19 b849886a6e1004c32cee00c2ee4e15f9d848f061

修改

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -181,7 +181,7 @@
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="用户性别">
      <el-form-item label="祖先性别">
        <el-select v-model="form.sex" placeholder="请选择性别">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
@@ -551,7 +551,7 @@
      const userId = row.id || this.ids;
      this.cuid= row.id || this.ids;
      //  this.fid = response.data.familyId
     alert(userId)
    // alert(userId)
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
@@ -597,7 +597,7 @@
        );

        this.open = true;
        this.title = "修改用户";
        this.title = "添加用户";
        this.form.password = "";
      });
    },

 ruoyi-ui/src/views/self/memo.vue

@@ -117,9 +117,9 @@
                <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px">
                  <template v-if="!isEditing" >
                    <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===1" placeholder="初婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="离婚"></el-input>

      <el-input v-if="individualList.maritalStatus===3" placeholder="再婚"></el-input>
                  </template>
                  <template v-else>
                    <el-select v-model="mrs" placeholder="请选择性别" clearable :style="{width: '100%'}">
@@ -1149,9 +1149,11 @@
      if(this.individualList.maritalStatus == 0)
          this.mrs = '未婚'
      else if(this.individualList.maritalStatus == 1)
          this.mrs = '已婚'
      else
          this.mrs = '初婚'
           else if(this.individualList.maritalStatus == 2)
          this.mrs = '离婚'// this.isEdit=false
      else
      this.mrs = '再婚'// this.isEdit=false
    },

 /** 导出按钮操作 */
@@ -1169,10 +1171,12 @@
      
      if(this.mrs=='0'||this.mrs=='未婚')
        this.individualList.maritalStatus = 0
      else if(this.mrs == '1'||this.mrs=='已婚')
      else if(this.mrs == '1'||this.mrs=='初婚')
        this.individualList.maritalStatus = 1
      else
      else if(this.mrs == '2'||this.mrs=='离婚')
        this.individualList.maritalStatus = 2
      else
      this.individualList.maritalStatus = 3
        
        
    //alert(123)