From dc0c720cb706b5929e768fde9d6247c290f32425 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 7 Jul 2026 09:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=95=B4=E6=94=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subPages/SK/riskRectifyRecordEditNew.vue | 120 +++- .../subPages/SK/riskRectifyRecordShow.vue | 556 +++++++++--------- 2 files changed, 388 insertions(+), 288 deletions(-) diff --git a/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue b/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue index d4ecf5d..28d4818 100644 --- a/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue +++ b/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue @@ -32,28 +32,43 @@ + + + + + + + + + + + - - - + + + + + + + - - + + @@ -69,11 +84,10 @@ - - + + - - + 整改前照片： @@ -82,7 +96,7 @@ 预案或方案： - + @@ -98,10 +112,7 @@ - - - - + @@ -145,7 +156,8 @@ RectifyFullUpdateEdit, GetCheckContentsInfo, GetHiddenScripList, - getUserLists + getUserLists, + SKHiddenReason } from '../../../../services/apply/subPages/SK/SKServices.js' import { getRequest, @@ -278,10 +290,18 @@ this.model = res; this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME, 'yyyy-mm-dd') - this.model.COMPLETE_DATE = uni.$u.timeFormat(res.COMPLETE_DATE, - 'yyyy-mm-dd') + this.model.COMPLETE_DATE =res.COMPLETE_DATE? uni.$u.timeFormat(res.COMPLETE_DATE, + 'yyyy-mm-dd'):'' this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE, 'yyyy-mm-dd') + let ReasonsNAME = '' + if (this.model.Nav_RectifyReasons && this.model.Nav_RectifyReasons.length > 0) { + for (let i = 0; i < this.model.Nav_RectifyReasons.length; i++) { + ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + this.model + .Nav_RectifyReasons[i].Nav_Reason.NAME; + } + } + this.model.ReasonsNAME = ReasonsNAME this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : ''; this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : ''; this.stepsPage = res.STATUS == 0 || res.STATUS == 40 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3 @@ -393,6 +413,7 @@ if (p.val) { extendRule(json, 'CHECKCONTENT', 9, p.val); } + json.Sort = 'CHECKCONTENT' // extendRule(json, 'DEVICE_STATUS', 1, '1'); dataSelect = await GetCheckContentsInfo(json).then(res => { this.selectorInfo.totalCount = res.TotalCount @@ -421,7 +442,7 @@ } return res.Data }) - } else if (p.name == 'Nav_AcceptUser') { + } else if (p.name == 'Nav_AcceptUser'||p.name == 'Nav_RecitifyUser') { if (p.val) { extendRule(json, 'NAME', 9, p.val); } @@ -436,6 +457,37 @@ } return res.Data }) + }else if (p.name == 'Nav_Reasons') { + if (p.val) { + extendRule(json, 'NAME', 9, p.val); + } + + this.selectorInfo.isMultiple = true + json.Sort = 'NAME' + json.Limit = 20 + if (p.pageIndex) { + json.Start = (p.pageIndex - 1) * json.Limit; + } + // extendRule(json, 'CHECKOBJECT', 1, this.model.CHECKOBJECT); + dataSelect = await SKHiddenReason(json).then(res => { + this.selectorInfo.totalCount = res.TotalCount + if (res != undefined && res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.Data.length; i++) { + res.Data[i].name = res.Data[i].NAME + // res[i].code = res[i].CODE + } + } + return res.Data + }) + if (this.model.Nav_RectifyReasons.length > 0 && this.model.Nav_RectifyReasons[0] + .Nav_Reason != null) { + // this.selectorInfo.defaultChecked = [] + this.model.Nav_RectifyReasons.forEach(e => { + defaultChecked.push(e.Nav_Reason) + }) + } else { + defaultChecked = null + } } if (defaultChecked == null) @@ -482,6 +534,31 @@ } else if (this.selectorInfo.name == 'Nav_AcceptUser') { this.model.Nav_AcceptUser = e; this.model.ACCEPT_USER_ID = e.ID; + } else if (this.selectorInfo.name == 'Nav_RecitifyUser') { + this.model.Nav_RecitifyUser = e; + this.model.RECITIFY_USER_ID = e.ID; + }else if (this.selectorInfo.name == 'Nav_Reasons') { + let listProject = [] + let projectShow = '' + if (e.length > 0) { + e.forEach((item, i) => { + if (item.name != null || item.NAME != null) { + if (i > 0) { + projectShow += ' ' + } + listProject.push({ + ID: guid(), + HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID: this.ID, + REASON_ID: item.ID, + ORG_ID: item.ORG_ID, + Nav_Reason: item + }) + projectShow += item.NAME + } + }) + } + this.model.Nav_RectifyReasons = listProject + this.model.ReasonsNAME = projectShow } this.selectorInfo.showPopup = false @@ -517,6 +594,13 @@ }) return } + if (!this.model.Nav_RecitifyUser || !this.model.Nav_RecitifyUser.NAME) { + uni.showToast({ + title: '请选择整改责任人', + icon: 'none' + }) + return + } if (!this.model.Nav_AcceptUser || !this.model.Nav_AcceptUser.NAME) { uni.showToast({ title: '请选择验收人', diff --git a/pages/apply/subPages/SK/riskRectifyRecordShow.vue b/pages/apply/subPages/SK/riskRectifyRecordShow.vue index d4f9f8a..b6a6a02 100644 --- a/pages/apply/subPages/SK/riskRectifyRecordShow.vue +++ b/pages/apply/subPages/SK/riskRectifyRecordShow.vue @@ -1,277 +1,293 @@ -