diff --git a/src/api/oem/standardProcedure.js b/src/api/oem/standardProcedure.js new file mode 100644 index 00000000..e2bf2ff2 --- /dev/null +++ b/src/api/oem/standardProcedure.js @@ -0,0 +1,28 @@ +import request from '@/axios'; + +// 获取列表 +export const getList = (params) => { + return request({ + url: '/api/blade-desk/mesOemStandardProcess/page', + method: 'get', + params, + }); +}; + +// 删除 +export const removeItem = params => { + return request({ + url: '/api/blade-desk/mesOemStandardProcess/remove', + method: 'post', + params + }); +}; + +// 提交 +export const saveData = data => { + return request({ + url: '/api/blade-desk/mesOemStandardProcess/submit', + method: 'post', + data + }); +}; \ No newline at end of file diff --git a/src/views/oem/standardProcedure/index.vue b/src/views/oem/standardProcedure/index.vue new file mode 100644 index 00000000..9c2fee0d --- /dev/null +++ b/src/views/oem/standardProcedure/index.vue @@ -0,0 +1,272 @@ + + + + + \ No newline at end of file diff --git a/src/views/oem/standardProcedure/maintainDailog.vue b/src/views/oem/standardProcedure/maintainDailog.vue new file mode 100644 index 00000000..dd0e019c --- /dev/null +++ b/src/views/oem/standardProcedure/maintainDailog.vue @@ -0,0 +1,232 @@ + + + + + \ No newline at end of file diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/components/prefDetail.vue b/src/views/personnelEfficiencyManagement/performanceManagement/components/prefDetail.vue index f12a0238..bed4cf8d 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/components/prefDetail.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/components/prefDetail.vue @@ -70,7 +70,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 18, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, @@ -118,6 +118,8 @@ export default { }, created() { this.openShow = this.showDetail; + this.option.searchMenuSpan = this.type === '2' ? 18 : 12 + console.log('option==============',this.option) if (this.type === '2') { this.query = { yearMonth: this.row.yearMonth || '' }; } @@ -143,11 +145,9 @@ export default { }, currentChange(currentPage) { this.page.currentPage = currentPage; - this.onLoad(); }, sizeChange(pageSize) { this.page.pageSize = pageSize; - this.onLoad(); }, refreshChange() { this.onLoad(); @@ -165,7 +165,7 @@ export default { detailBsEfficiencyTask({ ...query, ...this.query }) .then(res => { if (res.data.code === 200) { - this.data = res.data.data.table.tableDataList || []; + this.data = res.data.data.table.tableData || []; const arr = res.data.data.table.tableColumn; if (this.type === '1') { arr.push({ ...arr[0], prop: arr[0].prop + 'Exact', hide: true, search: true }); diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/components/reportingPerf.vue b/src/views/personnelEfficiencyManagement/performanceManagement/components/reportingPerf.vue index 73fd8eb8..5197fae3 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/components/reportingPerf.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/components/reportingPerf.vue @@ -16,7 +16,7 @@ :upload-error="uploadError" > @@ -33,8 +33,8 @@ @@ -89,6 +89,8 @@ export default { attachId: null, formData: null, isUploading: false, + isDisabled:false, + uploadDisabled:false, }; }, watch: { @@ -104,6 +106,7 @@ export default { setUploadDisabled(disabled) { const uploadColumn = this.excelOption.column.find(item => item.prop === 'excelFile'); console.log('uploadColumn', uploadColumn); + this.uploadDisabled = disabled if (uploadColumn) { // this.$set(uploadColumn, 'disabled', disabled); uploadColumn.disabled = disabled; @@ -176,6 +179,8 @@ export default { this.$message.warning('请先上传文件'); return; } + this.setUploadDisabled(true) + this.isDisabled = true; readExcelBsEfficiencyTask({ file: this.formData }) .then(res => { if (res.data.code === 200) { @@ -183,21 +188,30 @@ export default { this.tableColumn = res.data.data.tableColumn || []; this.isRead = true; this.$message.success(res.data.msg || '文件读取成功'); + this.isDisabled = false; + this.setUploadDisabled(false) } else { this.$message.error(res.data.msg || '读取失败'); + this.isDisabled = false; + this.setUploadDisabled(false) } }) .catch(error => { console.error('读取文件失败:', error); + this.isDisabled = false; + this.setUploadDisabled(false) // this.$message.error('文件读取接口异常'); }); }, submitForm() { + console.log('table----------',this.tableData) + console.log('isRead----------',this.isRead) + console.log('isDetail----------',this.isDetail) if (!this.attachId) { this.$message.error('请先上传文件'); return; } - if (!this.tableData || this.tableData.length === 0) { + if (!this.isDetail && (!this.tableData || this.tableData.length === 0)) { this.$message.error('文件内容为空'); return; } @@ -215,6 +229,7 @@ export default { } else { msg = '确认提交绩效数据?'; } + this.isDisabled = true; this.$confirm(msg, '', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -238,13 +253,16 @@ export default { if (res.data.code === 200) { this.$message.success('提交成功'); this.closeDialog(true); + this.isDisabled = false; } else { this.$message.error('提交失败'); + this.isDisabled = false; } }) .catch(error => { console.error('提交失败:', error); this.$message.error('提交失败,请检查网络或稍后重试'); + this.isDisabled = false; }); }) .catch(() => { diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue index 469d8682..f0892791 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue @@ -563,8 +563,8 @@ export default { onLoad() { this.loading = true; const params = { - pageSize: this.page.pageSize, - currentPage: this.page.currentPage, + size: this.page.pageSize, + current: this.page.currentPage, ...this.query, }; console.log(params); diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue index c0db0178..0d78daf3 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue @@ -258,7 +258,10 @@ export default { yearMonth: `${row.year}-${monthMap[column.property]}`, status: 4, }; - this.showDetail = true; + console.log('row----------',row) + if(row[column.property]){ + this.showDetail = true; + } } }, closeDetail(val) { @@ -267,11 +270,11 @@ export default { // 分页/搜索/刷新 currentChange(currentPage) { this.page.currentPage = currentPage; - this.onLoad(); + // this.onLoad(); }, sizeChange(pageSize) { this.page.pageSize = pageSize; - this.onLoad(); + // this.onLoad(); }, refreshChange() { this.page.currentPage = 1; @@ -307,8 +310,8 @@ export default { this.loading = true; try { const params = { - pageNum: this.page.currentPage, - pageSize: this.page.pageSize, + current: this.page.currentPage, + size: this.page.pageSize, ...this.query, }; const res = await pageBsEfficiencyTaskReport(params);