From 77fd86ef982d34fd7ed7db8f6033bc9605e9c2bc Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 5 Jun 2025 14:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addAndEditForm.vue | 113 +++++++++++++++++- .../performance-manage/index.vue | 4 +- .../sub-manage/components/addAndEditForm.vue | 8 +- src/views/sub-manage/sub-manage/index.vue | 2 +- .../components/addAndEditForm.vue | 19 ++- .../sub-performance-manage/index.vue | 4 +- 6 files changed, 132 insertions(+), 18 deletions(-) diff --git a/src/views/company-manage/performance-manage/components/addAndEditForm.vue b/src/views/company-manage/performance-manage/components/addAndEditForm.vue index da39ceb..4a22f83 100644 --- a/src/views/company-manage/performance-manage/components/addAndEditForm.vue +++ b/src/views/company-manage/performance-manage/components/addAndEditForm.vue @@ -22,13 +22,22 @@ - + /> --> + + + + @@ -68,7 +77,7 @@ /> - + + + + + + + @@ -92,6 +116,31 @@ /> + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -350,6 +451,7 @@ import { getToken } from '@/utils/auth' import { getKeyPersonListAPI, deleteImgAPI } from '@/api/common' import { addCompanyPerformanceAPI, editCompanyPerformanceAPI } from '@/api/company-manage/performance-manage' export default { + dicts: ['voltage_level'], components: { UploadImg, }, @@ -865,6 +967,7 @@ export default { url: this.fileViewUrl + e.filePath + '?file_token=' + getToken(), } }) + this.addAndEditForm.voltage = newValueObj.dictValue } }, deep: true, diff --git a/src/views/company-manage/performance-manage/index.vue b/src/views/company-manage/performance-manage/index.vue index b20db92..cba86ef 100644 --- a/src/views/company-manage/performance-manage/index.vue +++ b/src/views/company-manage/performance-manage/index.vue @@ -204,7 +204,7 @@ export default { if (type === 2 || type === 3) { const { proName, - voltage, + dictValue, startTime, // 开始时间 endTime, // 结束时间 stopTime, // 竣工日期 @@ -219,7 +219,7 @@ export default { } = row Object.assign(this.editRow, { proName, - voltage, + dictValue, startTime, // 开始时间 endTime, // 结束时间 stopTime, // 竣工日期 diff --git a/src/views/sub-manage/sub-manage/components/addAndEditForm.vue b/src/views/sub-manage/sub-manage/components/addAndEditForm.vue index 4b77068..c9fbd6f 100644 --- a/src/views/sub-manage/sub-manage/components/addAndEditForm.vue +++ b/src/views/sub-manage/sub-manage/components/addAndEditForm.vue @@ -36,12 +36,12 @@ - + @@ -64,11 +64,11 @@ - + /> --> + + + + @@ -200,6 +209,7 @@ import { getToken } from '@/utils/auth' import { getSubListAPI, getSubKeyPersonListAPI, deleteImgAPI } from '@/api/common' import { addSubPerformanceManageAPI, editSubPerformanceManageAPI } from '@/api/sub-manage/sub-performance-manage' export default { + dicts: ['voltage_level'], components: { UploadImg, }, @@ -277,8 +287,8 @@ export default { trigger: 'blur', }, { - pattern: /^([1-9]\d{0,3}(\.\d{1,4})?|0\.[0-9]*[1-9][0-9]*)$/, - message: '请输入正确的金额,金额最多保留4位小数，最大为9999.9999', + pattern: /^([1-9]\d{0,4}(\.\d{1,4})?|0\.[0-9]*[1-9][0-9]*)$/, + message: '请输入正确的金额,金额最多保留4位小数，最大为99999.9999', trigger: 'blur', }, ], @@ -526,6 +536,7 @@ export default { url: this.fileViewUrl + e.filePath + '?file_token=' + getToken(), } }) + this.addAndEditForm.voltage = newValueObj.dictValue } }, deep: true, diff --git a/src/views/sub-manage/sub-performance-manage/index.vue b/src/views/sub-manage/sub-performance-manage/index.vue index 77fb613..ab92e9d 100644 --- a/src/views/sub-manage/sub-performance-manage/index.vue +++ b/src/views/sub-manage/sub-performance-manage/index.vue @@ -205,11 +205,11 @@ export default { consUnit, // 项目建设单位 htRemark, // 合同身份 money, // 分包商合同额 - voltage, // 电压等级 startTime, // 开始时间 endTime, // 结束时间 tbCompanyPerfRelList, tbFileSourceVoList, + dictValue, id, // 主键id } = row Object.assign(this.editRow, { @@ -218,11 +218,11 @@ export default { consUnit, // 项目建设单位 htRemark, // 合同身份 money, // 分包商合同额 - voltage, // 电压等级 startTime, // 开始时间 endTime, // 结束时间 tbCompanyPerfRelList, tbFileSourceVoList, + dictValue, id, // 主键id }) }