性别显示已经改好了， 隐私备忘录 新增删除搞好了

feige

2023-08-08 6976afb4d0a45ddb2f565f5c255710462f18d246

性别显示已经改好了，
隐私备忘录  新增删除搞好了

 ruoyi-ui/src/api/marry/index.js

@@ -3,9 +3,9 @@
// 查询数据
export function listMarry(query) {
  return request({
    url: '/zMarry/list',
    url: '/marrySelf',
    method: 'get',
    params: query
  //  params: query
  })
}

@@ -27,8 +27,8 @@
//修改信息
export function updateMarry(data) {
  return request({
    url: '/zMarry',
    method: 'put',
    url: '/marrySelf',
    method: 'post',
    data: data
  })
}

 ruoyi-ui/src/views/marry/index.vue

@@ -703,7 +703,7 @@
      // 遮罩层
      disabled: false,

      loading: true,
      loading: false,
      formData:[],
      // 选中数组
      ids: [],
@@ -924,14 +924,17 @@


    getList() {
      this.loading = true;

      this.loading = false;
      alert(344)
      //个人信息
      listMarry(this.queryParams).then(response => {
          alert(124)
        console.log(response.data)
          if(response.data.length == 0){
            this.loading = false;
            this.marryList=[];

            this.total = 0;
            this.oldSpouseList = [];
          }
          else{
            this.marryList = response.data;
@@ -1194,4 +1197,3 @@
  }
};
</script>


 ruoyi-ui/src/views/secret/index.vue

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

@@ -219,8 +219,9 @@

      listNote(cid, 2031).then(response => {
          this.memoList = response.data;
          console.log(this.memoList)
         // alert(response.data.total)
          this.total = response.data.total;
         // alert(this.total)
          this.loading = false;
        }
      );
@@ -339,10 +340,10 @@
          addNote(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // this.queryParams.cid = cid
            // this.queryParams.fid = fid
            this.getList(fid,cid);

            this.getList(this.formDat.fid,this.formDat.cid);
            resetQuery();

          });
        }
      });
@@ -380,7 +381,7 @@
      }).then(() => {
        // this.getList(fid,cid);
        this.$modal.msgSuccess("删除成功");
        getList(fid,cid);
        this.getList(fid,cid);
      }).catch(() => {});
    },
    /** 导出按钮操作 */

 ruoyi-ui/src/views/secret/secretInfo.vue

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

@@ -58,12 +58,12 @@
<!--                  <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
<!--                  </el-input>-->
                  <template v-if="!isEditing">
                    <el-input v-model="individualList.sex === 1 ? '男':'女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                    <el-input v-model="individualList.sex === 1 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                  </template>
                  <template v-else>
                    <el-select v-model="individualList.sex" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-option label="男" value="1"></el-option>
                      <el-option label="女" value="0"></el-option>
                    <el-select v-model="inds" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-option label="男" value='1'></el-option>
                      <el-option label="女" value='0'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
@@ -99,13 +99,14 @@
                  <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===2" placeholder="离婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input>

                  </template>
                  <template v-else>
                    <el-select v-model="individualList.maritalStatus" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="未婚" value="0"></el-option>
                      <el-option label="已婚" value="1"></el-option>
                      <el-option label="离婚" value="2"></el-option>
                    <el-select v-model="mrs" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="未婚" value='0'></el-option>
                      <el-option label="已婚" value='1'></el-option>
                      <el-option label="离婚" value='2'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
@@ -712,6 +713,10 @@
      componentKey: 0,
      // 选中数组
      ids: [],
      //性别
      inds:undefined,
      //婚姻类别
      mrs:undefined,
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -1224,7 +1229,12 @@
      this.isShow=false
      this.isShow_2=true
      this.isEditing=true
      // this.isEdit=false
      if(this.individualList.maritalStatus == 0)
          this.mrs = '未婚'
      else if(this.individualList.maritalStatus == 1)
          this.mrs = '已婚'
      else
          this.mrs = '离婚'// this.isEdit=false
    },

    /** 查询自传信息 */
@@ -1368,6 +1378,16 @@
    //修改后的保存
    //个人基本信息
    submitForm() {
      if(this.inds=='1')
        this.individualList.sex = 1;
      else
        this.individualList.sex = 0;
      if(this.mrs=='0')
        this.individualList.maritalStatus = 0
      else if(this.mrs == '1')
        this.individualList.maritalStatus = 1
      else
        this.individualList.maritalStatus = 2
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")