From e50bf30b94c3dfd2d6c0e449e92cd3035fd7176b Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Mon, 29 Jun 2026 16:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subPages/SK/riskSafeEvaluateEditNew.vue   | 22 +++++-----
 pages/apply/subPages/SK/riskSafeIdenEdit.vue  |  2 +-
 .../apply/subPages/SK/riskSafeIdenResEdit.vue |  1 -
 pages/apply/subPages/SK/riskSafeRecEdit.vue   | 43 ++++++++++++-------
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
index 71d344d..7638b95 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
@@ -37,7 +37,7 @@
 						<!-- <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 						</u-icon> -->
 					</u-form-item>
-					<u--textarea v-model="dataModel.Nav_RequiresName" disabled autoHeight></u--textarea>
+					<u--textarea v-model="model.Nav_RequiresName" disabled autoHeight></u--textarea>
 					<!-- 	<u-form-item required label="评价要求:" @click="handleChangeStep('','','demand')">
 						<u--input v-model="(model.Nav_Require||{}).NAME" placeholder="请选择辨识要求" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
@@ -421,20 +421,20 @@
 					this.model.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
 					this.model.RequireName = res.Nav_Require.NAME
 					let Nav_RequiresName = ''
-					if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
-						this.dataModel.Nav_Requires.map(item => {
+					if (this.model.Nav_Requires && this.model.Nav_Requires.length > 0) {
+						this.model.Nav_Requires.map(item => {
 							if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
 								Nav_RequiresName += item.Nav_Require.NAME + ' ';
 							}
 						})
 					}
-					this.dataModel.Nav_RequiresName = Nav_RequiresName
+					this.model.Nav_RequiresName = Nav_RequiresName
 					this.model.Nav_Details.map(item => {
 						item['showPack'] = false
-						item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
-						item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
+						item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK)?.name : '';
+						item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL)?.name : '';
 						item.Nav_DetailDeparts.map(item1 => {
-							item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
+							item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE)?.name : '';
 						})
 						if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
 							item.Nav_DetailPosts.map(item1 => {
@@ -934,8 +934,8 @@
 						})
 						return
 					}
