修改了211和204bug

yz3456

2024-03-20 4ec4b1c59efe9ffbd4812d1ba48378862f82d48c

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

@@ -7,8 +7,9 @@
      ></el-button>
    </el-backtop>
    <h1 style="font-size:21px;padding-top:30px;display: flex;">
      <span>个人简历</span>
      <div class="button-container" >
      <span>个人记事本</span>
      <div class="button-container" ></div>
    <!--  <div class="button-container" >
          <el-button
            size="mini"
            style="background: #E0EEFE;
@@ -36,12 +37,12 @@
            v-print="'#printable-content'"
            v-hasPermi="['family:note:export']"
          >打印</el-button>
      </div>
      </div> -->
      <div   style="display: flex; align-items: center;">
        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
          <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人记事本</span></div>
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人简历</span></div>
        </el-button>
      </div>
    </h1>
@@ -348,7 +349,7 @@

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScopem">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
        <el-button @click="cancelDataPer">取 消</el-button>
      </div>
    </el-dialog>

@@ -940,7 +941,7 @@
      // 弹出层标题
      title: "",

      // open:true,
       open:false,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
      menuExpand: false,
@@ -1160,6 +1161,7 @@
  methods: {
    // 取消按钮
    cancelData() {
   //   alert(23)
      this.dialogVisible.open = false;
      this.dialogVisible.relation1 = false;
      this.dialogVisible.certificate =false;
@@ -1167,6 +1169,7 @@
      this.dialogVisible.autobiography=false;
      this.isEdit1 = false;
      this.reset();
    // alert(32)
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
@@ -1246,7 +1249,7 @@
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listNote(this.queryParams1).then(response => {
          alert(321)
         // alert(321)
          //   console.log(response.data)
          this.noteList = response.data.data;

@@ -1512,6 +1515,7 @@

          addNote(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.getList();
            this.open = false;
            // 清空formDat对象的数据
            Object.keys(this.formDat).forEach(key => {
@@ -1580,7 +1584,13 @@
        saveAs(blob, filename)
      })
    },
   cancelDataPer()
   {
      this.open = false;

      // alert(123)
      // alert(this.open)
   },

    /** 查询自传信息 */
    getAutobiographyInfor()
@@ -1609,11 +1619,13 @@
    //新增主要经历的保存
    submitDataScope: function() {
      let _this = this
      this.$refs["elForm"].validate(valid => {
      this.$refs["elForm1"].validate(valid => {
        if (valid) {
         //alert(1235)
            _this.dialogVisible.open = false;
          addExperience(_this.formDat).then(response => {
            _this.$modal.msgSuccess("新增成功");
            _this.dialogVisible.open = false;

            _this.getList();
          });
        }
@@ -1627,9 +1639,10 @@
    submitDataScope2: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {
                 this.dialogVisible.relation1 = false;
          addRelation(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.relation1 = false;

            this.getList();
          });
        }
@@ -1722,11 +1735,11 @@
    },
    //修改后的保存

   

    //主要经历
    saveRowExperienceList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
     //   if (valid) {
          const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
@@ -1739,15 +1752,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
        //}
     // });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //成员关系
    saveRowRelationList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
      //  if (valid) {
          const foundIndex = this.relationList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.relationList[foundIndex], row);
@@ -1760,15 +1773,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      //  }
    //  });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //证件情况
    saveRowCertificateList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
       // if (valid) {
          const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
@@ -1781,15 +1794,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
     //   }
      //});
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //出国情况
    saveRowAbroadList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
     //   if (valid) {
          const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
@@ -1802,8 +1815,8 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
     //   }
     // });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },