From d85b1bd1018b5629a4ad1179b76b2de6b01b1bd5 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 15 Jul 2026 11:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/apply/subPages/SK/safeCheckEditNew.vue | 39 +++++++++++++++++++-
pages/apply/subPages/SK/safeCheckShow.vue | 21 +++++++++++
services/apply/subPages/SK/SKServices.js | 11 ++++++
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/pages/apply/subPages/SK/safeCheckEditNew.vue b/pages/apply/subPages/SK/safeCheckEditNew.vue
index b4074cc..186cd6e 100644
--- a/pages/apply/subPages/SK/safeCheckEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckEditNew.vue
@@ -95,6 +95,13 @@
+
+
+
+
+
+
+
@@ -149,7 +156,7 @@
MineTypeName
} from '../../../../utils/enums.js'
import {
- GetCheckContentsInfo,
+ GetNewCheckContentsInfo,
FullUpdate,
GetNewRiskAreaInfo,
GetIdentityUserEditNew,
@@ -280,6 +287,20 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
+ if (this.model.Nav_CheckNoticeDetails && this.model.Nav_CheckNoticeDetails.length > 0) {
+ this.model.Nav_CheckNoticeDetails.map(item => {
+ if (item.Nav_CheckNoticeDetailBasics && item.Nav_CheckNoticeDetailBasics.length > 0) {
+ let areaShow = ''
+ item.Nav_CheckNoticeDetailBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+
+ })
+ item.Nav_CheckNoticeDetailBasicsName = areaShow
+ }
+ })
+ }
}
@@ -519,7 +540,10 @@
if (p.val) {
extendRule(json, 'CHECKCONTENT', 9, p.val);
}
- dataSelect = await GetCheckContentsInfo(json).then(res => {
+ if(this.model.PRODUCTION_UNIT_ID){
+ extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
+ }
+ dataSelect = await GetNewCheckContentsInfo(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
@@ -587,6 +611,17 @@
} else if (this.selectorInfo.name == 'Nav_Contents') {
this.selectorInfo.itemData.Nav_Contents = e;
this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID;
+ this.selectorInfo.itemData.CHECKSTANDARD = e.CHECK_STANDARD
+ if (e.Nav_ContentsBasics && e.Nav_ContentsBasics.length > 0) {
+ let areaShow = ''
+ e.Nav_ContentsBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+ })
+ this.selectorInfo.itemData.Nav_CheckNoticeDetailBasicsName = areaShow
+ this.selectorInfo.itemData.Nav_CheckNoticeDetailBasics = e.Nav_ContentsBasics
+ }
} else if (this.selectorInfo.name == 'Nav_CheckType') {
this.model.Nav_CheckType = e;
this.model.CHECK_TYPE_ID = e.ID;
diff --git a/pages/apply/subPages/SK/safeCheckShow.vue b/pages/apply/subPages/SK/safeCheckShow.vue
index 3f39080..5d04dc3 100644
--- a/pages/apply/subPages/SK/safeCheckShow.vue
+++ b/pages/apply/subPages/SK/safeCheckShow.vue
@@ -86,6 +86,13 @@
+
+
+
+
+
+
+
@@ -218,6 +225,20 @@
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
+ if (this.model.Nav_CheckNoticeDetails && this.model.Nav_CheckNoticeDetails.length > 0) {
+ this.model.Nav_CheckNoticeDetails.map(item => {
+ if (item.Nav_CheckNoticeDetailBasics && item.Nav_CheckNoticeDetailBasics.length > 0) {
+ let areaShow = ''
+ item.Nav_CheckNoticeDetailBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+
+ })
+ item.Nav_CheckNoticeDetailBasicsName = areaShow
+ }
+ })
+ }
}
diff --git a/services/apply/subPages/SK/SKServices.js b/services/apply/subPages/SK/SKServices.js
index 274a8ba..11ee8ef 100644
--- a/services/apply/subPages/SK/SKServices.js
+++ b/services/apply/subPages/SK/SKServices.js
@@ -794,6 +794,17 @@ export function GetCheckContentsInfo(params) {
reject(error)
})
})
+}
+export function GetNewCheckContentsInfo(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SK/SKCheckContents/SKOrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error) => {
+ reject(error)
+ })
+ })
}
export function GetCheckContentsNew(params) {
return new Promise((resolve, reject) => {