From fef5fd8385c26d39262938b7b7c36c9e47c44602 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 二月 2025 10:56:15 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/projectEngineering/projectLibrary/projectDetails.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 60a7a06..446ece8 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -127,7 +127,7 @@
// },
],
childRef: null,
- rules: [
+ baseInfoRules: [
{name: 'projectName', message: '璇疯緭鍏ラ」鐩悕绉�'},
{name: 'content', message: '璇疯緭鍏ュ缓璁惧唴瀹�'},
{name: 'fundTypeList', message: '璇烽�夋嫨璧勯噾绫诲瀷'},
@@ -152,7 +152,10 @@
{name: 'industryCompetentDepartment', message: '璇烽�夋嫨琛屼笟涓荤閮ㄩ棬'},
{name: 'industryCompetentDepartmentPerson', message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯讳汉'},
{name: 'departmentPersonPhone', message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯绘柟寮�'},
- ]
+ ],
+ investmentFundsFormRules: [
+ {name: 'totalInvestment', message: '椤圭洰鎬绘姇璧勯涓嶈兘涓虹┖(涓斿ぇ浜�0)'},
+ ]
};
},
methods: {
@@ -230,13 +233,24 @@
*/
formValidate() {
let msg = "";
- for (let i = 0; i < this.rules.length; i++) {
- console.log(this.projectForm)
- console.log(this.rules[i].name)
- console.log(this.projectForm.projectInfoForm[this.rules[i].name])
- if (! this.projectForm.projectInfoForm[this.rules[i].name]) {
- msg = this.rules[i].message
- break
+ for (let i = 0; i < this.baseInfoRules.length; i++) {
+ if (! this.projectForm.projectInfoForm[this.baseInfoRules[i].name]) {
+ msg = this.baseInfoRules[i].message
+ return msg
+ }
+ }
+ console.log(this.projectForm, "椤圭洰淇℃伅")
+ if (this.projectForm.projectInvestmentFundingForm) {
+ for (let i = 0; i < this.investmentFundsFormRules.length; i++) {
+ const name = this.investmentFundsFormRules[i].name
+ if (! this.projectForm.projectInvestmentFundingForm[name]) {
+ msg = this.investmentFundsFormRules[i].message
+ return msg
+ } else if (name == 'totalInvestment' && parseFloat(this.projectForm.projectInvestmentFundingForm[name]) <= 0) {
+ // 濡傛灉鏄�绘姇璧勯锛屼笉浠呬笉鑳戒负绌鸿繕蹇呴』澶т簬0
+ msg = this.investmentFundsFormRules[i].message
+ return msg
+ }
}
}
return msg;
--
Gitblit v1.8.0