From 2bec7856171e50070d4a90cc92e02ab8b85b0a53 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 6 Jun 2025 10:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/addAndEditForm.vue | 97 +++++++++++++++----
.../performance-manage/index.vue | 14 +++
.../components/addAndEditForm.vue | 4 +-
3 files changed, 96 insertions(+), 19 deletions(-)
diff --git a/src/views/company-manage/performance-manage/components/addAndEditForm.vue b/src/views/company-manage/performance-manage/components/addAndEditForm.vue
index 4a22f83..d9eeea0 100644
--- a/src/views/company-manage/performance-manage/components/addAndEditForm.vue
+++ b/src/views/company-manage/performance-manage/components/addAndEditForm.vue
@@ -99,7 +99,7 @@
maxlength="20"
show-word-limit
placeholder="请输入合同金额"
- v-model="addAndEditForm.lineScale"
+ v-model="addAndEditForm.money"
/>
@@ -117,24 +117,24 @@
-
+
-
+
@@ -164,13 +164,13 @@
-
+
@@ -178,24 +178,24 @@
-
+
-
+
@@ -203,15 +203,15 @@
-
+
@@ -503,6 +503,13 @@ export default {
noticeFileList: [], // 中标通知书
reportFileList: [], // 竣工报告
id: '',
+ projectLocation: '', // 项目所在地
+ money: '', // 合同金额
+ engineeringQuality: '', // 工程质量
+ supervisingEngineer: '', // 总监理工程师及电话
+ remark: '', // 备注
+ projectSituation: '', // 项目概况
+ ownerLocation: '', // 业主单位地址
},
addAndEditRules: {
proName: [
@@ -515,8 +522,8 @@ export default {
voltage: [
{
required: true,
- message: '请输入电压等级',
- trigger: 'blur',
+ message: '请选择电压等级',
+ trigger: 'change',
},
],
startStopTime: [
@@ -582,6 +589,48 @@ export default {
trigger: 'blur',
},
],
+ money: [
+ {
+ pattern: /^([1-9]\d{0,4}(\.\d{1,4})?|0\.[0-9]*[1-9][0-9]*)$/,
+ message: '请输入正确的金额,金额最多保留4位小数，最大为99999.9999',
+ trigger: 'blur',
+ },
+ ],
+ engineeringQuality: [
+ {
+ required: true,
+ message: '请输入工程质量',
+ trigger: 'blur',
+ },
+ ],
+ projectLocation: [
+ {
+ required: true,
+ message: '请输入项目所在地',
+ trigger: 'blur',
+ },
+ ],
+ projectSituation: [
+ {
+ required: true,
+ message: '请输入项目概况',
+ trigger: 'blur',
+ },
+ ],
+ supervisingEngineer: [
+ {
+ required: true,
+ message: '请输入总监理工程师及电话',
+ trigger: 'blur',
+ },
+ ],
+ ownerLocation: [
+ {
+ required: true,
+ message: '请输入业主单位地址',
+ trigger: 'blur',
+ },
+ ],
},
addTableList: [],
fileList: [],
@@ -694,6 +743,13 @@ export default {
noticeFileList, // 中标通知书
reportFileList, // 竣工报告
id,
+ projectLocation, // 项目所在地
+ money, // 合同金额
+ engineeringQuality, // 工程质量
+ supervisingEngineer, // 总监理工程师及电话
+ remark, // 备注
+ projectSituation, // 项目概况
+ ownerLocation, // 业主单位地址
} = this.addAndEditForm
const tbFileSourceVoList = []
if (noticeFileList.length > 0) {
@@ -773,6 +829,13 @@ export default {
ownerPhone, // 业主联系方式
tbCompanyPerfRelList: [],
tbFileSourceVoList,
+ projectLocation, // 项目所在地
+ money, // 合同金额
+ engineeringQuality, // 工程质量
+ supervisingEngineer, // 总监理工程师及电话
+ remark, // 备注
+ projectSituation, // 项目概况
+ ownerLocation, // 业主单位地址
}
params.tbCompanyPerfRelList = this.addTableList.map((e) => {
diff --git a/src/views/company-manage/performance-manage/index.vue b/src/views/company-manage/performance-manage/index.vue
index cba86ef..6daf5a5 100644
--- a/src/views/company-manage/performance-manage/index.vue
+++ b/src/views/company-manage/performance-manage/index.vue
@@ -216,6 +216,13 @@ export default {
tbCompanyPerfRelList, // 关键人员
tbFileSourceVoList, // 附件
id, // 主键id
+ projectLocation, // 项目所在地
+ money, // 合同金额
+ engineeringQuality, // 工程质量
+ supervisingEngineer, // 总监理工程师及电话
+ remark, // 备注
+ projectSituation, // 项目概况
+ ownerLocation, // 业主单位地址
} = row
Object.assign(this.editRow, {
proName,
@@ -231,6 +238,13 @@ export default {
tbCompanyPerfRelList,
tbFileSourceVoList,
id,
+ projectLocation, // 项目所在地
+ money, // 合同金额
+ engineeringQuality, // 工程质量
+ supervisingEngineer, // 总监理工程师及电话
+ remark, // 备注
+ projectSituation, // 项目概况
+ ownerLocation, // 业主单位地址
})
}
this.dialogConfig.outerVisible = true
diff --git a/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue b/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
index 9c3bdc7..d1ed0a3 100644
--- a/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
+++ b/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
@@ -295,8 +295,8 @@ export default {
voltage: [
{
required: true,
- message: '请输入电压等级',
- trigger: 'blur',
+ message: '请选择电压等级',
+ trigger: 'change',
},
],
imgList: [