From 6513b943ec1368975cf4a5ea7f099ed3dd9b2d09 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 16:43:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=8F=AD=E5=89=8D=E4=BC=9A=E6=B2=A1?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=97=B6=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?2=E3=80=81=E9=A3=8E=E9=99=A9=E8=BE=A8=E8=AF=86=E8=A1=A8?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subPages/FO/1preShiftMeetingShow.vue      | 19 +++++++++++++++----
 pages/apply/subPages/SK/riskDouPreEdit.vue    | 10 +++++-----
 .../subPages/SK/riskSafeEvaluateEdit.vue      |  8 ++++----
 .../subPages/SK/riskSafeEvaluateEditNew.vue   |  8 ++++----
 pages/apply/subPages/SK/riskSafeIdenEdit.vue  |  8 ++++----
 .../apply/subPages/SK/riskSafeIdenResEdit.vue |  8 ++++----
 .../apply/subPages/SK/riskSafeIdenResShow.vue |  2 +-
 pages/apply/subPages/SK/riskSafeIdenShow.vue  |  2 +-
 .../apply/subPages/SK/riskSafeIdenSumShow.vue |  2 +-
 9 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pages/apply/subPages/FO/1preShiftMeetingShow.vue b/pages/apply/subPages/FO/1preShiftMeetingShow.vue
index e94d887..2dd2210 100644
--- a/pages/apply/subPages/FO/1preShiftMeetingShow.vue
+++ b/pages/apply/subPages/FO/1preShiftMeetingShow.vue
@@ -70,9 +70,15 @@
 		data() {
 			return {
 				model: {
-					Nav_Team: "",
-					Nav_Class: "",
-					Nav_User: ""
+					Nav_Team: {
+						NAME: ''
+					},
+					Nav_Class: {
+						NAME: ''
+					},
+					Nav_User: {
+						NAME: ''
+					},
 				},
 				listPropUpload: ['PRE_SHIFT_MEETING_RECORD_ID'],
 				listPropValUpload: [],
@@ -100,7 +106,12 @@
 				getRequest(json, "/FO/PreShiftMeetingRecord/Get").then(res => {
 					this.model = res
 					//数据组装
-					let strUserName = ''
+					let strUserName = ''
+					if (res.Nav_Team === null || !res.Nav_Team) {
+						res.Nav_Team ={
+							NAME: ''
+						}
+					}
 					if (res.Nav_Users && res.Nav_Users.length > 0) {
 						for (let i = 0; i < res.Nav_Users.length; i++) {
 							if (res.Nav_Users[i].DEAL_STATUS == 0) {
diff --git a/pages/apply/subPages/SK/riskDouPreEdit.vue b/pages/apply/subPages/SK/riskDouPreEdit.vue
index 70f8fde..537df8d 100644
--- a/pages/apply/subPages/SK/riskDouPreEdit.vue
+++ b/pages/apply/subPages/SK/riskDouPreEdit.vue
@@ -76,15 +76,15 @@
 								<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 								</u-icon>
 							</u-form-item>
-							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
-								<u--input v-model="item.Nav_RiskName.NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+							<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
+								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item> -->
-							<u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep('RiskName',[index])" border-bottom>
+							</u-form-item>
+							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep('RiskName',[index])" border-bottom>
 								<u--input v-model="item.Nav_RiskName.NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
 									border="none">
 								</u--input>
-							</u-form-item>
+							</u-form-item> -->
 							<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION">
 							</u-form-item>
 							<u--textarea v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea>
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue b/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
index 41399a6..b5292a8 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
@@ -77,15 +77,15 @@
 								<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 								</u-icon>
 							</u-form-item>
-							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
+							<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
 								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item> -->
-							<u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
+							</u-form-item>
+							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
 								<u--input v-model="item.Nav_RiskName.NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
 									border="none">
 								</u--input>
-							</u-form-item>
+							</u-form-item> -->
 							<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION">
 							</u-form-item>
 							<u--textarea v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea>
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
index 3e4b0b5..ed5ad48 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
@@ -80,14 +80,14 @@
 								<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 								</u-icon>
 							</u-form-item>
-							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
+							<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
 								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item> -->
-							<u-form-item required label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
+							</u-form-item>
+							<!-- <u-form-item required label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
 								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item>
+							</u-form-item> -->
 							<u-form-item required label="风险描述" prop="HIDDEN_DESCRIPTION">
 							</u-form-item>
 							<u--textarea v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea>
diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
index 1008073..7576224 100644
--- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
@@ -76,15 +76,15 @@
 								<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 								</u-icon>
 							</u-form-item>
-						<!-- 	<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
+							<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
 								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item> -->
-							<u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
+							</u-form-item>
+							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
 								<u--input v-model="(item.Nav_RiskName||{}).NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
 									border="none">
 								</u--input>
-							</u-form-item>
+							</u-form-item> -->
 							<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION" border-bottom>
 								<u--input v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
diff --git a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
index abae4be..80b27bb 100644
--- a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
@@ -74,15 +74,15 @@
 								<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 								</u-icon>
 							</u-form-item>
-							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
+							<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
 								<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
-							</u-form-item> -->
-							<u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
+							</u-form-item>
+							<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
 								<u--input v-model="item.Nav_RiskName.NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
 									border="none">
 								</u--input>
-							</u-form-item>
+							</u-form-item> -->
 							<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION">
 							</u-form-item>
 							<u--textarea v-model="item.RISK_DESCRIPTION"  placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea>
diff --git a/pages/apply/subPages/SK/riskSafeIdenResShow.vue b/pages/apply/subPages/SK/riskSafeIdenResShow.vue
index c5e6cca..883e527 100644
--- a/pages/apply/subPages/SK/riskSafeIdenResShow.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenResShow.vue
@@ -67,7 +67,7 @@
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
-									<u--input v-model="item.Nav_RiskName.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+									<u--input v-model="item.RISK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION" border-bottom>
diff --git a/pages/apply/subPages/SK/riskSafeIdenShow.vue b/pages/apply/subPages/SK/riskSafeIdenShow.vue
index bd9b577..14cd259 100644
--- a/pages/apply/subPages/SK/riskSafeIdenShow.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenShow.vue
@@ -70,7 +70,7 @@
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
-									<u--input v-model="item.Nav_RiskName.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+									<u--input v-model="item.RISK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION" border-bottom>
diff --git a/pages/apply/subPages/SK/riskSafeIdenSumShow.vue b/pages/apply/subPages/SK/riskSafeIdenSumShow.vue
index 07fbe0f..41a5da4 100644
--- a/pages/apply/subPages/SK/riskSafeIdenSumShow.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenSumShow.vue
@@ -67,7 +67,7 @@
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
-									<u--input v-model="item.Nav_RiskName.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+									<u--input v-model="item.RISK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 									</u--input>
 								</u-form-item>
 								<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION" border-bottom>