From 908eee5a0a19d9ff6adeb3e76f936aad664322c9 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 20 Jun 2024 15:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=AE=9A=E5=BE=85=E5=8A=9E=20=E9=80=82=E9=85=8D=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=A3=80=E6=9F=A5=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/BS/plan.vue | 33 +++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/pages/apply/subPages/BS/plan.vue b/pages/apply/subPages/BS/plan.vue
index e9589ae..c55c2c4 100644
--- a/pages/apply/subPages/BS/plan.vue
+++ b/pages/apply/subPages/BS/plan.vue
@@ -390,7 +390,7 @@
 			this.TaskID = option.taskID
 			this.tableKey = option.tableKey
 			this.ORG_ID = uni.getStorageSync('orgId')
-			if (option.ID != null) {
+			if (option.ID != null && option.ID != 'null') {
 				this.loadData()
 			} else {
 				this.isLoadOK = true
@@ -632,13 +632,25 @@
 							}
 						}
 					}
-					this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
-					this.model.RiskAreaNAME = strRiskAreaNAME
-					this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
-					this.model.CheckProjectNAME = CheckProjectNAME
+					if (this.model.Nav_ListSafeCheckDetail && this.model.Nav_ListSafeCheckDetail.length > 0) {
+						this.total = this.model.Nav_ListSafeCheckDetail.length
+						if (this.total > 10) {
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
+						} else {
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
+								.total)
+						}
+						this.model.RiskAreaNAME = strRiskAreaNAME
+						this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
+						this.model.CheckProjectNAME = CheckProjectNAME
+					} else {
+						this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
+						this.model.RiskAreaNAME = strRiskAreaNAME
+						this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
+						this.model.CheckProjectNAME = CheckProjectNAME
+						this.total = 0
+					}
 					this.isLoadOK = true
-					this.total = this.model.Nav_ListSafeCheckDetail.length
-
 				})
 			},
 
@@ -1162,6 +1174,13 @@
 					OrderPagedSafeCheckDetail(json).then(res => {
 						this.model.Nav_ListSafeCheckDetail = []
 						this.model.Nav_ListSafeCheckDetail = res
+						
+						this.total = this.model.Nav_ListSafeCheckDetail.length
+						if (this.total > 10) {
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
+						} else {
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total)
+						}
 					})
 				}
 			},