From 9cbdd7ca300486f681b7e5f568cf62dd6380fdbc Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 17 Jun 2026 11:43:01 +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=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/apply/subPages/SK/riskSafeIdenEdit.vue | 137 +++++++++++--------
pages/apply/subPages/SK/riskSafeIdenShow.vue | 55 ++++++--
2 files changed, 125 insertions(+), 67 deletions(-)
diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
index 161b28d..c4bbe9a 100644
--- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
@@ -30,13 +30,13 @@
-
-
-
-
-
+
+
+
-
+
附件：
@@ -55,15 +55,15 @@
辨识内容
-
+
- {{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
+ {{index+1+'.辨识区域：'+item.Nav_Area?item.Nav_Area.NAME:''}}
-
+
@@ -90,14 +90,31 @@
-
+
-
-
+
+
+ 新增管控措施
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -304,17 +321,27 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
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.Nav_Require = res.Nav_Require ? res.Nav_Require : {
- NAME: ''
- },
- this.dataModel.RequireName = res.Nav_Require ? res.Nav_Require.NAME : {
- NAME: ''
- },
- this.dataModel.Nav_Details.map(item => {
- item['showPack'] = false
- item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
- item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
+ // this.dataModel.Nav_Require = res.Nav_Require ? res.Nav_Require : {
+ // NAME: ''
+ // },
+ // this.dataModel.RequireName = res.Nav_Require ? res.Nav_Require.NAME : {
+ // NAME: ''
+ // },
+ 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
+ this.dataModel.Nav_Details.map(item => {
+ item['showPack'] = false
+ item['arrow'] = false
+ item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
+ })
this.stepLoad = false
})
@@ -356,9 +383,24 @@
stepReduce() {
this.stepsPageList = this.stepsPageList - 1
},
+ handleNewMeasures(item) {
+ item.Nav_DetailMeasures.unshift({
+ NUM: '',
+ ID: guid(),
+ RISK_IDENTIFY_DETAIL_ID: item.ID,
+ MEASURE: '',
+ IS_DELETED: false,
+ })
+ },
+ changeArrow(item) {
+ item.arrow = !item.arrow
+ this.$forceUpdate()
+ console.log(this.dataModel.Nav_Details)
+ },
handleNewCheckContent() {
this.dataModel.Nav_Details.push({
showPack: false,
+ arrow: false,
Nav_ProductionUnit: {
NAME: ''
},
@@ -508,11 +550,15 @@
- handleDelRowBefore(index) {
- this.showDelModalIndex = index
- this.nowIndex = index
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
+ },
+ handleDelRowMeasures(item, item1) {
+ item1.IS_DELETED = true
+ this.$forceUpdate()
},
confirmDel() {
this.dataModel.Nav_Details.splice(this.nowIndex, 1)
@@ -611,7 +657,7 @@
})
return
}
- if (!item.Nav_Area.NAME) {
+ if (!item.Nav_Area ||!item.Nav_Area.NAME) {
uni.showToast({
title: '顺序' + i + '辨识区域不能为空',
icon: 'none'
@@ -639,7 +685,7 @@
})
return
}
- if (!item.Nav_Type.NAME) {
+ if (!item.Nav_Type ||!item.Nav_Type.NAME) {
uni.showToast({
title: '顺序' + i + '风险类别不能为空',
icon: 'none'
@@ -649,40 +695,19 @@
i++
}
- // this.model = this.dataModel
+ this.model = this.dataModel
this.model.ORG_ID = this.ORG_ID
let arr = []
-
- this.dataModel.Nav_Details.map(item => {
- arr.push({
- PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
- AREA_ID: item.AREA_ID,
- RISK_NAME: item.RISK_NAME,
- RISK_NAME_ID: item.RISK_NAME_ID,
- RISK_DESCRIPTION: item.RISK_DESCRIPTION,
- TYPE_ID: item.TYPE_ID,
- MEASURE: item.MEASURE,
- EMERGENCY: item.EMERGENCY,
- ENABLE_STATUS: item.ENABLE_STATUS,
- MARK: item.MARK,
- })
- })
- this.model = {
- ORG_ID: this.ORG_ID,
- YEAR: this.dataModel.YEAR,
- START_DATE: this.dataModel.START_DATE,
- END_DATE: this.dataModel.END_DATE,
- CONTENTS: this.dataModel.CONTENTS,
- REQUIRE_ID: this.dataModel.REQUIRE_ID,
- RequireName: this.dataModel.RequireName,
- IDENTIFY_EVALUATION_PLAN_ID: this.dataModel.IDENTIFY_EVALUATION_PLAN_ID,
- Nav_Files: this.dataModel.Nav_Files,
- Nav_Details: arr
- }
this.model.ID = this.ID
this.model.TaskID = this.TaskID
this.model.PUBLISH = "SaveAndNotify";
+ delete this.model.Nav_ApplyDepartment
+ delete this.model.Nav_ApplyUser
+ this.model.Nav_Details.map(item=>{
+ delete item.Nav_ProductionUnit
+ delete item.Nav_Type
+ })
SKRiskIdentifyFullUpdate(this.model).then(res => {
if (res) {
uni.$showMsgFunc('操作成功!', () => {
diff --git a/pages/apply/subPages/SK/riskSafeIdenShow.vue b/pages/apply/subPages/SK/riskSafeIdenShow.vue
index a36265d..e3a7e39 100644
--- a/pages/apply/subPages/SK/riskSafeIdenShow.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -56,7 +56,7 @@
- {{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
+ {{index+1+'.辨识区域：'+item.Nav_Area?item.Nav_Area.NAME:''}}
@@ -78,7 +78,7 @@
-
+
@@ -89,8 +89,12 @@
-
-
+
+
+
+
+
+
@@ -119,7 +123,8 @@
guid,
initFilter,
initFilterGroup,
- handleOriginalArray
+ handleOriginalArray,
+ transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@@ -137,6 +142,10 @@
GetRiskAreaInfo,
GetRiskTypeInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
+ import {
+ getEnum,
+ GetEnumAnyOrder
+ } from '../../../../services/common';
import {
getRequest,
} from '../../../../services/apply/FOServices/FOServices';
@@ -222,7 +231,9 @@
stepsPageList: 0,
TaskID: '',
nowName: '',
- nowIndex: 0
+ nowIndex: 0,
+ enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
+ enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
}
},
onLoad(option) {
@@ -238,9 +249,21 @@
...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : ''
}
- this.loadData()
+ this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum']);
},
methods: {
+ fetchEnums(enumNames) {
+ var dataParm = {
+ 'name': enumNames.join('|')
+ }
+ GetEnumAnyOrder(dataParm).then(res => {
+ let newd = transformData(res, enumNames)
+ this.enumsData = newd[0];
+ // 生成文本列表（如需要）
+ this.enumsText = newd[1]
+ this.loadData();
+ })
+ },
loadData() {
// const json = {}
const orgId = uni.getStorageSync('orgId')
@@ -269,9 +292,19 @@
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.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 (item.Nav_Require.NAME !== null) {
+ Nav_RequiresName += item.Nav_Require.NAME + ' ';
+ }
+ })
+ }
+ this.dataModel.Nav_RequiresName = Nav_RequiresName
this.dataModel.Nav_Details.map(item => {
item['showPack'] = false
- item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
+ item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
})
this.stepLoad = false