From 442366956b71c6558e7d7205c5e9e0ba9b2e4fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 7 Apr 2026 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/SK/riskDouPreEdit.vue    | 16 +++++-----
 .../subPages/SK/riskSafeEvaluateEdit.vue      | 18 +++++------
 pages/apply/subPages/SK/riskSafeIdenEdit.vue  | 30 ++++++++++---------
 .../apply/subPages/SK/riskSafeIdenResEdit.vue | 16 +++++-----
 4 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/pages/apply/subPages/SK/riskDouPreEdit.vue b/pages/apply/subPages/SK/riskDouPreEdit.vue
index 537df8d..4e97b75 100644
--- a/pages/apply/subPages/SK/riskDouPreEdit.vue
+++ b/pages/apply/subPages/SK/riskDouPreEdit.vue
@@ -1166,20 +1166,20 @@
 						})
 						return
 					}
-					// if (!item.RISK_NAME) {
-					// 	uni.showToast({
-					// 		title: '顺序'+i+'风险名称不能为空',
-					// 		icon: 'none'
-					// 	})
-					// 	return
-					// }
-					if (!item.Nav_RiskName.NAME) {
+					if (!item.RISK_NAME) {
 						uni.showToast({
 							title: '顺序'+i+'风险名称不能为空',
 							icon: 'none'
 						})
 						return
 					}
+					// if (!item.Nav_RiskName.NAME) {
+					// 	uni.showToast({
+					// 		title: '顺序'+i+'风险名称不能为空',
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }
 					if (!item.RISK_DESCRIPTION) {
 						uni.showToast({
 							title: '顺序'+i+'风险描述不能为空',
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue b/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
index b5292a8..9c5d9d5 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
@@ -651,20 +651,20 @@
 						})
 						return
 					}
-					// if (!item.RISK_NAME) {
+					if (!item.RISK_NAME) {
+						uni.showToast({
+							title: '顺序' + i + '风险名称不能为空',
+							icon: 'none'
+						})
+						return
+					}
+					// if (!item.Nav_RiskName.NAME) {
 					// 	uni.showToast({
-					// 		title: '风险名称不能为空',
+					// 		title: '顺序'+i+'风险名称不能为空',
 					// 		icon: 'none'
 					// 	})
 					// 	return
 					// }
-					if (!item.Nav_RiskName.NAME) {
-						uni.showToast({
-							title: '顺序'+i+'风险名称不能为空',
-							icon: 'none'
-						})
-						return
-					}
 					if (!item.RISK_DESCRIPTION) {
 						uni.showToast({
 							title: '顺序'+i+'风险描述不能为空',
diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
index 7576224..60567e0 100644
--- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
@@ -438,50 +438,52 @@
 
 			},
 
-			submit() {
+			submit() {
+					let i = 1
 				for (let item of this.dataModel.Nav_Details) {
 					if (!item.MineType) {
 						uni.showToast({
-							title: '生产单元不能为空',
+							title: '顺序' + i +'生产单元不能为空',
 							icon: 'none'
 						})
 						return
 					}
 					if (!item.Nav_Area.NAME) {
 						uni.showToast({
-							title: '辨识区域不能为空',
+							title: '顺序' + i +'辨识区域不能为空',
 							icon: 'none'
 						})
 						return
 					}
-					// if (!item.RISK_NAME) {
+					if (!item.RISK_NAME) {
+						uni.showToast({
+							title: '顺序' + i + '风险名称不能为空',
+							icon: 'none'
+						})
+						return
+					}
+					// if (!item.Nav_RiskName.NAME) {
 					// 	uni.showToast({
 					// 		title: '风险名称不能为空',
 					// 		icon: 'none'
 					// 	})
 					// 	return
 					// }
-					if (!item.Nav_RiskName.NAME) {
-						uni.showToast({
-							title: '风险名称不能为空',
-							icon: 'none'
-						})
-						return
-					}
 					if (!item.RISK_DESCRIPTION) {
 						uni.showToast({
-							title: '风险描述不能为空',
+							title: '顺序' + i +'风险描述不能为空',
 							icon: 'none'
 						})
 						return
 					}
 					if (!item.Nav_Type.NAME) {
 						uni.showToast({
-							title: '风险类别不能为空',
+							title: '顺序' + i +'风险类别不能为空',
 							icon: 'none'
 						})
 						return
-					}
+					}
+					i++
 				}
 
 				// this.model = this.dataModel
diff --git a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
index 80b27bb..967b4b3 100644
--- a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
@@ -518,20 +518,20 @@
 						})
 						return
 					}
-					// if (!item.RISK_NAME) {
-					// 	uni.showToast({
-					// 		title: '风险名称不能为空',
-					// 		icon: 'none'
-					// 	})
-					// 	return
-					// }
-					if (!item.Nav_RiskName.NAME) {
+					if (!item.RISK_NAME) {
 						uni.showToast({
 							title: '顺序'+i+'风险名称不能为空',
 							icon: 'none'
 						})
 						return
 					}
+					// if (!item.Nav_RiskName.NAME) {
+					// 	uni.showToast({
+					// 		title: '顺序'+i+'风险名称不能为空',
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }
 					if (!item.RISK_DESCRIPTION) {
 						uni.showToast({
 							title: '顺序'+i+'风险描述不能为空',