From 394ae82ffd8b19dad823390e03eef6d6072bd83b Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Mon, 15 Jun 2026 16:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9=E8=BE=A8?=
 =?UTF-8?q?=E8=AF=86=E4=B8=8E=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/SK/riskSafeRecShow.vue | 54 ++++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/pages/apply/subPages/SK/riskSafeRecShow.vue b/pages/apply/subPages/SK/riskSafeRecShow.vue
index 3785f03..e359b49 100644
--- a/pages/apply/subPages/SK/riskSafeRecShow.vue
+++ b/pages/apply/subPages/SK/riskSafeRecShow.vue
@@ -49,6 +49,14 @@
 						</u--input> -->
 					</u-form-item>
 					<u--textarea v-model="dataModel.CONTENTS" disabled autoHeight></u--textarea>
+					<u-form-item label="辨识要求" borderBottom>
+
+					</u-form-item>
+					<u-textarea v-model="dataModel.Nav_RequiresName" disabled autoHeight></u-textarea>
+					<u-form-item label="评估要求" borderBottom>
+
+					</u-form-item>
+					<u-textarea v-model="dataModel.Nav_EvaluationsName" disabled autoHeight></u-textarea>
 					<view class="upload-title">附件：</view>
 					<full-upload v-model="dataModel.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
 
@@ -204,6 +212,10 @@
 				const orgId = uni.getStorageSync('orgId')
 				const json = initFilter(orgId, "", "")
 				extendRule(json, 'ID', 1, this.model.ID);
+				extendInclude(json, 'Nav_Requires');
+				extendInclude(json, 'Nav_Requires.Nav_Require');
+				extendInclude(json, 'Nav_Evaluations');
+				extendInclude(json, 'Nav_Evaluations.Nav_Evaluation');
 				extendInclude(json, 'Nav_ApplyUser');
 				extendInclude(json, 'Nav_ApplyDepartment');
 				extendInclude(json, 'Nav_Details');
@@ -216,19 +228,37 @@
 				EvaluationPlanGet(json).then(res => {
 					this.dataModel = res;
 					this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
-					this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd'),
-						this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd'),
-						this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd'),
-						this.dataModel.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd'),
-						this.dataModel.Nav_Details.map((item, index) => {
-							let arr = item.Nav_DetailUsers.map((item1, index1) => {
-								if (!item1.Nav_User.IS_DELETED) {
-									return '  ' + item1.Nav_User.NAME
-								}
-
-							})
-							item['userlist'] = String(arr)
+					this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd')
+					this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
+					this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
+					this.dataModel.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd')
+					let Nav_RequiresName = ''
+					if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
+						this.dataModel.Nav_Requires.map(item => {
+							if (item.Nav_Require.NAME !== null) {
+								Nav_RequiresName += item.Nav_Require.NAME + ' ';
+							}
 						})
+					}
+					this.dataModel.Nav_RequiresName = Nav_RequiresName
+					let Nav_EvaluationsName = ''
+					if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) {
+						this.dataModel.Nav_Evaluations.map(item => {
+							if (item.Nav_Evaluation.NAME !== null) {
+								Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' ';
+							}
+						})
+					}
+					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.IS_DELETED) {
+								return '  ' + item1.Nav_User.NAME
+							}
+
+						})
+						item['userlist'] = String(arr)
+					})
 
 				})
 				this.isLoadOK = true