Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-18 2402f7902663a20fe1b66f4305abb5ba05d7016f

 src/views/user/archivesEdit.vue

@@ -4218,10 +4218,10 @@
      this.readon = true
    },
    gzupdate1() {
      const empBaseInfoForm = this.empBaseInfoForm
      if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
        this.empBaseInfoForm.imagePath = ''
      }
      // const empBaseInfoForm = this.empBaseInfoForm
      // if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
      //   this.empBaseInfoForm.imagePath = ''
      // }
      this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
        this.$message({
          message: this.$t('tips.updateSuccess'),
@@ -5016,7 +5016,6 @@
      this.remarkInfoForm.version = ''
    },
    dialogIsShow() {
      debugger
      this.workExperienceModal = false
      this.isAdd = true
      this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
@@ -6179,4 +6178,3 @@
  border-color: rgb(64, 158, 255) !important;
}
</style>