src/api/cnas/personal/personalTraining.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/CNAS/personnel/personnelInfo/components/Edit.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/CNAS/personnel/personnelInfo/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/cnas/personal/personalTraining.js
@@ -3,7 +3,7 @@ // 查询人员培训 export function personTraining(query) { return request({ url: "/personTraining/personTraining", url: "/personTraining/personTrainingSelect", method: "get", params: query }); src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -222,7 +222,6 @@ }, addUserTableInfo: { name: null, departLimsId: '1', }, multipleSelection: [], userList: [], src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue
@@ -35,6 +35,7 @@ import filePreview from '@/components/Preview/filePreview.vue'; import limsTable from "@/components/Table/lims-table.vue"; import {delTrainingDetailedFileList, getTrainingDetailedFileList} from "@/api/cnas/personal/personalTraining"; import {delCustomById} from "@/api/system/customer"; export default { name: 'ViewRecord', @@ -126,15 +127,21 @@ }, // 删除 delete (row) { this.tableLoading = true delTrainingDetailedFileList({detailedFileId: row.detailedFileId}).then(res => { this.tableLoading = false this.$message.success('删除成功') this.searchTableList() }).catch(err => { this.tableLoading = false console.log('err---', err); }) this.$confirm('是否删除当前数据?', "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => { this.tableLoading = true delTrainingDetailedFileList({detailedFileId: row.detailedFileId}).then(res => { this.tableLoading = false this.$message.success('删除成功') this.searchTableList() }).catch(err => { this.tableLoading = false console.log('err---', err); }) }).catch(() => {}) }, // 上传验证 fileBeforeUpload(file) { @@ -167,7 +174,7 @@ }, computed: { fileAction() { return this.javaApi + '/personTraining/delTrainingDetailedFileList' return this.javaApi + '/personTraining/uploadTrainingDetailedFile' } }, src/views/CNAS/personnel/personnelInfo/index.vue
@@ -57,10 +57,10 @@ @updatePerson="updatePerson"></PersonnelList> <personnelInformation v-if="activeName === '人员基本信息' && !isShowAll" :clickNodeVal="clickNodeVal"></personnelInformation> </el-tab-pane> <!-- <el-tab-pane label="培训计划" name="培训计划">--> <!-- <PersonnelTraining v-if="activeName === '培训计划'" ref="personnelTraining"--> <!-- :departId="departId" :isDepartment="isDepartment"></PersonnelTraining>--> <!-- </el-tab-pane>--> <el-tab-pane label="培训计划" name="培训计划"> <PersonnelTraining v-if="activeName === '培训计划'" ref="personnelTraining" :departId="departId" :isDepartment="isDepartment"></PersonnelTraining> </el-tab-pane> <!-- <el-tab-pane label="岗位职责" name="岗位职责">--> <!-- <job-responsibilities v-if="activeName === '岗位职责'" ref="jobResponsibilities"--> <!-- :departId="departId"--> @@ -274,6 +274,10 @@ height: 14px; /* 设置滚动条宽度 */ } .node_i { color: orange; font-size: 18px; } .custom-tree-node { width: 80%; line-height: 32px; src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
@@ -2,6 +2,9 @@ <template> <div class="flex_column"> <div v-if="!editPlanShow && isDepartment"> <div class="title"> <span style="font-weight: bold">年度计划</span> </div> <div style="display: flex;justify-content: space-between;"> <el-form :model="page" ref="page" size="small" :inline="true"> <el-form-item label="编制人"> @@ -17,11 +20,14 @@ </div> <lims-table :tableData="yearPlanTableData" :column="yearPlanColumn" :currentChange="currentChange" @pagination="pagination" :height="'calc(100vh - 290px)'" @pagination="pagination" height="40vh" :page="page" :tableLoading="yearLoading"></lims-table> </div> <div v-if="!editPlanShow" class="table"> <div v-if="!editPlanShow && isDepartment"> <div> <div class="title"> <span style="font-weight: bold">年度计划明细</span> </div> <div style="display: flex;justify-content: space-between;"> <el-form :model="inDetailForm" ref="inDetailForm" size="small" :inline="true"> <el-form-item label="培训讲师"> @@ -42,10 +48,10 @@ </div> </div> <lims-table :tableData="inDetailPlanTableData" :column="inDetailPlanColumn" :currentChange="currentChange" :height="isDepartment ? '45vh' : '68vh' " :height="isDepartment ? '40vh' : '62vh' " :isSelection="true" :handleSelectionChange="handleSelectionChange" @pagination="pagination1" :page="inDetailPagination" :tableLoading="yearLoading"></lims-table> :page="inDetailPagination" :tableLoading="yearDetailLoading"></lims-table> </div> </div> <Add ref="addPlan" :currentChangeRow="currentChangeRow" @search="getInDetailPlan(currentRowId, departId)"></Add> @@ -167,6 +173,7 @@ trainingDate: '', }, yearLoading: false, yearDetailLoading: false, yearPlanTableData: [], // 年度计划表数据 yearPlanColumn: [ { @@ -292,7 +299,7 @@ name: '批准', type: 'text', disabled: (row) => { if(row.approvalStatus === 1 || this.userId != row.approverId) { if(row.approvalStatus === 1 || this.userId != row.approverId || row.reviewerStatus != 1) { return true; } else { return false; @@ -477,6 +484,7 @@ }, // 查询-年度计划表 getYearPlanList(userId) { this.yearLoading = true const params = this.isDepartment ? { departmentId: userId, @@ -490,13 +498,16 @@ compilerName: this.page.compilerName, } personTraining(params).then(res => { this.yearLoading = false this.yearPlanTableData = res.data.records; this.pagination.total = res.data.total; if (this.yearPlanTableData.length > 0) { this.currentRowId = this.yearPlanTableData[0].id this.currentChange(this.yearPlanTableData[0]) } }); }).catch(err => { this.yearLoading = false }) }, pagination (page) { this.page.size = page.limit @@ -530,10 +541,14 @@ trainingLecturerName: this.inDetailForm.trainingLecturerName, trainingDate: this.inDetailForm.trainingDate, } this.yearDetailLoading = true queryTheAnnualPlanDetailsTable(params).then(res => { this.yearDetailLoading = false this.inDetailPlanTableData = res.data.records; this.inDetailPagination.total = res.data.total; }); }).catch(err => { this.yearDetailLoading = false }) }, pagination1 (page) { this.inDetailPagination.size = page.limit @@ -639,7 +654,7 @@ this.uploadDia = false this.uploading = false if (response.code != 200) { this.$message.error(response.message) this.$message.error(response.msg) return } this.$message.success('上传成功') @@ -761,23 +776,27 @@ overflow: auto; justify-content: space-between; } .pagination { display: flex; justify-content: space-between } .items_center { display: flex; align-items: center; } .date_box { margin: 0 5px; } .search { width: 150px; margin: 0 16px; } .title { position: relative; font-size: 16px; color: #333; font-weight: 400; padding-left: 10px; margin-bottom: 10px; } .title::before { position: absolute; left: 0; top: 4px; content: ''; width: 4px; height: 16px; background-color: #3A7BFA; border-radius: 2px; } </style>