Merge remote-tracking branch 'origin/dev' into dev_test

gaoluyang

2025-04-16 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9

 src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue

@@ -340,7 +340,9 @@
                  @click="annexAdd1('add')">新增</el-button>
              </el-col>
            </el-row>
            <el-table :data="tableData1" border height="200" style="width: 96%;float: right;" v-loading="tableLoading1">
            <el-table :data="tableData1" border height="200" style="width: 96%;float: right;"
                      :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
                      v-loading="tableLoading1">
              <el-table-column label="序号" type="index" width="55px" align="center">
              </el-table-column>
              <el-table-column label="工作经历" prop="workExperience">
@@ -397,7 +399,7 @@
        </el-row>
        <el-row style="margin-top: 15px">
          <el-col :span="16">
            <el-form-item label="级别">
            <el-form-item label="级别" prop="level">
              <el-input v-model="annex.level" clearable size="small"></el-input>
            </el-form-item>
          </el-col>
@@ -414,7 +416,7 @@
        </el-row>
        <el-row style="margin-top: 15px">
          <el-col :span="16">
            <el-form-item label="复印件">
            <el-form-item label="复印件" prop="copy">
              <el-input v-model="annex.copy" clearable size="small"></el-input>
            </el-form-item>
          </el-col>
@@ -422,7 +424,7 @@

        <el-row style="margin-top: 15px">
          <el-col :span="16">
            <el-form-item label="原件">
            <el-form-item label="原件" prop="original">
              <el-input v-model="annex.original" clearable size="small"></el-input>
            </el-form-item>
          </el-col>
@@ -431,6 +433,7 @@
          <el-col :span="16">
            <el-form-item label="文件">
              <el-upload :action="action" :before-upload="beforeAvatarUpload" :headers="uploadHeader"
                         ref="fileName"
                :on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'fileName')"
                :show-file-list="false">
                <span v-if="annex.fileName">{{ annex.fileName }}</span>
@@ -687,6 +690,7 @@
  methods: {
    // 下载档案
    downPerson() {
      console.log('this.clickNodeVal.userId',this.clickNodeVal.userId)
      exportPersonBasicInfoById({ id: this.clickNodeVal.userId }).then(res => {
        const blob = new Blob([res], { type: 'application/msword' });
        this.$download.saveAs(blob, '人员档案.docx');
@@ -878,6 +882,8 @@
          if (res.code == 200) {
            getAnnexByUserId({ userId: this.clickNodeVal.userId }).then(res => {
              this.imageUrl = ''
              this.$refs.fileName.clearFiles()
              this.annex.fileName = ''
              this.resetForm('annex')
              this.annexList = res.data
              this.dialogVisible1 = false
@@ -891,6 +897,8 @@
          if (res.code == 200) {
            getAnnexByUserId({ userId: this.clickNodeVal.userId }).then(res => {
              this.imageUrl = ''
              this.$refs.fileName.clearFiles()
              this.annex.fileName = ''
              this.resetForm('annex')
              this.annexList = res.data
              this.dialogVisible1 = false
@@ -1001,9 +1009,11 @@
      })
    },
    cancellation() {
      this.dialogVisible1 = false
      this.imageUrl = ''
      this.resetForm('annex')
      this.$refs.fileName.clearFiles()
      this.annex.fileName = ''
      this.imageUrl = ''
      this.dialogVisible1 = false
    },
    handleClose(done) {
      this.imageUrl = ''
@@ -1065,11 +1075,6 @@
</script>

<style scoped>
>>>.el-table__body-wrapper::-webkit-scrollbar {
  height: 12px;
  /* 设置滚动条宽度 */
}

>>>.el-form-item {
  margin-bottom: 3px;
}