From dde32c460d94aff1dd3808ad84ac82bba85b4ff9 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 23 Jan 2026 16:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addProjectCycleDialog.vue | 2 ++ src/views/periodicTesting/projectCycle.vue | 13 ++++++++++--- src/views/periodicTesting/testProject.vue | 5 +++-- src/views/processManagement/platingTypeInfo.vue | 10 +++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/views/periodicTesting/components/addProjectCycleDialog.vue b/src/views/periodicTesting/components/addProjectCycleDialog.vue index 55e8392..f5b9620 100644 --- a/src/views/periodicTesting/components/addProjectCycleDialog.vue +++ b/src/views/periodicTesting/components/addProjectCycleDialog.vue @@ -461,6 +461,8 @@ export default { addMonth() { let value = this.projectForm.monthValue + '日'; if (this.monthTags.find(item => item == value)) return; + if(this.projectForm.monthValue == '' || !this.projectForm.monthValue) return + console.log('this.projectForm.monthValue=========',this.projectForm.monthValue) this.monthTags.push(this.projectForm.monthValue + '日') }, // 添加年份日期 diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue index ab27bb7..36ae8ff 100644 --- a/src/views/periodicTesting/projectCycle.vue +++ b/src/views/periodicTesting/projectCycle.vue @@ -374,6 +374,7 @@ export default { label: '试验周期', prop: 'jobTypes', type: 'select', + hide:true, search: true, sortable: true, filter: true, @@ -530,13 +531,19 @@ export default { }, // 导出 handleExport(){ - this.$confirm('是否导出周期性试验任务数据?', '提示', { + let param = { + ...this.query, + jobType:this.query && this.query.jobTypes && this.query.jobTypes + } + + const { jobTypes, ...validData } = param; + this.$confirm('是否导出试验项目周期数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', }).then(() => { NProgress.start(); - exportExcel(this.query).then(res =>{ + exportExcel(validData).then(res =>{ downloadXls(res.data, `试验周期表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`); NProgress.done(); }) @@ -726,7 +733,7 @@ export default { this.loading = true; let param = { ...this.query, - jobType:this.query.jobTypes + jobType:this.query && this.query.jobTypes && this.query.jobTypes } const { jobTypes, ...validData } = param; diff --git a/src/views/periodicTesting/testProject.vue b/src/views/periodicTesting/testProject.vue index 5cb95ad..5182130 100644 --- a/src/views/periodicTesting/testProject.vue +++ b/src/views/periodicTesting/testProject.vue @@ -118,15 +118,16 @@ export default { dialogWidth: 600, dialogClickModal: false, searchEnter: true, - filterBtn: true, + filterBtn: false, searchShowBtn: false, - excelBtn: true, + excelBtn: false, showOverflowTooltip: true, align: 'center', searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, menuAlign: 'left', + menuWidth:150, gridBtn: false, searchMenuPosition: 'right', column: [ diff --git a/src/views/processManagement/platingTypeInfo.vue b/src/views/processManagement/platingTypeInfo.vue index fec1c84..18b203d 100644 --- a/src/views/processManagement/platingTypeInfo.vue +++ b/src/views/processManagement/platingTypeInfo.vue @@ -159,12 +159,12 @@ export default { prop: "bcId", sortable: true, search: true, - width: 120, + width: 200, type: "select", filterable: true, props: { - label: "code", + label: "name", value: "id", }, dicUrl: "/blade-desk/BA/BasicClazz/listForSelectPlatingAssort", @@ -469,7 +469,7 @@ export default { this.form.flagCycleTest = 0 } if (["edit", "view"].includes(type)) { - + this.form.bcId = this.form.bcId + '' } done(); }, @@ -501,6 +501,10 @@ export default { size:this.page.pageSize, ...this.query }).then(res =>{ + res.data.data.records.map(item =>{ + item.bcId = item.bcId + '' + item.subClass = item.subClass + '' + }) this.data = res.data.data.records this.page.total = res.data.data.total this.loading = false;