From af67c253b104652507020d2a71ad6ddd2c2188a5 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Fri, 7 Nov 2025 09:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/checkContentEdit.vue | 30 ++++++- pages/apply/subPages/SK/riskVerifyEditNew.vue | 17 +++- services/apply/subPages/SK/SKServices.js | 80 ++++++++++++++++++- 3 files changed, 120 insertions(+), 7 deletions(-) diff --git a/pages/apply/subPages/SK/checkContentEdit.vue b/pages/apply/subPages/SK/checkContentEdit.vue index 93f8003..86d0633 100644 --- a/pages/apply/subPages/SK/checkContentEdit.vue +++ b/pages/apply/subPages/SK/checkContentEdit.vue @@ -118,13 +118,10 @@ } from '../../../../utils/enums.js' import { GetCheckContentsInfo, - GetRecordSummary, SKCheckContentsFullUpdate, - GetRiskAreaInfo, - GetCheckInspection, GetHiddenScripList, GetNewRiskAreaInfo, - CheckTypeNewOrderPaged + GetCheckContentsNew } from '../../../../services/apply/subPages/SK/SKServices.js' import { getRequest, @@ -180,6 +177,7 @@ SECURITY_INSPECTION_RECORD_ID: null, CHECK_TIME: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'), Nav_ListCheckQuestion: [], + CHECK_CONTENTS_ID:'' }, selectorInfo: { name: 'user', @@ -229,9 +227,13 @@ } }, onLoad(option) { + this.model.CHECK_CONTENTS_ID = option.CHECK_CONTENTS_ID?option.CHECK_CONTENTS_ID:'' this.TaskID = option.taskID ? option.taskID : ''; this.ID = option.ID ? option.ID : ''; this.fetchEnums(['SKProductionUnit', 'SKHiddenLevel']); + if(option.CHECK_CONTENTS_ID){ + this.getNotNew() + } }, methods: { async fetchEnums(enumNames) { @@ -274,6 +276,26 @@ }); } }, + getNotNew(){ + const orgId = uni.getStorageSync('orgId') + const json = initFilter(orgId, "", "") + extendRule(json, 'ID', 1, this.model.CHECK_CONTENTS_ID) + extendInclude(json, 'Nav_Area'); + extendInclude(json, 'Nav_ContentsBasics'); + extendInclude(json, 'Nav_ContentsBasics.Nav_Law'); + extendInclude(json, 'Nav_ListCheckQuestion'); + extendIgnoreDataRule(json) + GetCheckContentsNew(json).then(res => { + this.model = res + this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : ''; + if(this.model.Nav_ListCheckQuestion&&this.model.Nav_ListCheckQuestion.length>0){ + this.model.Nav_ListCheckQuestion.map(item=>{ + item.QUESTION_LEVELName= item.QUESTION_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.QUESTION_LEVEL).name : ''; + }) + } + + }) + }, loadData() { this.model.ID = guid() diff --git a/pages/apply/subPages/SK/riskVerifyEditNew.vue b/pages/apply/subPages/SK/riskVerifyEditNew.vue index fa63afb..76c3687 100644 --- a/pages/apply/subPages/SK/riskVerifyEditNew.vue +++ b/pages/apply/subPages/SK/riskVerifyEditNew.vue @@ -102,8 +102,9 @@ - - 提交 + + 新增隐患描述 + 提交 @@ -295,6 +296,18 @@ }); } }, + goRiskDes(){ + if(!this.model.CHECK_CONTENTS_ID){ + uni.showToast({ + title: '请先选择检查内容', + icon: 'none' + }); + return + } + uni.navigateTo({ + url: 'checkContentEdit?CHECK_CONTENTS_ID=' + this.model.CHECK_CONTENTS_ID + }) + }, loadData() { // const json = {} const orgId = uni.getStorageSync('orgId') diff --git a/services/apply/subPages/SK/SKServices.js b/services/apply/subPages/SK/SKServices.js index 07111bc..93d7c5e 100644 --- a/services/apply/subPages/SK/SKServices.js +++ b/services/apply/subPages/SK/SKServices.js @@ -55,6 +55,17 @@ export function GetIdentityUserNewRecord(params) { }) }) } +export function GetSKEnterpriseLibraryRecord(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/SKGet", params).then((result) => { + if (result.IsSuccessful) { + resolve(result.Data); + } + }).catch((error) => { + reject(error) + }) + }) +} export function GetHandRiskReportRecord(params) { return new Promise((resolve, reject) => { request.post("/SK/HiddenDangerHandReport/Get", params).then((result) => { @@ -220,6 +231,39 @@ export function SKEnterpriseLibrary(params) { }) }) } +export function GetPostRiskList(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/GetPostRiskList", params).then((result) => { + if (result.IsSuccessful) { + resolve(result); + } + }).catch((error) => { + reject(error) + }) + }) +} +export function DepartOrderPaged(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/DepartOrderPaged", params).then((result) => { + if (result.IsSuccessful) { + resolve(result); + } + }).catch((error) => { + reject(error) + }) + }) +} +export function SKEnterpriseLibraryNew(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/GetCheckListNew", params).then((result) => { + if (result.IsSuccessful) { + resolve(result.Data); + } + }).catch((error) => { + reject(error) + }) + }) +} export function GetCheckDetailList(params) { return new Promise((resolve, reject) => { request.post("/SK/SKEnterpriseLibrary/GetCheckDetailList", params).then((result) => { @@ -618,6 +662,17 @@ export function GetSafeCheckRecordListInfo(params) { }) }) } +export function GetSKEnterpriseLibrary(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/SKOrderPaged", params).then((result) => { + if (result.IsSuccessful) { + resolve(result); + } + }).catch((error) => { + reject(error) + }) + }) +} export function GetHiddenDangerListInfo(params) { return new Promise((resolve, reject) => { request.post("/SK/HiddenDangerReport/OrderPaged", params).then((result) => { @@ -718,6 +773,17 @@ export function GetCheckContentsInfo(params) { }) }) } +export function GetCheckContentsNew(params) { + return new Promise((resolve, reject) => { + request.post("/SK/CheckContents/Get", params).then((result) => { + if (result.IsSuccessful) { + resolve(result.Data); + } + }).catch((error) => { + reject(error) + }) + }) +} export function GetHiddenScripList(params) { return new Promise((resolve, reject) => { request.post("/SK/SKCheckContents/GetHiddenScripList", params).then((result) => { @@ -875,7 +941,18 @@ export function GetScorec(params) { } export function GetSKCheckType(params) { return new Promise((resolve, reject) => { - request.post("/SK/SKCheckType/OrderPaged", params).then((result) => { + request.post("/SK/SKCheckType/OrderPagedNew", params).then((result) => { + if (result.IsSuccessful) { + resolve(result); + } + }).catch((error) => { + reject(error) + }) + }) +} +export function SKOrderEntities(params) { + return new Promise((resolve, reject) => { + request.post("/SK/SKEnterpriseLibrary/SKOrderEntities", params).then((result) => { if (result.IsSuccessful) { resolve(result); } @@ -885,3 +962,4 @@ export function GetSKCheckType(params) { }) } +