diff --git a/pages/apply/subPages/SK/riskReportEditNew.vue b/pages/apply/subPages/SK/riskReportEditNew.vue index 19eadad..bddf33a 100644 --- a/pages/apply/subPages/SK/riskReportEditNew.vue +++ b/pages/apply/subPages/SK/riskReportEditNew.vue @@ -651,7 +651,7 @@ }) }, submit() { - for (let item of this.model.Nav_ReportDetails) { + for (let item of this.model.Nav_ReportDetails.filter(i => !i.IS_DELETED)) { if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) { uni.showToast({ title: '请选择检查区域', diff --git a/pages/apply/subPages/SK/riskVerifyEditNew.vue b/pages/apply/subPages/SK/riskVerifyEditNew.vue index cdacb80..16bbf31 100644 --- a/pages/apply/subPages/SK/riskVerifyEditNew.vue +++ b/pages/apply/subPages/SK/riskVerifyEditNew.vue @@ -18,13 +18,13 @@ - - + - + @@ -34,7 +34,7 @@ - + @@ -104,10 +104,10 @@ 附件: - + diff --git a/pages/apply/subPages/SK/riskVerifyShow.vue b/pages/apply/subPages/SK/riskVerifyShow.vue index a3ac9ec..663f339 100644 --- a/pages/apply/subPages/SK/riskVerifyShow.vue +++ b/pages/apply/subPages/SK/riskVerifyShow.vue @@ -62,7 +62,7 @@ --> - + @@ -71,7 +71,7 @@ - + + + + + @@ -96,10 +101,10 @@ 附件: - + @@ -256,6 +261,14 @@ this.model.CONTEXT = res.CONTEXT ? res.CONTEXT : '' this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME, 'yyyy-mm-dd') + let ReasonsNAME = '' + if (res.Nav_Reasons && res.Nav_Reasons.length > 0) { + for (let i = 0; i < res.Nav_Reasons.length; i++) { + ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + res + .Nav_Reasons[i].Nav_Reason.NAME; + } + } + this.model.ReasonsNAME = ReasonsNAME 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.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';