Merge remote-tracking branch 'origin/master'

zhouwx

2025-01-06 c3bb35b20d6e076f73a1cad50fd6b9b94ca399a7

 src/views/coalMine/cPeopleManage/index.vue

@@ -41,7 +41,7 @@
      <el-table-column label="姓名" align="center" prop="name" />
      <el-table-column label="性别" align="center" prop="sex">
        <template #default="scope">
          {{ scope.row.sex == 0?'男':'女' }}
          {{ scope.row.sex == 0?'男':scope.row.sex == 1?'女':'未知' }}
        </template>
      </el-table-column>
      <el-table-column label="身份证号" align="center" prop="code">
@@ -62,37 +62,39 @@
      </el-table-column>
      <el-table-column label="证件照片" align="center" prop="photoPath">
        <template #default="scope">
          <el-button type="text" @click="viewFile(scope.row.photoAttachment)">预览</el-button>
          <el-button type="text" v-if="scope.row.photoAttachment && scope.row.photoAttachment.fileUrl !==''" @click="viewFile(scope.row.photoAttachment)">预览</el-button>
          <span type="text" v-else>暂无</span>
        </template>
      </el-table-column>
      <el-table-column label="个人履历" align="center">
        <template #default="scope">
          <el-button type="text" @click="openExperience(scope.row)">管理<span v-if="scope.row.cmStaffResumes && scope.row.cmStaffResumes.length>0">({{scope.row.cmStaffResumes.length}})</span></el-button>
        </template>
      </el-table-column>
      <el-table-column label="资格证书" align="center">
        <template #default="scope">
          <el-button type="text" @click="openCert(scope.row)">管理<span v-if="scope.row.cmStaffQas && scope.row.cmStaffQas.length>0">({{scope.row.cmStaffQas.length}})</span></el-button>
        </template>
      </el-table-column>
      <el-table-column label="培训经历" align="center">
        <template #default="scope">
          <el-button type="text" @click="openTrain(scope.row)">管理<span v-if="scope.row.cmStaffTrains && scope.row.cmStaffTrains.length>0">({{scope.row.cmStaffTrains.length}})</span></el-button>
        </template>
      </el-table-column>
      <el-table-column label="考试经历" align="center">
        <template #default="scope">
          <el-button type="text" @click="openExam(scope.row)">管理<span v-if="scope.row.cmStaffExams && scope.row.cmStaffExams.length>0">({{scope.row.cmStaffExams.length}})</span></el-button>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<!--      <el-table-column label="个人履历" align="center">-->
<!--        <template #default="scope">-->
<!--          <el-button type="text" @click="openExperience(scope.row)">管理<span v-if="scope.row.cmStaffResumes && scope.row.cmStaffResumes.length>0">({{scope.row.cmStaffResumes.length}})</span></el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="资格证书" align="center">-->
<!--        <template #default="scope">-->
<!--          <el-button type="text" @click="openCert(scope.row)">管理<span v-if="scope.row.cmStaffQas && scope.row.cmStaffQas.length>0">({{scope.row.cmStaffQas.length}})</span></el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="培训经历" align="center">-->
<!--        <template #default="scope">-->
<!--          <el-button type="text" @click="openTrain(scope.row)">管理<span v-if="scope.row.cmStaffTrains && scope.row.cmStaffTrains.length>0">({{scope.row.cmStaffTrains.length}})</span></el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="考试经历" align="center">-->
<!--        <template #default="scope">-->
<!--          <el-button type="text" @click="openExam(scope.row)">管理<span v-if="scope.row.cmStaffExams && scope.row.cmStaffExams.length>0">({{scope.row.cmStaffExams.length}})</span></el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="操作" align="center" width="400" class-name="small-padding fixed-width">
        <template #default="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="openPeople(scope.row,'edit')">编辑</el-button>
          <el-button size="mini" type="text" icon="el-icon-view" @click="openPeople(scope.row,'view')">查看</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:experts:remove']">删除</el-button>
<!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="openExperience(scope.row)">个人履历</el-button>-->
<!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="openCert(scope.row)">资格证书</el-button>-->
<!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="openTrain(scope.row)">培训经历</el-button>-->
          <el-button size="mini" type="text" style="color: #f56c6c" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:experts:remove']">删除</el-button>
          <el-button size="mini" type="text" @click="openExperience(scope.row)">个人履历</el-button>
          <el-button size="mini" type="text" @click="openCert(scope.row)">资格证书</el-button>
          <el-button size="mini" type="text" @click="openTrain(scope.row)">培训经历</el-button>
          <el-button size="mini" type="text" @click="openExam(scope.row)">考试经历</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -229,7 +231,7 @@
    },
    viewFile(file){
      const t = this
      axios.get(process.env.VUE_APP_BASE_API + file.fileUrl,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob'}).then(res=>{
      axios.get(process.env.VUE_APP_BASE_API + file.fileUrl,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob',timeout: 3000}).then(res=>{
        if (res && res.data) {
          const link = document.createElement('a')
          let blob = new Blob([res.data],{type: res.data.type})