-					if (item.Nav_DetailMeasures.length !== 0) {
-						for (let item1 of item.Nav_DetailMeasures) {
+					if (item.Nav_DetailMeasures.filter(i => !i.IS_DELETED).length !== 0) {
+						for (let item1 of item.Nav_DetailMeasures.filter(i => !i.IS_DELETED)) {
 							if (!item1.MEASURES_NAME) {
 								uni.showToast({
 									title: '顺序' + i + '管控措施不能为空',
@@ -952,8 +952,8 @@
 							// }
 						}
 					}
-					if (item.Nav_DetailDeparts.length !== 0) {
-						for (let item1 of item.Nav_DetailDeparts) {
+					if (item.Nav_DetailDeparts.filter(i => !i.IS_DELETED).length !== 0) {
+						for (let item1 of item.Nav_DetailDeparts.filter(i => !i.IS_DELETED)) {
 							if (!item1.DEPARTMENT_TYPEName) {
 								uni.showToast({
 									title: '顺序' + i + '管控层级不能为空',
diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
index 89220e9..204ce73 100644
--- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
@@ -659,7 +659,7 @@
 
 			submit() {
 				let i = 1
-				for (let item of this.dataModel.Nav_Details) {
+				for (let item of this.dataModel.Nav_Details.filter(i => !i.IS_DELETED)) {
 					if (!item.PRODUCTION_UNIT_ID) {
 						uni.showToast({
 							title: '顺序' + i + '生产单元不能为空',
diff --git a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
index 05be688..2ef21f9 100644
--- a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
@@ -929,7 +929,6 @@
 					}
 					i++
 				}
-				console.log(this.dataModel, 'this.dataModel')
 
 				this.model = this.dataModel
 
diff --git a/pages/apply/subPages/SK/riskSafeRecEdit.vue b/pages/apply/subPages/SK/riskSafeRecEdit.vue
index cc483f4..d50bda5 100644
--- a/pages/apply/subPages/SK/riskSafeRecEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeRecEdit.vue
@@ -58,7 +58,7 @@
 					<view v-for="(item,index) in dataModel.Nav_Details.filter(i => !i.IS_DELETED)" :key="index" style="border-bottom: #ceccca 1px dashed;padding-bottom: 10px;">
 						<u-form-item>
 							<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;flex: 1;">
-								<view @click="handleChangeStep(item)" style="flex: 1;display: flex;flex-direction: row;align-items: center;">
+								<view @click="handleShowSheet({title: '部门', name: 'Nav_Department',itemData:item})" style="flex: 1;display: flex;flex-direction: row;align-items: center;">
 									<view>
 										{{'部门 : ' +item.Nav_Department.NAME}}
 									</view>
@@ -252,7 +252,7 @@
 						let Nav_RequiresName = ''
 						if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
 							this.dataModel.Nav_Requires.map(item => {
-								if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
+								if (item.Nav_Require && item.Nav_Require.NAME !== null) {
 									Nav_RequiresName += item.Nav_Require.NAME + ' ';
 								}
 							})
@@ -261,7 +261,7 @@
 						let Nav_EvaluationsName = ''
 						if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) {
 							this.dataModel.Nav_Evaluations.map(item => {
-								if (item.Nav_Evaluation&&item.Nav_Evaluation.NAME !== null) {
+								if (item.Nav_Evaluation && item.Nav_Evaluation.NAME !== null) {
 									Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' ';
 								}
 							})
@@ -269,7 +269,7 @@
 						this.dataModel.Nav_EvaluationsName = Nav_EvaluationsName
 						this.dataModel.Nav_Details.map((item, index) => {
 							let arr = item.Nav_DetailUsers.map((item1, index1) => {
-								if (item1.Nav_User&&!item1.Nav_User.IS_DELETED) {
+								if (item1.Nav_User && !item1.Nav_User.IS_DELETED) {
 									return '  ' + item1.Nav_User.NAME
 								}
 
@@ -283,8 +283,8 @@
 			handleNewCheckContent() {
 				this.dataModel.Nav_Details.unshift({
 					IS_DELETED: false,
-					ID:guid(),
-					IDENTIFY_EVALUATION_PLAN_ID:this.ID,
+					ID: guid(),
+					IDENTIFY_EVALUATION_PLAN_ID: this.ID,
 					Nav_Department: {
 						NAME: ''
 					},
@@ -424,9 +424,9 @@
 					dataSelect = await getRequestOrderPage(json, "/SK/Request/OrderPaged").then(res => {
 						this.selectorInfo.totalCount = res.TotalCount
 						if (res.Data != undefined && res.Data.length > 0) {
-							for (let i = 0; i < res.length; i++) {
-								res[i].name = res.Data[i].NAME
-								res[i].code = res.Data[i].CODE
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+								res.Data[i].code = res.Data[i].CODE
 							}
 						}
 						return res.Data
@@ -444,9 +444,9 @@
 					this.selectorInfo.isMultiple = true
 					dataSelect = await getRequestOrderPage(json, "/SK/Evaluation/OrderPaged").then(res => {
 						if (res.Data != undefined && res.Data.length > 0) {
-							for (let i = 0; i < res.length; i++) {
-								res[i].name = res.Data[i].NAME
-								res[i].code = res.Data[i].CODE
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+								res.Data[i].code = res.Data[i].CODE
 							}
 						}
 						return res.Data
@@ -460,6 +460,16 @@
 					} else {
 						defaultChecked = null
 					}
+				} else if (p.name == 'Nav_Department') {
+					dataSelect = await GetDepartmentInfo(json).then(res => {
+						if (res.Data != undefined && res.Data.length > 0) {
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+								res.Data[i].code = res.Data[i].CODE
+							}
+						}
+						return res.Data
+					})
 				}
 				if (defaultChecked == null)
 					defaultChecked = []
@@ -537,6 +547,9 @@
 					}
 					this.dataModel.Nav_Evaluations = listArea
 					this.dataModel.Nav_EvaluationsName = areaShow
+				} else if (this.selectorInfo.name == 'Nav_Department') {
+					this.selectorInfo.itemData.Nav_Department = e
+					this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
 				}
 
 
@@ -550,7 +563,7 @@
 					})
 					return
 				}
-				for (let item of this.dataModel.Nav_Details) {
+				for (let item of this.dataModel.Nav_Details.filter(i => !i.IS_DELETED)) {
 					if (!item.Nav_Department.NAME) {
 						uni.showToast({
 							title: '部门不能为空',
@@ -567,8 +580,8 @@
 					}
 				}
 				this.model = this.dataModel
-				if(this.model.Nav_Details&&this.model.Nav_Details.length>0){
-					this.model.Nav_Details.map(item=>{
+				if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
+					this.model.Nav_Details.map(item => {
 						delete item.Nav_Department
 					})
 				}