From 79924f9d34412687c2408f3995997222a55caab0 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 27 Sep 2024 15:11:13 +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=201=E3=80=81=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=202?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD=20=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA=20=E5=A4=84=E7=90=86=203=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=A1=8C=20=E5=A4=84=E7=90=86=EF=BC=88=E5=8E=9F?=
 =?UTF-8?q?=E5=85=88=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/BS/plan.vue | 85 +++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 17 deletions(-)

diff --git a/pages/apply/subPages/BS/plan.vue b/pages/apply/subPages/BS/plan.vue
index 66f042f..9b65d48 100644
--- a/pages/apply/subPages/BS/plan.vue
+++ b/pages/apply/subPages/BS/plan.vue
@@ -330,7 +330,8 @@
 							Nav_Standard: { //Nav_Law
 								NAME: ''
 							}
-						}]
+						}],
+						DetailUserNAME: ''
 					}] //子表
 				},
 				isAudit: true,
@@ -362,12 +363,14 @@
 					'CHECKTIME': {
 						type: 'string',
 						required: true,
-						trigger: ['blur', 'change']
+						trigger: ['blur', 'change'],
+						message: '请选择检查时间'
 					},
 					'listCheckUserSign': {
 						type: 'string',
 						required: true,
-						trigger: ['blur', 'change']
+						trigger: ['blur', 'change'],
+						message: '请选择检查人员'
 					}
 				},
 
@@ -395,7 +398,8 @@
 						Nav_Standard: { //Nav_Law
 							NAME: ''
 						}
-					}]
+					}],
+					DetailUserNAME: ''
 				}],
 			}
 
@@ -425,7 +429,15 @@
 				if (this.Nav_ListSafeCheckDetailShow == null) {
 					this.Nav_ListSafeCheckDetailShow = []
 				}
-				var ROW_NO = this.model.Nav_ListSafeCheckDetail.length + 1
+				var ROW_NO = 1; //this.model.Nav_ListSafeCheckDetail.length + 1
+				if (this.model.Nav_ListSafeCheckDetail.length > 0) {
+					// ROW_NO=0
+					this.model.Nav_ListSafeCheckDetail.forEach(e => {
+						if (e.IS_DELETED == undefined || e.IS_DELETED == false)
+							ROW_NO++
+					})
+				}
+
 				var modelAdd = {
 					ID: guid(),
 					ORG_ID: this.ORG_ID,
@@ -579,18 +591,29 @@
 
 					// 行数据处理 把选择人 分别插入 每行的人员信息
 					this.modelEdit.Nav_ListSafeCheckDetail.forEach(e => {
-						e.Nav_ListCheckDetailUser = []
-						this.modelEdit.Nav_ListCheckUser.forEach((u, i) => {
-							let userSign = {
-								ID: guid(),
-								ORG_ID: orgId,
-								// SAFE_CHECK_ID: this.model.ID,//重点！！！后台作为关键字在处理 不加此属性
-								SAFE_CHECK_DETAIL_ID: e.ID,
-								USER_ID: u.SUSER_ID,
-								ISMAINCHECK: i == 0 ? 1 : 0
+						if ((!this.modelEdit.Nav_ListCheckUser || this.modelEdit.Nav_ListCheckUser.length <
+								1) && this.modelEdit.listCheckUserSign.length > 0) {
+							//自动加载 不需要处理
+							if (e.Nav_ListCheckDetailUser != null && e.Nav_ListCheckDetailUser.length >
+								0) {
+								e.Nav_ListCheckDetailUser.forEach(eu => {
+									eu.Nav_User = null
+								})
 							}
-							e.Nav_ListCheckDetailUser.push(userSign)
-						})
+						} else {
+							e.Nav_ListCheckDetailUser = []
+							this.modelEdit.Nav_ListCheckUser.forEach((u, i) => {
+								let userSign = {
+									ID: guid(),
+									ORG_ID: orgId,
+									// SAFE_CHECK_ID: this.model.ID,//重点！！！后台作为关键字在处理 不加此属性
+									SAFE_CHECK_DETAIL_ID: e.ID,
+									USER_ID: u.SUSER_ID,
+									ISMAINCHECK: i == 0 ? 1 : 0
+								}
+								e.Nav_ListCheckDetailUser.push(userSign)
+							})
+						}
 						if (e.Nav_ListLaw != null)
 							e.Nav_ListLaw.forEach(u => {
 								u.Nav_Standard = null //Nav_Law
@@ -613,7 +636,11 @@
 						}, 'success', 1000)
 					})
 				}).catch(err => {
-					uni.$showErrorInfo('校验失败');
+					if (err.length > 0) {
+						uni.$showErrorInfo(err[0].message)
+					} else {
+						uni.$showErrorInfo('校验失败！')
+					}
 				})
 			},
 
@@ -709,6 +736,30 @@
 						this.model.RiskAreaNAME = strRiskAreaNAME
 						// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
 						this.model.CheckProjectNAME = CheckProjectNAME
+
+						if (this.model.CheckUsers && this.model.CheckUsers.length > 0) {
+							//默认处理了人员信息
+							// var sreq='erwqreqreqerwqrewq'
+							// var cdd0=sreq.replace(/q/g,'1')
+							// var cdd2=sreq.replace('q','1')
+							this.model.listCheckUserSign = this.model.CheckUsers.replace(/,/g, ' ')
+							//不处理 做区分
+							// this.model.Nav_ListCheckUser = listUsers
+						}
+
+						// DetailUserNAME
+						var DetailUserNAME = ''
+						this.model.Nav_ListSafeCheckDetail.forEach(e => {
+							if (e.Nav_ListCheckDetailUser != null && e.Nav_ListCheckDetailUser.length >
+								0) {
+								DetailUserNAME = e.Nav_ListCheckDetailUser[0].Nav_User.NAME
+								e.Nav_ListCheckDetailUser.forEach((eu, index) => {
+									if (index > 0)
+										DetailUserNAME += ' ' + eu.Nav_User.NAME
+								})
+								e.DetailUserNAME = DetailUserNAME
+							}
+						})
 					} else {
 						this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
 						this.model.RiskAreaNAME = strRiskAreaNAME