From d40290f9a4227ad82f5d15c00844967007a3a6e8 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Mon, 22 Dec 2025 14:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentInput/index.vue | 89 ++++++++++++++++--- src/views/screen/shareScreen/index.vue | 2 +- .../toolsApplication/components/AddCode.vue | 66 ++++++++++++-- .../toolsApplication/components/AddNum.vue | 58 ++++++++++-- 4 files changed, 186 insertions(+), 29 deletions(-) diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue index 9f6f933e..7a66264f 100644 --- a/src/views/EquipmentEntryApply/equipmentInput/index.vue +++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue @@ -27,7 +27,6 @@ - @@ -83,10 +82,22 @@ --> - + - + @@ -349,6 +360,17 @@ + + + 取 消 + + + + + + + + + + + + @@ -735,7 +792,7 @@ export default { // 用于存储上一次的有效值,避免循环验证 lastValidValues: { minOriginalValue: '', - maxOriginalValue: '' + maxOriginalValue: '', }, currentRow: null, uploadType: 1, // 1:装备外观,2:合格证,3:定期检验报告,4:采购发票 @@ -780,6 +837,13 @@ export default { dialogVisible: false, dialogTitle: '', dialogList: [], + openReport: false, + fileDataList: [ + { dictLabel: '装备外观', type: '1' }, + { dictLabel: '合格证', type: '2' }, + { dictLabel: '定期检测报告', type: '3' }, + { dictLabel: '采购发票', type: '4' }, + ], } }, watch: { @@ -1220,31 +1284,36 @@ export default { } this.dialogVisible = true }, + handleFileListUpload(row) { + this.currentRow = row + console.log('🚀 ~ this.currentRow:', this.currentRow) + this.openReport = true + }, // 上传 handleFileUpload(row, type) { this.uploadType = type - this.currentRow = row + // this.currentRow = row if (type == 1) { this.uploadTitle = '装备外观' - this.fileList = row.fileList1 + this.fileList = this.currentRow.fileList1 this.uploadLimit = 6 this.fileSize = 5 this.uploadFileType = ['jpg', 'png', 'jpeg'] } else if (type == 2) { this.uploadTitle = '合格证' - this.fileList = row.fileList2 + this.fileList = this.currentRow.fileList2 this.uploadLimit = 3 this.fileSize = 10 this.uploadFileType = ['jpg', 'png', 'pdf'] } else if (type == 3) { this.uploadTitle = '定期检验报告' - this.fileList = row.fileList3 + this.fileList = this.currentRow.fileList3 this.uploadLimit = 3 this.fileSize = 10 this.uploadFileType = ['jpg', 'png', 'pdf'] } else if (type == 4) { this.uploadTitle = '采购发票' - this.fileList = row.fileList4 + this.fileList = this.currentRow.fileList4 this.uploadLimit = 3 this.fileSize = 10 this.uploadFileType = ['jpg', 'png', 'pdf'] diff --git a/src/views/screen/shareScreen/index.vue b/src/views/screen/shareScreen/index.vue index dc506b84..a369ecff 100644 --- a/src/views/screen/shareScreen/index.vue +++ b/src/views/screen/shareScreen/index.vue @@ -73,7 +73,7 @@ export default { } @font-face { font-family: 'DIN'; - src: url('../../../assets/font-family/DIN/DIN-Medium.otf'); + src: url('../../../assets/font-family/DIN/D-DIN-Bold.ttf'); } .screen-container { width: 100vw; diff --git a/src/views/toolsManage/toolsApplication/components/AddCode.vue b/src/views/toolsManage/toolsApplication/components/AddCode.vue index d1d15bac..f7c58a42 100644 --- a/src/views/toolsManage/toolsApplication/components/AddCode.vue +++ b/src/views/toolsManage/toolsApplication/components/AddCode.vue @@ -132,7 +132,10 @@ maxlength="999" style="width: 120px" /> - + + 报告管理 + + {{ row[column.prop] }} @@ -276,6 +279,40 @@ 取 消 + + + + + + + + + + + + @@ -315,9 +352,16 @@ export default { { label: '出厂日期', prop: 'productionDate', width: 180, required: true }, { label: '资产原值(万元)', prop: 'originCost', width: 150, required: true }, { label: '原始编码', prop: 'identifyCode', width: 150, required: true }, - { label: '合格证', prop: 'certificates', width: 100, required: true }, - { label: '检测证书', prop: 'inspectionReports', width: 100, required: true }, - { label: '采购发票', prop: 'purchaseInvoices', width: 100 }, + { label: '相关配套资料', prop: 'fileList', width: 150, required: true }, + // { label: '合格证', prop: 'certificates', width: 100, required: true }, + // { label: '检测证书', prop: 'inspectionReports', width: 100, required: true }, + // { label: '采购发票', prop: 'purchaseInvoices', width: 100 }, + ], + openReport: false, + fileDataList: [ + { dictLabel: '合格证', type: '2' }, + { dictLabel: '检测证书', type: '3' }, + { dictLabel: '采购发票', type: '4' }, ], dialogList: [], options: [], @@ -549,19 +593,23 @@ export default { } this.viewVisible = true }, + handleFileListUpload(row) { + this.currentRow = row + this.openReport = true + }, // 上传 handleFileUpload(row, type) { this.uploadType = type - this.currentRow = row + // this.currentRow = row if (type == 2) { this.uploadTitle = '合格证' - this.fileList = row.fileList2 + this.fileList = this.currentRow.fileList2 } else if (type == 3) { this.uploadTitle = '定期检验报告' - this.fileList = row.fileList3 + this.fileList = this.currentRow.fileList3 } else if (type == 4) { this.uploadTitle = '采购发票' - this.fileList = row.fileList4 + this.fileList = this.currentRow.fileList4 } this.uploadVisible = true }, diff --git a/src/views/toolsManage/toolsApplication/components/AddNum.vue b/src/views/toolsManage/toolsApplication/components/AddNum.vue index 78e957a4..509fa8a8 100644 --- a/src/views/toolsManage/toolsApplication/components/AddNum.vue +++ b/src/views/toolsManage/toolsApplication/components/AddNum.vue @@ -64,7 +64,10 @@ :controls="false" style="width: 120px" /> - + + 报告管理 + + {{ row[column.prop] }} @@ -137,6 +140,32 @@ 关 闭 + + + + + + + + + + @@ -165,11 +194,18 @@ export default { { label: '计量单位', prop: 'unitName' }, { label: '单价', prop: 'originCost', width: 150 }, { label: '申请数量', prop: 'applyNum', width: 150 }, - { label: '合格证', prop: 'certificates' }, - { label: '检测证书', prop: 'inspectionReports' }, - { label: '采购发票', prop: 'purchaseInvoices' }, + { label: '相关配套资料', prop: 'fileList', width: 150, required: true }, + // { label: '合格证', prop: 'certificates' }, + // { label: '检测证书', prop: 'inspectionReports' }, + // { label: '采购发票', prop: 'purchaseInvoices' }, ], dialogList: [], + openReport: false, + fileDataList: [ + { dictLabel: '合格证', type: '2' }, + { dictLabel: '检测证书', type: '3' }, + { dictLabel: '采购发票', type: '4' }, + ], options: [], activeLabels: [], lastNode: null, @@ -345,19 +381,23 @@ export default { } this.viewVisible = true }, + handleFileListUpload(row) { + this.currentRow = row + this.openReport = true + }, // 上传 handleFileUpload(row, type) { this.uploadType = type - this.currentRow = row + // this.currentRow = row if (type == 2) { this.uploadTitle = '合格证' - this.fileList = row.fileList2 + this.fileList = this.currentRow.fileList2 } else if (type == 3) { this.uploadTitle = '定期检验报告' - this.fileList = row.fileList3 + this.fileList = this.currentRow.fileList3 } else if (type == 4) { this.uploadTitle = '采购发票' - this.fileList = row.fileList4 + this.fileList = this.currentRow.fileList4 } this.uploadVisible = true },