From 1df02afb7a2b0eb0529c105f20b71b7392defddf Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Thu, 11 Jun 2026 13:36:36 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apply/subPages/SK/riskRectifyEditNew.vue | 4 +- .../subPages/SK/riskRectifyRecordEditNew.vue | 4 +- .../subPages/SK/riskRectifyRecordShow.vue | 6 +- pages/apply/subPages/SK/riskRectifyShow.vue | 4 +- pages/apply/subPages/SK/riskReportEditNew.vue | 4 +- pages/apply/subPages/SK/riskReportShow.vue | 4 +- pages/apply/subPages/SK/riskVerifyEditNew.vue | 56 +++++++++---------- pages/apply/subPages/SK/riskVerifyShow.vue | 8 +-- .../subPages/SK/safeCheckRecordEditNew.vue | 4 +- .../apply/subPages/SK/safeCheckRecordShow.vue | 4 +- .../SK/safeCheckRecordSummaryEditNew.vue | 4 +- .../SK/safeCheckRecordSummaryShow.vue | 4 +- 12 files changed, 52 insertions(+), 54 deletions(-) diff --git a/pages/apply/subPages/SK/riskRectifyEditNew.vue b/pages/apply/subPages/SK/riskRectifyEditNew.vue index 4adc0f2..28e8ff5 100644 --- a/pages/apply/subPages/SK/riskRectifyEditNew.vue +++ b/pages/apply/subPages/SK/riskRectifyEditNew.vue @@ -122,9 +122,9 @@ - - + + diff --git a/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue b/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue index 36259ae..d4ecf5d 100644 --- a/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue +++ b/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue @@ -99,9 +99,9 @@ - - + + diff --git a/pages/apply/subPages/SK/riskRectifyRecordShow.vue b/pages/apply/subPages/SK/riskRectifyRecordShow.vue index fe3da2b..d4f9f8a 100644 --- a/pages/apply/subPages/SK/riskRectifyRecordShow.vue +++ b/pages/apply/subPages/SK/riskRectifyRecordShow.vue @@ -100,9 +100,9 @@ - - - + + + diff --git a/pages/apply/subPages/SK/riskRectifyShow.vue b/pages/apply/subPages/SK/riskRectifyShow.vue index ed76b0e..522a225 100644 --- a/pages/apply/subPages/SK/riskRectifyShow.vue +++ b/pages/apply/subPages/SK/riskRectifyShow.vue @@ -105,9 +105,9 @@ - - + + diff --git a/pages/apply/subPages/SK/riskReportEditNew.vue b/pages/apply/subPages/SK/riskReportEditNew.vue index 241e96b..6d7be34 100644 --- a/pages/apply/subPages/SK/riskReportEditNew.vue +++ b/pages/apply/subPages/SK/riskReportEditNew.vue @@ -125,9 +125,9 @@ - - + + diff --git a/pages/apply/subPages/SK/riskReportShow.vue b/pages/apply/subPages/SK/riskReportShow.vue index 716a863..58103a8 100644 --- a/pages/apply/subPages/SK/riskReportShow.vue +++ b/pages/apply/subPages/SK/riskReportShow.vue @@ -102,9 +102,9 @@ - - + + diff --git a/pages/apply/subPages/SK/riskVerifyEditNew.vue b/pages/apply/subPages/SK/riskVerifyEditNew.vue index 4d7e803..cdacb80 100644 --- a/pages/apply/subPages/SK/riskVerifyEditNew.vue +++ b/pages/apply/subPages/SK/riskVerifyEditNew.vue @@ -12,7 +12,7 @@ - + @@ -27,14 +27,12 @@ - - + + - - - + + + @@ -73,10 +71,10 @@ - + - + Date: Mon, 15 Jun 2026 16:24:26 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E8=BE=A8=E8=AF=86=E4=B8=8E=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/riskSafeRecEdit.vue | 255 ++++++++++++++++---- 1 file changed, 212 insertions(+), 43 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeRecEdit.vue b/pages/apply/subPages/SK/riskSafeRecEdit.vue index 14a89b1..6216639 100644 --- a/pages/apply/subPages/SK/riskSafeRecEdit.vue +++ b/pages/apply/subPages/SK/riskSafeRecEdit.vue @@ -37,6 +37,14 @@ --> + + + + + + + + 附件： @@ -47,11 +55,7 @@ 辨识与评估确认 --> - - - - - + @@ -62,7 +66,7 @@ - + @@ -76,8 +80,9 @@ - - 提交 + + + 提交 @@ -85,7 +90,9 @@ - + + @@ -116,6 +123,7 @@ } from '../../../../services/apply/subPages/SK/SKServices.js' import { getRequest, + getRequestOrderPage } from '../../../../services/apply/FOServices/FOServices'; import stepTitle from '@/components/custom/step-title.vue' import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem'; @@ -135,6 +143,19 @@ showPopupStep: false, stepLists: [], curTotalStep: 0, + selectorInfo: { + name: 'user', + isMultiple: false, + showPopup: false, + totalCount: 0, + title: '考核结果选择', + dataItem: {}, + index: 0, + columns: [], + dataLists: [], + defaultText: '', + defaultChecked: [] + }, dataModel: { YEAR: '', START_DATE: '', @@ -212,6 +233,10 @@ const orgId = uni.getStorageSync('orgId') const json = initFilter(orgId, "", "") extendRule(json, 'ID', 1, this.ID); + extendInclude(json, 'Nav_Requires'); + extendInclude(json, 'Nav_Requires.Nav_Require'); + extendInclude(json, 'Nav_Evaluations'); + extendInclude(json, 'Nav_Evaluations.Nav_Evaluation'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Details'); extendInclude(json, 'Nav_Details.Nav_Department'); @@ -221,24 +246,45 @@ EvaluationPlanGet(json).then(res => { this.dataModel = res; 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.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd'), - this.dataModel.Nav_Details.map((item, index) => { - let arr = item.Nav_DetailUsers.map((item1, index1) => { - if (!item1.Nav_User.IS_DELETED) { - return ' ' + item1.Nav_User.NAME - } - - }) - item['userlist'] = String(arr) + 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.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd') + 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 + let Nav_EvaluationsName = '' + if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) { + this.dataModel.Nav_Evaluations.map(item => { + if (item.Nav_Evaluation.NAME !== null) { + Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' '; + } + }) + } + this.dataModel.Nav_EvaluationsName = Nav_EvaluationsName + this.dataModel.Nav_Details.map((item, index) => { + let arr = item.Nav_DetailUsers.map((item1, index1) => { + if (!item1.Nav_User.IS_DELETED) { + return ' ' + item1.Nav_User.NAME + } + + }) + item['userlist'] = String(arr) + }) }) } }, handleNewCheckContent() { this.dataModel.Nav_Details.unshift({ + IS_DELETED: false, + ID:guid(), + IDENTIFY_EVALUATION_PLAN_ID:this.ID, Nav_Department: { NAME: '' }, @@ -251,19 +297,9 @@ this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] }, - handleDelRowBefore(index) { - this.showDelModalIndex = index - this.nowIndex = index - - - }, - confirmDel() { - this.dataModel.Nav_Details.splice(this.nowIndex, 1) - this.showDelModalIndex = undefined - - }, - cacelDel() { - this.showDelModalIndex = undefined + handleDelRowBefore(item) { + item.IS_DELETED = true + this.$forceUpdate() }, cancelRecitifyDate() { this.showPopupRecitifyDate = false @@ -371,6 +407,144 @@ }) } }, + async handleShowSheet(p) { + const orgId = uni.getStorageSync('orgId') + const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1) + let dataSelect = [] + // this.selectorInfo.defaultChecked = [] + var defaultChecked = [] + this.selectorInfo.isMultiple = false + if (p.val) { + extendRule(json, 'NAME', 9, p.val); + } + json.Limit = 20 + if (p.pageIndex) { + json.Start = (p.pageIndex - 1) * json.Limit; + } + json.Sort = "NAME" + json.SelectField = ["ID", "NAME", "NAME"] + if (p.name == "Nav_Requires") { + this.selectorInfo.isMultiple = true + dataSelect = await getRequestOrderPage(json, "/SK/Request/OrderPaged").then(res => { + this.selectorInfo.totalCount = res.TotalCount + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.length; i++) { + res[i].name = res.Data[i].NAME + res[i].code = res.Data[i].CODE + } + } + return res.Data + }) + if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) { + // this.selectorInfo.defaultChecked = [] + this.dataModel.Nav_Requires.filter(i => !i.IS_DELETED).forEach(e => { + if (e.Nav_Require != null && e.Nav_Require.NAME != null) + defaultChecked.push(e.Nav_Require) + }) + } else { + defaultChecked = null + } + } else if (p.name == "Nav_Evaluations") { + this.selectorInfo.isMultiple = true + dataSelect = await getRequestOrderPage(json, "/SK/Evaluation/OrderPaged").then(res => { + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.length; i++) { + res[i].name = res.Data[i].NAME + res[i].code = res.Data[i].CODE + } + } + return res.Data + }) + if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) { + // this.selectorInfo.defaultChecked = [] + this.dataModel.Nav_Evaluations.filter(i => !i.IS_DELETED).forEach(e => { + if (e.Nav_Evaluation != null && e.Nav_Evaluation.NAME != null) + defaultChecked.push(e.Nav_Evaluation) + }) + } else { + defaultChecked = null + } + } + if (defaultChecked == null) + defaultChecked = [] + if (dataSelect.length) { + this.selectorInfo = { + itemData: p.itemData != undefined ? p.itemData : this.selectorInfo + .itemData, //itemData: p.itemData, 搜索的时候 p.itemData为空 赋值修改 为 她自己本身 this.selectorInfo.itemData + isMultiple: this.selectorInfo.isMultiple, + totalCount: this.selectorInfo.totalCount, + showPopup: true, + title: p.title, + name: p.name, + dataLists: dataSelect, + defaultChecked: defaultChecked + } + } else { + // 暂无数据 + } + }, + //数据加载 + handleSearch(val, pageIndex) { + var p = { + name: this.selectorInfo.name, + title: this.selectorInfo.title, + val: val, + pageIndex: pageIndex, + index: this.selectorInfo.index + } + this.handleShowSheet(p) + }, + + handleSelected(e) { + this.selectorInfo.showPopup = false + if (this.selectorInfo.name == 'Nav_Requires') { + let listArea = [] + let areaShow = '' + if (e.length > 0) { + e.forEach((item, i) => { + if (item.name != null || item.NAME != null) { + if (i > 0) { + areaShow += ' ' + } + listArea.push({ + ID: guid(), + IDENTIFY_EVALUATION_PLAN_ID: this.ID, + REQUIRE_ID: item.ID, + ORG_ID: item.ORG_ID, + Nav_Require: item + }) + areaShow += item.NAME + } + }) + } + this.dataModel.Nav_Requires = listArea + this.dataModel.Nav_RequiresName = areaShow + } else if (this.selectorInfo.name == 'Nav_Evaluations') { + let listArea = [] + let areaShow = '' + if (e.length > 0) { + e.forEach((item, i) => { + if (item.name != null || item.NAME != null) { + if (i > 0) { + areaShow += ' ' + } + listArea.push({ + ID: guid(), + IDENTIFY_EVALUATION_PLAN_ID: this.ID, + EVALUATION_ID: item.ID, + ORG_ID: item.ORG_ID, + Nav_Evaluation: item + }) + areaShow += item.NAME + } + }) + } + this.dataModel.Nav_Evaluations = listArea + this.dataModel.Nav_EvaluationsName = areaShow + } + + + }, submit() { if (!this.dataModel.CONTENTS) { @@ -396,16 +570,11 @@ return } } - let arr = ['DEPARTMENT_ID', 'ENTITY_ORG_TPYE', 'Nav_DetailUsers', 'ID', 'IDENTIFY_EVALUATION_PLAN_ID', 'ORG_ID'] - this.model = { - YEAR: this.dataModel.YEAR, - START_DATE: this.dataModel.START_DATE, - END_DATE: this.dataModel.END_DATE, - EVALUATION_END_DATE: this.dataModel.EVALUATION_END_DATE, - CONTENTS: this.dataModel.CONTENTS, - ORG_ID: this.ORG_ID, - Nav_Files: this.dataModel.Nav_Files, - Nav_Details: handleOriginalArray(this.dataModel.Nav_Details, arr) + this.model = this.dataModel + if(this.model.Nav_Details&&this.model.Nav_Details.length>0){ + this.model.Nav_Details.map(item=>{ + delete item.Nav_Department + }) } this.model.ID = this.ID this.model.TaskID = this.TaskID From 394ae82ffd8b19dad823390e03eef6d6072bd83b Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 15 Jun 2026 16:44:50 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E8=BE=A8=E8=AF=86=E4=B8=8E=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/riskSafeRecShow.vue | 54 ++++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeRecShow.vue b/pages/apply/subPages/SK/riskSafeRecShow.vue index 3785f03..e359b49 100644 --- a/pages/apply/subPages/SK/riskSafeRecShow.vue +++ b/pages/apply/subPages/SK/riskSafeRecShow.vue @@ -49,6 +49,14 @@ --> + + + + + + + + 附件： @@ -204,6 +212,10 @@ const orgId = uni.getStorageSync('orgId') const json = initFilter(orgId, "", "") extendRule(json, 'ID', 1, this.model.ID); + extendInclude(json, 'Nav_Requires'); + extendInclude(json, 'Nav_Requires.Nav_Require'); + extendInclude(json, 'Nav_Evaluations'); + extendInclude(json, 'Nav_Evaluations.Nav_Evaluation'); extendInclude(json, 'Nav_ApplyUser'); extendInclude(json, 'Nav_ApplyDepartment'); extendInclude(json, 'Nav_Details'); @@ -216,19 +228,37 @@ EvaluationPlanGet(json).then(res => { this.dataModel = res; this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2 - this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd'), - 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.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd'), - this.dataModel.Nav_Details.map((item, index) => { - let arr = item.Nav_DetailUsers.map((item1, index1) => { - if (!item1.Nav_User.IS_DELETED) { - return ' ' + item1.Nav_User.NAME - } - - }) - item['userlist'] = String(arr) + this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd') + 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.EVALUATION_END_DATE = uni.$u.timeFormat(res.EVALUATION_END_DATE, 'yyyy-mm-dd') + 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 + let Nav_EvaluationsName = '' + if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) { + this.dataModel.Nav_Evaluations.map(item => { + if (item.Nav_Evaluation.NAME !== null) { + Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' '; + } + }) + } + this.dataModel.Nav_EvaluationsName = Nav_EvaluationsName + this.dataModel.Nav_Details.map((item, index) => { + let arr = item.Nav_DetailUsers.map((item1, index1) => { + if (!item1.Nav_User.IS_DELETED) { + return ' ' + item1.Nav_User.NAME + } + + }) + item['userlist'] = String(arr) + }) }) this.isLoadOK = true 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 05/33] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E8=BE=A8=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 From ef2baad230bf18148ce255837f5e0dcec5fa7e9b Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 22 Jun 2026 14:34:27 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E5=8E=BB=E9=99=A4index=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E7=94=A8item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/riskSafeIdenEdit.vue | 72 +++++++++++--------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue index c4bbe9a..6641073 100644 --- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue +++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue @@ -59,18 +59,18 @@ - + {{index+1+'.辨识区域：'+item.Nav_Area?item.Nav_Area.NAME:''}} - - + + - + @@ -89,7 +89,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -346,16 +346,17 @@ }) }, - handlePack(index) { - this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false - this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] + handlePack(item) { + item.showPack = item.showPack == false ? true : false + this.$forceUpdate() }, cancelUnit() { this.showPopupUnit = false }, - handleChangeUnit(index, name) { - this.nowIndex = [index, name] + handleChangeUnit(item, name) { + this.nowItem = item + this.nowName = name if (name == 'MinType') { const json = initFilter(this.ORG_ID) getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => { @@ -368,12 +369,12 @@ this.showPopupUnit = true }, confirmUnit(e) { - if (this.nowIndex[1] == 'MinType') { - this.dataModel.Nav_Details[this.nowIndex[0]].Nav_ProductionUnit = e.value[0] - this.dataModel.Nav_Details[this.nowIndex[0]].PRODUCTION_UNIT_ID = e.value[0].ID + if (this.nowName == 'MinType') { + this.nowItem.Nav_ProductionUnit = e.value[0] + this.nowItem.PRODUCTION_UNIT_ID = e.value[0].ID } else { - this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0].code - this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS_NAME = e.value[0].name + this.nowItem.ENABLE_STATUS = e.value[0].code + this.nowItem.ENABLE_STATUS_NAME = e.value[0].name } this.showPopupUnit = false }, @@ -449,6 +450,7 @@ }, // 新增处理企业库选择结果的方法 handleEnterpriseSelection(selectedItems) { + console.log(selectedItems, '999') if (!selectedItems || selectedItems.length === 0) return const newDetails = [] @@ -470,6 +472,11 @@ }) return } + const convertedMeasures = (enterpriseItem.Nav_Details || []) + .map((item, index) => ({ + ...item, + MEASURE: item.MEASURES_NAME, // 措施名称 + })) const convertedItem = { showPack: false, @@ -486,12 +493,14 @@ Nav_RiskName: enterpriseItem.Nav_RiskName || { NAME: '' }, + Nav_DetailMeasures: convertedMeasures, RISK_DESCRIPTION: enterpriseItem.RISK_DESCRIPTION || '', TYPE_ID: enterpriseItem.TYPE_ID || '', Nav_Type: enterpriseItem.Nav_Type || { NAME: '' }, MEASURE: enterpriseItem.MEASURE || '', + EMERGENCY: enterpriseItem.EMERGENCY || '', ENABLE_STATUS: this.enumsData['SKEnableStatusEnum'][0].code, ENABLE_STATUS_NAME: this.enumsData['SKEnableStatusEnum'][0].name, @@ -589,10 +598,11 @@ this.showPopupRecitifyDate = false }, - handleChangeStep(index, name) { + handleChangeStep(item, name) { this.currentOperateStep = {} this.showPopupStep = true - this.nowIndex = [index, name] + this.nowItem = item + this.nowName = name this.handleSearchStep('init') }, handleClosePopupStep() { @@ -600,7 +610,7 @@ // this.showPopupCertificate = false }, handleSearchStep(val, pageIndex) { - let requestInfo = this.nowIndex[1] == 'demand' ? GetSKRequestInfo : this.nowIndex[1] == 'Area' ? GetNewRiskAreaInfo : this.nowIndex[1] == 'RiskName' ? GetRiskNameInfo : GetRiskTypeInfo + let requestInfo = this.nowName == 'demand' ? GetSKRequestInfo : this.nowName == 'Area' ? GetRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : GetRiskTypeInfo const orgId = uni.getStorageSync('orgId') const json = initFilter(orgId, "", "", 0, pageIndex ?? 1) @@ -629,19 +639,19 @@ }, handleSelectedStep(val) { - if (this.nowIndex[1] == 'demand') { + if (this.nowName == 'demand') { this.dataModel.Nav_Require.NAME = val.NAME this.dataModel.REQUIRE_ID = val.ID this.dataModel.RequireName = val.NAME - } else if (this.nowIndex[1] == 'Area') { - this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME - this.dataModel.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID - } else if (this.nowIndex[1] == 'RiskName') { - this.dataModel.Nav_Details[this.nowIndex[0]].Nav_RiskName.NAME = val.NAME - this.dataModel.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID + } else if (this.nowName == 'Area') { + this.nowItem.Nav_Area.NAME = val.NAME + this.nowItem.AREA_ID = val.ID + } else if (this.nowName == 'RiskName') { + this.nowItem.Nav_RiskName.NAME = val.NAME + this.nowItem.RISK_NAME_ID = val.ID } else { - this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME - this.dataModel.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID + this.nowItem.Nav_Type.NAME = val.NAME + this.nowItem.TYPE_ID = val.ID } this.showPopupStep = false @@ -657,7 +667,7 @@ }) return } - if (!item.Nav_Area ||!item.Nav_Area.NAME) { + if (!item.Nav_Area || !item.Nav_Area.NAME) { uni.showToast({ title: '顺序' + i + '辨识区域不能为空', icon: 'none' @@ -685,7 +695,7 @@ }) return } - if (!item.Nav_Type ||!item.Nav_Type.NAME) { + if (!item.Nav_Type || !item.Nav_Type.NAME) { uni.showToast({ title: '顺序' + i + '风险类别不能为空', icon: 'none' @@ -704,7 +714,7 @@ this.model.PUBLISH = "SaveAndNotify"; delete this.model.Nav_ApplyDepartment delete this.model.Nav_ApplyUser - this.model.Nav_Details.map(item=>{ + this.model.Nav_Details.map(item => { delete item.Nav_ProductionUnit delete item.Nav_Type }) From ecab6390f95bdab209d3b16f59ea1d412ef3ce82 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 22 Jun 2026 14:35:42 +0800 Subject: [PATCH 07/33] 1 --- pages/apply/subPages/SK/riskSafeRecEdit.vue | 24 +++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeRecEdit.vue b/pages/apply/subPages/SK/riskSafeRecEdit.vue index 6216639..e5ade32 100644 --- a/pages/apply/subPages/SK/riskSafeRecEdit.vue +++ b/pages/apply/subPages/SK/riskSafeRecEdit.vue @@ -58,7 +58,7 @@ - + {{'部门 : ' +item.Nav_Department.NAME}} @@ -70,7 +70,7 @@ - + @@ -325,10 +325,10 @@ this.showPopupRecitifyDate = false }, - handleChangeStep(index) { + handleChangeStep(item) { this.currentOperateStep = {} this.showPopupStep = true - this.nowIndex = index + this.nowIndex = item this.handleSearchStep('init') }, handleClosePopupStep() { @@ -362,16 +362,13 @@ }) }, handleSelectedStep(val) { - this.dataModel.Nav_Details[this.nowIndex].DEPARTMENT_ID = val.ID - this.dataModel.Nav_Details[this.nowIndex].Nav_Department.NAME = val.NAME + this.nowIndex.DEPARTMENT_ID = val.ID + this.nowIndex.Nav_Department.NAME = val.NAME this.showPopupStep = false }, handleSelectorPeople(e) { - const { - index: key - } = this.peopleSelectOption - this.dataModel.Nav_Details[key].Nav_DetailUsers = e.map(i => { + this.peopleSelectOption.value.Nav_DetailUsers = e.map(i => { return { USER_ID: i.USER_ID, IS_DELETED: i.IS_DELETED, @@ -384,18 +381,17 @@ } }) let arr = '' - this.dataModel.Nav_Details[key].Nav_DetailUsers.map(item => { + this.peopleSelectOption.value.Nav_DetailUsers.map(item => { if (!item.IS_DELETED) { arr += ' ' + item.Nav_User.NAME } }) - this.dataModel.Nav_Details[key].userlist = String(arr) + this.peopleSelectOption.value.userlist = String(arr) }, - handleShowUserSelector(item, index) { + handleShowUserSelector(item) { this.peopleSelectOption = { showSelector: true, value: item, - index, depId: item.DEPARTMENT_ID, defaultChecked: item.Nav_DetailUsers.map(i => { return { From 8cc2c550da939725b4d5c9bdf32d4156f1c06242 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 22 Jun 2026 15:13:07 +0800 Subject: [PATCH 08/33] 1 --- pages/apply/subPages/SK/riskSafeIdenEdit.vue | 2 +- pages/apply/subPages/SK/riskSafeIdenShow.vue | 2 +- pages/apply/subPages/SK/riskSafeRecEdit.vue | 2 +- pages/apply/subPages/SK/riskSafeRecShow.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue index 6641073..f5e9f21 100644 --- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue +++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue @@ -330,7 +330,7 @@ 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) { + if (item.Nav_Require&&item.Nav_Require.NAME !== null) { Nav_RequiresName += item.Nav_Require.NAME + ' '; } }) diff --git a/pages/apply/subPages/SK/riskSafeIdenShow.vue b/pages/apply/subPages/SK/riskSafeIdenShow.vue index e3a7e39..f12a806 100644 --- a/pages/apply/subPages/SK/riskSafeIdenShow.vue +++ b/pages/apply/subPages/SK/riskSafeIdenShow.vue @@ -295,7 +295,7 @@ 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) { + if (item.Nav_Require&&item.Nav_Require.NAME !== null) { Nav_RequiresName += item.Nav_Require.NAME + ' '; } }) diff --git a/pages/apply/subPages/SK/riskSafeRecEdit.vue b/pages/apply/subPages/SK/riskSafeRecEdit.vue index e5ade32..24ed43b 100644 --- a/pages/apply/subPages/SK/riskSafeRecEdit.vue +++ b/pages/apply/subPages/SK/riskSafeRecEdit.vue @@ -252,7 +252,7 @@ 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) { + if (item.Nav_Require&&item.Nav_Require.NAME !== null) { Nav_RequiresName += item.Nav_Require.NAME + ' '; } }) diff --git a/pages/apply/subPages/SK/riskSafeRecShow.vue b/pages/apply/subPages/SK/riskSafeRecShow.vue index e359b49..778cbaf 100644 --- a/pages/apply/subPages/SK/riskSafeRecShow.vue +++ b/pages/apply/subPages/SK/riskSafeRecShow.vue @@ -235,7 +235,7 @@ 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) { + if (item.Nav_Require&&item.Nav_Require.NAME !== null) { Nav_RequiresName += item.Nav_Require.NAME + ' '; } }) From 5182716ca7c3c2390bd401e750c450fa641093e4 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 22 Jun 2026 15:14:49 +0800 Subject: [PATCH 09/33] 1 --- pages/apply/subPages/SK/riskSafeRecEdit.vue | 4 ++-- pages/apply/subPages/SK/riskSafeRecShow.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeRecEdit.vue b/pages/apply/subPages/SK/riskSafeRecEdit.vue index 24ed43b..cc483f4 100644 --- a/pages/apply/subPages/SK/riskSafeRecEdit.vue +++ b/pages/apply/subPages/SK/riskSafeRecEdit.vue @@ -261,7 +261,7 @@ let Nav_EvaluationsName = '' if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) { this.dataModel.Nav_Evaluations.map(item => { - if (item.Nav_Evaluation.NAME !== null) { + if (item.Nav_Evaluation&&item.Nav_Evaluation.NAME !== null) { Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' '; } }) @@ -269,7 +269,7 @@ this.dataModel.Nav_EvaluationsName = Nav_EvaluationsName this.dataModel.Nav_Details.map((item, index) => { let arr = item.Nav_DetailUsers.map((item1, index1) => { - if (!item1.Nav_User.IS_DELETED) { + if (item1.Nav_User&&!item1.Nav_User.IS_DELETED) { return ' ' + item1.Nav_User.NAME } diff --git a/pages/apply/subPages/SK/riskSafeRecShow.vue b/pages/apply/subPages/SK/riskSafeRecShow.vue index 778cbaf..0ff5da5 100644 --- a/pages/apply/subPages/SK/riskSafeRecShow.vue +++ b/pages/apply/subPages/SK/riskSafeRecShow.vue @@ -244,7 +244,7 @@ let Nav_EvaluationsName = '' if (this.dataModel.Nav_Evaluations && this.dataModel.Nav_Evaluations.length > 0) { this.dataModel.Nav_Evaluations.map(item => { - if (item.Nav_Evaluation.NAME !== null) { + if (item.Nav_Evaluation&&item.Nav_Evaluation.NAME !== null) { Nav_EvaluationsName += item.Nav_Evaluation.NAME + ' '; } }) @@ -252,7 +252,7 @@ this.dataModel.Nav_EvaluationsName = Nav_EvaluationsName this.dataModel.Nav_Details.map((item, index) => { let arr = item.Nav_DetailUsers.map((item1, index1) => { - if (!item1.Nav_User.IS_DELETED) { + if (item1.Nav_User&&!item1.Nav_User.IS_DELETED) { return ' ' + item1.Nav_User.NAME } From 0761ee0bb849b0e68fb5e51ab5b02b581f97e719 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 23 Jun 2026 13:47:01 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/riskSafeIdenEdit.vue | 4 ++-- pages/apply/subPages/SK/riskSafeIdenShow.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue index f5e9f21..8a23a23 100644 --- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue +++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue @@ -60,7 +60,7 @@ - {{index+1+'.辨识区域：'+item.Nav_Area?item.Nav_Area.NAME:''}} + {{index+1+'.辨识区域：'+item.Nav_Area.NAME}} @@ -610,7 +610,7 @@ // this.showPopupCertificate = false }, handleSearchStep(val, pageIndex) { - let requestInfo = this.nowName == 'demand' ? GetSKRequestInfo : this.nowName == 'Area' ? GetRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : GetRiskTypeInfo + let requestInfo = this.nowName == 'demand' ? GetSKRequestInfo : this.nowName == 'Area' ? GetNewRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : GetRiskTypeInfo const orgId = uni.getStorageSync('orgId') const json = initFilter(orgId, "", "", 0, pageIndex ?? 1) diff --git a/pages/apply/subPages/SK/riskSafeIdenShow.vue b/pages/apply/subPages/SK/riskSafeIdenShow.vue index f12a806..7db32af 100644 --- a/pages/apply/subPages/SK/riskSafeIdenShow.vue +++ b/pages/apply/subPages/SK/riskSafeIdenShow.vue @@ -56,7 +56,7 @@ - {{index+1+'.辨识区域：'+item.Nav_Area?item.Nav_Area.NAME:''}} + {{index+1+'.辨识区域：'+item.Nav_Area.NAME}} From 3ae2895d9e0799d364fdfc57879ac07f5f174699 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Wed, 24 Jun 2026 17:01:58 +0800 Subject: [PATCH 11/33] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=B1=87=E6=80=BB=E8=A1=A8=E3=80=81=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SK/SK003Show.vue | 159 ++-- pages/apply/subPages/SK/riskSafeIdenEdit.vue | 2 +- .../apply/subPages/SK/riskSafeIdenResEdit.vue | 695 ++++++++++++++---- .../apply/subPages/SK/riskSafeIdenResShow.vue | 127 +++- .../apply/subPages/SK/riskSafeIdenSumShow.vue | 132 +++- 5 files changed, 825 insertions(+), 290 deletions(-) diff --git a/pages/apply/subPages/SK/SK003Show.vue b/pages/apply/subPages/SK/SK003Show.vue index 0346229..bbfacae 100644 --- a/pages/apply/subPages/SK/SK003Show.vue +++ b/pages/apply/subPages/SK/SK003Show.vue @@ -249,87 +249,96 @@ }) }, loadData() { - // const json = {} - const orgId = uni.getStorageSync('orgId') - const json = initFilter(orgId, "", "") - extendRule(json, 'ID', 1, this.model.ID); - extendRule(json, 'TASK_ID', 1, this.TaskID); - extendIgnoreDataRule(json) - GetSKEnterpriseLibraryRecord(json).then(res => { - this.stepLoad = false - this.model = res; - this.model.ID = this.ID - this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : ''; - this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : ''; - if (this.model.Nav_Departs && this.model.Nav_Departs.length > 0) { - this.model.Nav_Departs.map(item => { - item.DEPARTMENT_TYPEName = item.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item1 => item1.code === item.DEPARTMENT_TYPE).name : ''; - }) - } - if (this.model.Nav_Posts && this.model.Nav_Posts.length > 0) { - this.model.Nav_Posts.map(item1 => { //辨识岗位 - if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) { - let areaShow = '' - item1.Nav_PostDetails.map(o => { - areaShow += o.Nav_Post.NAME + ' ' - }) - item1['Nav_PostDetailsName'] = areaShow - } else { - item1['Nav_PostDetailsName'] = '' - } - }) - } - if (this.model.Nav_Details && this.model.Nav_Details.length > 0) { - this.model.Nav_Details.map(item => { - if (item.Nav_DetailContents && item.Nav_DetailContents.length > 0) { - item.Nav_DetailContents.map(item1 => { - if (item1.Nav_DetailBasics && item1.Nav_DetailBasics.length > 0) { - let areaShow = '' - item1.Nav_DetailBasics.map(o => { - areaShow += o.Nav_Law.NAME + ' ' - }) - item1['Nav_DetailBasicsName'] = areaShow - } else { - item1['Nav_DetailBasicsName'] = '' - } - if (item1.Nav_DetailHiddens && item1.Nav_DetailHiddens.length > 0) { - item1.Nav_DetailHiddens.map(item2 => { - item2.HIDDEN_LEVELName = item2.HIDDEN_LEVEL !== undefined ? (item2.HIDDEN_LEVEL == 0 ? '一般' : '重大') : ''; - }) - } - if (item1.Nav_DetailDeparts && item1.Nav_DetailDeparts.length > 0) { - item1.Nav_DetailDeparts.map(item2 => { - const checkTypeItem = item2.CHECK_TYPE !== undefined ? - this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === item2.CHECK_TYPE) : - null; - item2.CHECK_TYPEName = checkTypeItem ? checkTypeItem.name : ''; + const json1 = initFilter(this.ORG_ID) + extendRule(json1, 'ID', 1, this.model.ID); + getRequest(json1, "/SK/SKRiskIdentifyResult/GetDetail").then(res => { + const orgId = uni.getStorageSync('orgId') + const json = initFilter(orgId, "", "") + extendRule(json, 'PRODUCTION_UNIT_ID', 1, res.PRODUCTION_UNIT_ID); + extendRule(json, 'AREA_ID', 1, res.AREA_ID); + extendRule(json, 'TYPE_ID', 1, res.TYPE_ID); + extendRule(json, 'RISK_NAME', 1, res.RISK_NAME); + extendRule(json, 'RISK_DESCRIPTION', 1, res.RISK_DESCRIPTION); - const cycleItem = item2.CHECK_CYCLE !== undefined ? - this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === item2.CHECK_CYCLE) : - null; - item2.CHECK_CYCLEName = cycleItem ? cycleItem.name : ''; - if (item2.Nav_DetailPosts && item2.Nav_DetailPosts.length > 0) { - let areaShow = '' - item2.Nav_DetailPosts.map(o => { - areaShow += o.Nav_Post.NAME + ' ' - }) - item2['Nav_DetailPostsName'] = areaShow - } else { - item2['Nav_DetailPostsName'] = '' - } - }) - } - }) - } + extendIgnoreDataRule(json) + GetSKEnterpriseLibraryRecord(json).then(res => { + this.stepLoad = false + this.model = res; + this.model.ID = this.ID + this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : ''; + this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : ''; + if (this.model.Nav_Departs && this.model.Nav_Departs.length > 0) { + this.model.Nav_Departs.map(item => { + item.DEPARTMENT_TYPEName = item.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item1 => item1.code === item.DEPARTMENT_TYPE).name : ''; + }) + } + if (this.model.Nav_Posts && this.model.Nav_Posts.length > 0) { + this.model.Nav_Posts.map(item1 => { //辨识岗位 + if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) { + let areaShow = '' + item1.Nav_PostDetails.map(o => { + areaShow += o.Nav_Post.NAME + ' ' + }) + item1['Nav_PostDetailsName'] = areaShow + } else { + item1['Nav_PostDetailsName'] = '' + } + }) + } + if (this.model.Nav_Details && this.model.Nav_Details.length > 0) { + this.model.Nav_Details.map(item => { + if (item.Nav_DetailContents && item.Nav_DetailContents.length > 0) { + item.Nav_DetailContents.map(item1 => { + if (item1.Nav_DetailBasics && item1.Nav_DetailBasics.length > 0) { + let areaShow = '' + item1.Nav_DetailBasics.map(o => { + areaShow += o.Nav_Law.NAME + ' ' + }) + item1['Nav_DetailBasicsName'] = areaShow + } else { + item1['Nav_DetailBasicsName'] = '' + } + if (item1.Nav_DetailHiddens && item1.Nav_DetailHiddens.length > 0) { + item1.Nav_DetailHiddens.map(item2 => { + item2.HIDDEN_LEVELName = item2.HIDDEN_LEVEL !== undefined ? (item2.HIDDEN_LEVEL == 0 ? '一般' : '重大') : ''; + }) + } + if (item1.Nav_DetailDeparts && item1.Nav_DetailDeparts.length > 0) { + item1.Nav_DetailDeparts.map(item2 => { + const checkTypeItem = item2.CHECK_TYPE !== undefined ? + this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === item2.CHECK_TYPE) : + null; + item2.CHECK_TYPEName = checkTypeItem ? checkTypeItem.name : ''; + + const cycleItem = item2.CHECK_CYCLE !== undefined ? + this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === item2.CHECK_CYCLE) : + null; + item2.CHECK_CYCLEName = cycleItem ? cycleItem.name : ''; + if (item2.Nav_DetailPosts && item2.Nav_DetailPosts.length > 0) { + let areaShow = '' + item2.Nav_DetailPosts.map(o => { + areaShow += o.Nav_Post.NAME + ' ' + }) + item2['Nav_DetailPostsName'] = areaShow + } else { + item2['Nav_DetailPostsName'] = '' + } + }) + } + }) + } - }) - } + }) + } - this.stepsPage = res.STATUS == 0 ? 0 : 1 + this.stepsPage = res.STATUS == 0 ? 0 : 1 + }) + this.isLoadOK = true }) - this.isLoadOK = true + // const json = {} + }, gotoCheck(detailData) { uni.setStorageSync('detailData', detailData); diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue index 8a23a23..89220e9 100644 --- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue +++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue @@ -458,7 +458,7 @@ selectedItems.forEach(enterpriseItem => { // 检查是否与现有数据重复 - const isDuplicate = this.dataModel.Nav_Details.some(existingItem => + const isDuplicate = this.dataModel.Nav_Details.filter(i => !i.IS_DELETED).some(existingItem => existingItem.AREA_ID === (enterpriseItem.AREA_ID || '') && existingItem.PRODUCTION_UNIT_ID === (enterpriseItem.PRODUCTION_UNIT_ID || '') && existingItem.RISK_NAME === (enterpriseItem.RISK_NAME || '') diff --git a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue index 47d1204..05be688 100644 --- a/pages/apply/subPages/SK/riskSafeIdenResEdit.vue +++ b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue @@ -28,13 +28,9 @@ - - - - - + - + 附件： @@ -53,22 +49,22 @@ 辨识内容 - + - + {{index+1+'.辨识区域：'+item.Nav_Area.NAME}} - - - + + + - + @@ -78,64 +74,94 @@ - - - + + - - - - - - - - - - - - - - - - + + + + 新增管控措施 + + + + + + + + + + + + + + + + + + 新增辨识层级 + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + + + - - + + 新增检查区域 + 导入企业库内容 + 上一步 提交 - + + @@ -151,7 +177,8 @@ guid, initFilter, initFilterGroup, - handleOriginalArray + handleOriginalArray, + transformData } from '../../../../utils/common' import { FMProductionUnit, @@ -162,12 +189,18 @@ MineTypeIndex, MineTypeName } from '../../../../utils/enums.js' + import { + getEnum, + GetEnumAnyOrder + } from '../../../../services/common'; import { EvaIdentifyResGet, IdentifyResFullUpdate, getUserLists, GetSKRequestInfo, GetRiskAreaInfo, + GetDepartmentInfo, + GetPostOrderPaged, GetRiskTypeInfo, GetRiskNameInfo } from '../../../../services/apply/subPages/SK/SKServices.js' @@ -196,6 +229,19 @@ stepLoad: true, UnitLists: [], UnitDefaultIndex: [0], + selectorInfo: { + name: 'user', + isMultiple: false, + showPopup: false, + totalCount: 0, + title: '考核结果选择', + dataItem: {}, + index: 0, + columns: [], + dataLists: [], + defaultText: '', + defaultChecked: [] + }, dataModel: { YEAR: '', START_DATE: '', @@ -204,8 +250,8 @@ NAME: '' }, RequireName: '', - IDENTIFY_EVALUATION_PLAN_ID:null, - IDENTIFY_ID:null, + IDENTIFY_EVALUATION_PLAN_ID: null, + IDENTIFY_ID: null, Nav_Files: [], Nav_Details: [{ showPack: false, @@ -214,19 +260,15 @@ NAME: '' }, RISK_NAME: '', - Nav_RiskName: { - NAME: '' - }, RISK_DESCRIPTION: '', Nav_Type: { NAME: '' }, - DEPARTMENT_TYPE:'', - IDENTIFY_DEPARTMENT:'', - IDENTIFY_POST:'', + DEPARTMENT_TYPE: '', + IDENTIFY_DEPARTMENT: '', + IDENTIFY_POST: '', MEASURE: '', EMERGENCY: '', - ENABLE_STATUS: '', MARK: '', }] }, @@ -239,8 +281,8 @@ NAME: '' }, RequireName: '', - IDENTIFY_EVALUATION_PLAN_ID:null, - IDENTIFY_ID:null, + IDENTIFY_EVALUATION_PLAN_ID: null, + IDENTIFY_ID: null, Nav_Files: [], Nav_Details: [{ MineType: '', @@ -248,19 +290,15 @@ NAME: '' }, RISK_NAME: '', - Nav_RiskName: { - NAME: '' - }, RISK_DESCRIPTION: '', Nav_Type: { NAME: '' }, - DEPARTMENT_TYPE:'', - IDENTIFY_DEPARTMENT:'', - IDENTIFY_POST:'', + DEPARTMENT_TYPE: '', + IDENTIFY_DEPARTMENT: '', + IDENTIFY_POST: '', MEASURE: '', EMERGENCY: '', - ENABLE_STATUS: '', }] }, @@ -270,22 +308,39 @@ stepsPageList: 0, TaskID: '', nowName: '', + nowItem: '', nowIndex: 0, + enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表） + enumsText: {} // 存储枚举文本列表（用于下拉选择等场景） } }, onLoad(option) { this.TaskID = option.taskID ? option.taskID : ''; this.ID = option.ID ? option.ID : ''; - this.loadData() + this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']); }, 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') const json = initFilter(orgId, "", "") extendRule(json, 'ID', 1, this.ID); extendInclude(json, 'Nav_Require'); + extendInclude(json, 'Nav_Requires'); + extendInclude(json, 'Nav_Requires.Nav_Require'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Details'); extendInclude(json, 'Nav_Details.Nav_Area'); @@ -300,86 +355,278 @@ 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.RequireName = res.Nav_Require ? res.Nav_Require.NAME : { - NAME: '' - }, - this.dataModel.Nav_Require = res.Nav_Require ? 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 && 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.MARK = item.MARK == 0 ? '自动带出' : item.MARK == 10 ? '新增' : '修改' - item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { - NAME: ''} + item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : ''; + + if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) { + item.Nav_DetailPosts.map(item1 => { + item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : + ''; + if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) { + let Nav_ResultPostDetsName = '' + if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) { + item1.Nav_ResultPostDets.map(item2 => { + if (item2.Nav_Post && item2.Nav_Post.NAME !== null) { + Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' '; + } + }) + } + item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName + } + }) + + } }) this.stepLoad = false }) }, - handlePack(index) { - this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false - this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] + handleDelRowMeasures(item, item1) { + item1.IS_DELETED = true + this.$forceUpdate() + }, + handleDelRowPost(item, item1) { + item1.IS_DELETED = true + this.$forceUpdate() + }, + handleNewMeasures(item) { + item.Nav_DetailMeasures.unshift({ + NUM: 1, + ID: guid(), + RISK_IDENTIFY_DETAIL_ID: item.ID, + MEASURE: '', + IS_DELETED: false, + }) + }, + handleNewPost(item) { + item.Nav_DetailPosts.unshift({ + DEPARTMENT_TYPE: '', + ID: guid(), + RISK_IDENTIFY_DETAIL_ID: item.ID, + Nav_Department: { + NAME: '' + }, + DEPARTMENT_ID: '', + Nav_ResultPostDets: [], + IS_DELETED: false, + }) + }, + showDetail(id) { + uni.navigateTo({ + url: 'SK003Show?ID=' + id + '&taskID=' + this.TaskID + }) + }, + handlePack(item) { + item.showPack = item.showPack == false ? true : false + this.$forceUpdate() }, cancelUnit() { this.showPopupUnit = false }, - handleChangeUnit(index, name) { - this.nowIndex = [index, name] + handleChangeUnit(item, name) { + this.nowName = name + this.nowItem = item if (name == 'MinType') { const json = initFilter(this.ORG_ID) getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => { this.UnitLists = [res] }) - } else if (this.nowIndex[1] == 'ENABLE_STATUS') { - this.UnitLists = [SKEffective] } else { - this.UnitLists = [SKMarkEnum] + this.UnitLists = [this.enumsData[name]] } this.showPopupUnit = true }, confirmUnit(e) { - if (this.nowIndex[1] == 'MinType') { - this.dataModel.Nav_Details[this.nowIndex[0]].Nav_ProductionUnit = e.value[0] - this.dataModel.Nav_Details[this.nowIndex[0]].PRODUCTION_UNIT_ID = e.value[0].ID - } else if (this.nowIndex[1] == 'ENABLE_STATUS') { - this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0] + console.log(e, '999') + if (this.nowName == 'MinType') { + this.nowItem.Nav_ProductionUnit = e.value[0] + this.nowItem.PRODUCTION_UNIT_ID = e.value[0].ID } else { - this.dataModel.Nav_Details[this.nowIndex[0]].MARK = e.value[0] + this.nowItem.DEPARTMENT_TYPE = e.value[0].code + this.nowItem.DEPARTMENT_TYPE_NAME = e.value[0].name } this.showPopupUnit = false + }, + async handleShowSheet(p) { + const orgId = uni.getStorageSync('orgId') + const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1) + let dataSelect = [] + // this.selectorInfo.defaultChecked = [] + var defaultChecked = [] + this.selectorInfo.isMultiple = false + if (p.val) { + extendRule(json, 'NAME', 9, p.val); + } + json.Limit = 20 + if (p.pageIndex) { + json.Start = (p.pageIndex - 1) * json.Limit; + } + json.Sort = "NAME" + if (p.name == "Nav_Area") { + dataSelect = await GetRiskAreaInfo(json).then(res => { + console.log(res, '99') + this.selectorInfo.totalCount = res.TotalCount + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.Data.length; i++) { + res.Data[i].name = res.Data[i].NAME + } + } + return res.Data + }) + } else if (p.name == "Nav_Type") { + dataSelect = await GetRiskTypeInfo(json).then(res => { + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.Data.length; i++) { + res.Data[i].name = res.Data[i].NAME + } + } + return res.Data + }) + } else if (p.name == "Nav_Department") { + dataSelect = await GetDepartmentInfo(json).then(res => { + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.Data.length; i++) { + res.Data[i].name = res.Data[i].NAME + } + } + return res.Data + }) + } else if (p.name == "Nav_ResultPostDets") { + this.selectorInfo.isMultiple = true + if (p.itemData.DEPARTMENT_ID) { + extendRule(json, 'DEPARTMENT_ID', 1, p.itemData.DEPARTMENT_ID); + } + json.SelectField = ["ID", "NAME", "NAME"] + dataSelect = await GetPostOrderPaged(json).then(res => { + if (res.Data != undefined && res.Data.length > 0) { + for (let i = 0; i < res.length; i++) { + res[i].name = res.Data[i].NAME + res[i].code = res.Data[i].CODE + } + } + return res.Data + }) + if (p.itemData.Nav_ResultPostDets && p.itemData.Nav_ResultPostDets.length > 0) { + // this.selectorInfo.defaultChecked = [] + + p.itemData.Nav_ResultPostDets.filter(i => !i.IS_DELETED).forEach(e => { + if (e.Nav_Post != null && e.Nav_Post.NAME != null) + defaultChecked.push(e.Nav_Post) + }) + } else { + defaultChecked = null + } + } + if (defaultChecked == null) + defaultChecked = [] + if (dataSelect.length) { + this.selectorInfo = { + itemData: p.itemData != undefined ? p.itemData : this.selectorInfo + .itemData, //itemData: p.itemData, 搜索的时候 p.itemData为空 赋值修改 为 她自己本身 this.selectorInfo.itemData + isMultiple: this.selectorInfo.isMultiple, + totalCount: this.selectorInfo.totalCount, + showPopup: true, + title: p.title, + name: p.name, + dataLists: dataSelect, + defaultChecked: defaultChecked + } + } else { + // 暂无数据 + } + }, + //数据加载 + handleSearch(val, pageIndex) { + var p = { + name: this.selectorInfo.name, + title: this.selectorInfo.title, + val: val, + pageIndex: pageIndex, + index: this.selectorInfo.index + } + this.handleShowSheet(p) + }, + + handleSelected(e) { + this.selectorInfo.showPopup = false + console.log(e, '999') + if (this.selectorInfo.name == 'Nav_Area') { + + this.selectorInfo.itemData.Nav_Area = e + this.selectorInfo.itemData.AREA_ID = e.ID + } else if (this.selectorInfo.name == 'Nav_Type') { + this.selectorInfo.itemData.Nav_Type = e + this.selectorInfo.itemData.TYPE_ID = e.ID + } else if (this.selectorInfo.name == 'Nav_Department') { + this.selectorInfo.itemData.Nav_Department = e + this.selectorInfo.itemData.DEPARTMENT_ID = e.ID + } else if (this.selectorInfo.name == 'Nav_ResultPostDets') { + let listArea = [] + let areaShow = '' + if (e.length > 0) { + e.forEach((item, i) => { + if (item.name != null || item.NAME != null) { + if (i > 0) { + areaShow += ' ' + } + listArea.push({ + ID: guid(), + RISK_IDENTIFY_DETAIL_RESULT_POST_ID: this.selectorInfo.itemData.ID, + POST_ID: item.ID, + ORG_ID: item.ORG_ID, + Nav_Post: item + }) + areaShow += item.NAME + } + }) + } + this.selectorInfo.itemData.Nav_ResultPostDets = listArea + this.selectorInfo.itemData.Nav_ResultPostDetsName = areaShow + } + + }, stepAdd() { - if(!this.dataModel.YEAR){ + if (!this.dataModel.YEAR) { uni.showToast({ title: '年度不能为空', icon: 'none' }) return } - if(!this.dataModel.START_DATE){ + if (!this.dataModel.START_DATE) { uni.showToast({ title: '辨识开始时间不能为空', icon: 'none' }) return } - if(!this.dataModel.END_DATE){ + if (!this.dataModel.END_DATE) { uni.showToast({ title: '辨识结束时间不能为空', icon: 'none' }) return } - if(!this.dataModel.Nav_Require.NAME){ + if (!this.dataModel.Nav_Require.NAME) { uni.showToast({ title: '辨识要求不能为空', icon: 'none' }) return } - + this.stepsPageList = this.stepsPageList + 1 }, stepReduce() { @@ -388,35 +635,161 @@ handleNewCheckContent() { this.dataModel.Nav_Details.push({ showPack: false, - Nav_ProductionUnit:{ - NAME: '' + Nav_ProductionUnit: { + NAME: '' }, - PRODUCTION_UNIT_ID:'', + PRODUCTION_UNIT_ID: '', Nav_Area: { NAME: '' }, ORG_ID: this.ORG_ID, RISK_NAME: '', - Nav_RiskName:{ - NAME: '' - }, RISK_DESCRIPTION: '', Nav_Type: { NAME: '' }, - DEPARTMENT_TYPE:'', - IDENTIFY_DEPARTMENT:'', - IDENTIFY_POST:'', + DEPARTMENT_TYPE: '', + IDENTIFY_DEPARTMENT: '', + IDENTIFY_POST: '', MEASURE: '', EMERGENCY: '', - ENABLE_STATUS: '有效', + Nav_DetailMeasures: [], + Nav_DetailPosts: [], + MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code, + MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name, + ID: guid() + }) this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] }, - handleDelRowBefore(index) { - this.showDelModalIndex = index - this.nowIndex = index + handleNewCheckList() { + // 将现有数据传递给选择页面用于去重判断 + const existingData = this.dataModel.Nav_Details.map(item => ({ + PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID, + AREA_ID: item.AREA_ID, + RISK_NAME: item.RISK_NAME + })) + + uni.navigateTo({ + url: `/pages/apply/subPages/SK/enterprise/enterpriseLibarary?existingData=${encodeURIComponent(JSON.stringify(existingData))}`, + events: { + // 监听页面返回的数据 + confirm: (data) => { + this.handleEnterpriseSelection(data.selectedItems) + } + } + }) + + }, + // 新增处理企业库选择结果的方法 + handleEnterpriseSelection(selectedItems) { + if (!selectedItems || selectedItems.length === 0) return + + const newDetails = [] + const duplicateItems = [] + + selectedItems.forEach(enterpriseItem => { + // 检查是否与现有数据重复 + const isDuplicate = this.dataModel.Nav_Details.filter(i => !i.IS_DELETED).some(existingItem => + existingItem.AREA_ID === (enterpriseItem.AREA_ID || '') && + existingItem.PRODUCTION_UNIT_ID === (enterpriseItem.PRODUCTION_UNIT_ID || '') && + existingItem.RISK_NAME === (enterpriseItem.RISK_NAME || '') + ) + + if (isDuplicate) { + duplicateItems.push({ + 生产单元: enterpriseItem.Nav_ProductionUnit?.NAME || '', + 辨识区域: enterpriseItem.Nav_Area?.NAME || '', + 风险名称: enterpriseItem.RISK_NAME || '' + }) + return + } + const convertedMeasures = (enterpriseItem.Nav_Details || []) + .map((item, index) => ({ + ...item, + MEASURE: item.MEASURES_NAME, // 措施名称 + })) + + const convertedItem = { + showPack: false, + PRODUCTION_UNIT_ID: enterpriseItem.PRODUCTION_UNIT_ID || '', + Nav_ProductionUnit: enterpriseItem.Nav_ProductionUnit || { + NAME: '' + }, + AREA_ID: enterpriseItem.AREA_ID || '', + Nav_Area: enterpriseItem.Nav_Area || { + NAME: '' + }, + RISK_NAME: enterpriseItem.RISK_NAME || '', + Nav_DetailMeasures: convertedMeasures, + Nav_DetailPosts: [], + RISK_DESCRIPTION: enterpriseItem.RISK_DESCRIPTION || '', + TYPE_ID: enterpriseItem.TYPE_ID || '', + Nav_Type: enterpriseItem.Nav_Type || { + NAME: '' + }, + MEASURE: enterpriseItem.MEASURE || '', + + EMERGENCY: enterpriseItem.EMERGENCY || '', + MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code, + MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name, + ORG_ID: this.ORG_ID, + ID: guid() + } + newDetails.push(convertedItem) + }) + // 处理重复项提示 + if (duplicateItems.length > 0) { + const duplicateCount = duplicateItems.length + let message = '' + if (duplicateCount === 1) { + const dup = duplicateItems[0] + message = `以下数据已存在，无法重复导入：\n生产单元：${dup.生产单元}\n辨识区域：${dup.辨识区域}\n风险名称：${dup.风险名称}` + } else { + message = `有 ${duplicateCount} 条数据已存在，无法重复导入：\n` + duplicateItems.slice(0, 3).forEach((dup, i) => { + message += `${i+1}. ${dup.生产单元} / ${dup.辨识区域} / ${dup.风险名称}\n` + }) + if (duplicateCount > 3) { + message += `...等共 ${duplicateCount} 条` + } + } + setTimeout(() => { + uni.showModal({ + title: '重复数据提示', + content: message, + showCancel: false, + confirmText: '知道了' + }) + }, 100) // 延迟100毫秒 + } + + if (newDetails.length > 0) { + this.dataModel.Nav_Details.push(...newDetails) + setTimeout(() => { + uni.showToast({ + title: `成功导入 ${newDetails.length} 条数据${duplicateItems.length > 0 ? `，跳过 ${duplicateItems.length} 条重复数据` : ''}`, + icon: 'success', + duration: 2000 + }) + }, 100) + + } else if (duplicateItems.length > 0) { + setTimeout(() => { + uni.showToast({ + title: `所选数据均重复，未导入任何内容`, + icon: 'none', + duration: 2000 + }) + }, 100) + } + }, + + handleDelRowBefore(item) { + item.IS_DELETED = true + this.$forceUpdate() + }, @@ -449,10 +822,11 @@ this.showPopupRecitifyDate = false }, - handleChangeStep(index, name) { + handleChangeStep(item, name) { this.currentOperateStep = {} this.showPopupStep = true - this.nowIndex = [index, name] + this.nowName = name + this.nowItem = item this.handleSearchStep('init') }, handleClosePopupStep() { @@ -460,9 +834,10 @@ // this.showPopupCertificate = false }, handleSearchStep(val, pageIndex) { - let requestInfo = this.nowIndex[1] == 'demand' ? GetSKRequestInfo : this.nowIndex[1] == 'Area' ? GetRiskAreaInfo : this.nowIndex[1] == 'RiskName' ? GetRiskNameInfo:GetRiskTypeInfo + let requestInfo = this.nowName == 'Area' ? GetRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : this.nowName == 'Category' ? GetRiskTypeInfo : this.nowName == 'Nav_ResultPostDets' ? + GetPostOrderPaged : GetDepartmentInfo const orgId = uni.getStorageSync('orgId') - const json = initFilter(orgId, "", "",0, pageIndex ?? 1) + const json = initFilter(orgId, "", "", 0, pageIndex ?? 1) json.Limit = 20 if (pageIndex) { json.Start = (pageIndex - 1) * json.Limit; @@ -472,7 +847,7 @@ extendGroupRule(tempGroup, 'NAME', 9, val) extendFilterGroup(json, tempGroup); } - + requestInfo(json).then(res => { // if (res.IsSuccessful) { this.stepLists = (res.Data || res).map(i => { @@ -489,18 +864,17 @@ }, handleSelectedStep(val) { - if (this.nowIndex[1] == 'demand') { + if (this.nowName == 'demand') { this.dataModel.Nav_Require.NAME = val.NAME this.dataModel.REQUIRE_ID = val.ID this.dataModel.RequireName = val.NAME - } else if (this.nowIndex[1] == 'Area') { + } else if (this.nowName == 'Area') { this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID - } else if (this.nowIndex[1] == 'RiskName') { + } else if (this.nowName == 'RiskName') { this.dataModel.Nav_Details[this.nowIndex[0]].Nav_RiskName.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID - } - else { + } else { this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID } @@ -509,25 +883,25 @@ }, submit() { - let i=1 - for (let item of this.dataModel.Nav_Details) { + let i = 1 + for (let item of this.dataModel.Nav_Details.filter(i => !i.IS_DELETED)) { if (!item.PRODUCTION_UNIT_ID) { uni.showToast({ - title: '顺序'+i+'生产单元不能为空', + title: '顺序' + i + '生产单元不能为空', icon: 'none' }) return } if (!item.Nav_Area.NAME) { uni.showToast({ - title: '顺序'+i+'辨识区域不能为空', + title: '顺序' + i + '辨识区域不能为空', icon: 'none' }) return } if (!item.RISK_NAME) { uni.showToast({ - title: '顺序'+i+'风险名称不能为空', + title: '顺序' + i + '风险名称不能为空', icon: 'none' }) return @@ -541,54 +915,63 @@ // } if (!item.RISK_DESCRIPTION) { uni.showToast({ - title: '顺序'+i+'风险描述不能为空', + title: '顺序' + i + '风险描述不能为空', icon: 'none' }) return } if (!item.Nav_Type.NAME) { uni.showToast({ - title: '顺序'+i+'风险类别不能为空', + title: '顺序' + i + '风险类别不能为空', icon: 'none' }) return } i++ } + console.log(this.dataModel, 'this.dataModel') - // this.model = this.dataModel + this.model = this.dataModel this.model.ORG_ID = this.ORG_ID - let arr = [] + delete this.model.Nav_ApplyDepartment + delete this.model.Nav_ApplyUser + delete this.model.Nav_Require + delete this.model.Nav_RequiresName - 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, - DEPARTMENT_TYPE:item.DEPARTMENT_TYPE, - IDENTIFY_DEPARTMENT:item.IDENTIFY_DEPARTMENT, - IDENTIFY_POST:item.IDENTIFY_POST, - MEASURE: item.MEASURE, - EMERGENCY: item.EMERGENCY, - ENABLE_STATUS: !item.ENABLE_STATUS ? 0 : item.ENABLE_STATUS == '有效' ? 0 : 10, - }) + // let arr = [] + + this.model.Nav_Details.map(item => { + delete item.Nav_Area + delete item.Nav_ProductionUnit + delete item.Nav_Type + delete item.MARK_NAME + delete item.showPack + if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) { + item.Nav_DetailPosts.map(item1 => { + delete item1.Nav_Department + delete item1.DEPARTMENT_TYPE_NAME + delete item1.Nav_ResultPostDetsName + if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) { + item1.Nav_ResultPostDets.map(item2 => { + delete item2.Nav_Post + }) + } + }) + } }) - this.model = { - ORG_ID: this.ORG_ID, - YEAR: this.dataModel.YEAR, - START_DATE: this.dataModel.START_DATE, - END_DATE: this.dataModel.END_DATE, - REQUIRE_ID: this.dataModel.REQUIRE_ID, - RequireName: this.dataModel.RequireName, - IDENTIFY_EVALUATION_PLAN_ID:this.dataModel.IDENTIFY_EVALUATION_PLAN_ID, - IDENTIFY_ID:this.dataModel.IDENTIFY_ID, - Nav_Files: this.dataModel.Nav_Files, - Nav_Details: arr - } + // this.model = { + // ORG_ID: this.ORG_ID, + // YEAR: this.dataModel.YEAR, + // START_DATE: this.dataModel.START_DATE, + // END_DATE: this.dataModel.END_DATE, + // REQUIRE_ID: this.dataModel.REQUIRE_ID, + // RequireName: this.dataModel.RequireName, + // IDENTIFY_EVALUATION_PLAN_ID: this.dataModel.IDENTIFY_EVALUATION_PLAN_ID, + // IDENTIFY_ID: this.dataModel.IDENTIFY_ID, + // Nav_Files: this.dataModel.Nav_Files, + // Nav_Details: arr + // } this.model.ID = this.ID this.model.TaskID = this.TaskID this.model.PUBLISH = "SaveAndNotify"; diff --git a/pages/apply/subPages/SK/riskSafeIdenResShow.vue b/pages/apply/subPages/SK/riskSafeIdenResShow.vue index 05db155..62705b0 100644 --- a/pages/apply/subPages/SK/riskSafeIdenResShow.vue +++ b/pages/apply/subPages/SK/riskSafeIdenResShow.vue @@ -38,7 +38,7 @@ - + 附件： @@ -56,8 +56,8 @@ {{index+1+'.辨识区域：'+item.Nav_Area.NAME}} - - + + @@ -78,26 +78,54 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -121,7 +149,12 @@ extendRule, extendIgnoreDataRule, initFilter, + transformData } from '../../../../utils/common' + import { + getEnum, + GetEnumAnyOrder + } from '../../../../services/common'; import { MineTypeName } from '../../../../utils/enums.js' @@ -218,6 +251,8 @@ TaskID: '', nowName: '', nowIndex: 0, + enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表） + enumsText: {} // 存储枚举文本列表（用于下拉选择等场景） } }, @@ -233,9 +268,21 @@ ...this.$store.state.auditModel, TaskID: option.taskID ? option.taskID : '' } - this.loadData() + this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']); }, 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') @@ -262,21 +309,45 @@ this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd') 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 && 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.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { - NAME: ''} + item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : ''; + if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) { + item.Nav_DetailPosts.map(item1 => { + item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : + ''; + if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) { + let Nav_ResultPostDetsName = '' + if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) { + item1.Nav_ResultPostDets.map(item2 => { + if (item2.Nav_Post && item2.Nav_Post.NAME !== null) { + Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' '; + } + }) + } + item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName + } + }) + + } }) this.stepLoad = false }) this.isLoadOK = true }, - handlePack(index) { - this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false - this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] + handlePack(item) { + item.showPack = item.showPack == false ? true : false + this.$forceUpdate() }, submit() { diff --git a/pages/apply/subPages/SK/riskSafeIdenSumShow.vue b/pages/apply/subPages/SK/riskSafeIdenSumShow.vue index f2e06a5..022ddcb 100644 --- a/pages/apply/subPages/SK/riskSafeIdenSumShow.vue +++ b/pages/apply/subPages/SK/riskSafeIdenSumShow.vue @@ -38,7 +38,7 @@ - + 附件： @@ -56,8 +56,8 @@ {{index+1+'.辨识区域：'+item.Nav_Area.NAME}} - - + + @@ -78,26 +78,54 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -121,10 +149,15 @@ extendRule, extendIgnoreDataRule, initFilter, + transformData } from '../../../../utils/common' import { MineTypeName } from '../../../../utils/enums.js' + import { + getEnum, + GetEnumAnyOrder + } from '../../../../services/common'; import { EvaIdentifySumGet, } from '../../../../services/apply/subPages/SK/SKServices.js' @@ -218,6 +251,8 @@ TaskID: '', nowName: '', nowIndex: 0, + enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表） + enumsText: {} // 存储枚举文本列表（用于下拉选择等场景） } }, @@ -233,9 +268,21 @@ ...this.$store.state.auditModel, TaskID: option.taskID ? option.taskID : '' } - this.loadData() + this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']); }, 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') @@ -258,25 +305,49 @@ // extendRule(json, 'TASK_ID', 1, this.TaskID); EvaIdentifySumGet(json).then(res => { this.dataModel = res; - this.stepsPage =res.STATUS == 20 ? 0: 1 + this.stepsPage = res.STATUS == 20 ? 0 : 1 this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd') 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 && 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.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { - NAME: ''} + item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : ''; + if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) { + item.Nav_DetailPosts.map(item1 => { + item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : + ''; + if (item1.Nav_SumPostDets && item1.Nav_SumPostDets.length > 0) { + let Nav_ResultPostDetsName = '' + + item1.Nav_SumPostDets.map(item2 => { + if (item2.Nav_Post && item2.Nav_Post.NAME !== null) { + Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' '; + } + }) + + item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName + } + }) + + } }) this.stepLoad = false }) this.isLoadOK = true }, - handlePack(index) { - this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false - this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] + handlePack(item) { + item.showPack = item.showPack == false ? true : false + this.$forceUpdate() }, submit() { @@ -300,6 +371,7 @@ \ No newline at end of file From 1e4a9e029f5dc70d82eda0328898af8e08a498b8 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Thu, 9 Jul 2026 15:23:01 +0800 Subject: [PATCH 31/33] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SK/riskRectifyDeferredEditNew.vue | 14 ++++++++---- .../subPages/SK/riskRectifyDeferredShow.vue | 22 +++++++++++-------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue index a3daddf..83c76fc 100644 --- a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue +++ b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue @@ -31,9 +31,13 @@ - + + + + + @@ -220,9 +224,10 @@ this.model.ID = this.ID this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = res.ID this.model.CODE = res.Nav_RectifyRecord.CODE - this.model.Nav_RectifyPhotoas = res.Nav_RectifyPhotoas ? res.Nav_RectifyPhotoas : [] + this.model.Nav_RectifyPhotoas = res.Nav_RectifyRecord.Nav_RectifyPhotoas ? res.Nav_RectifyRecord.Nav_RectifyPhotoas : [] this.model.Nav_RiskArea = res.Nav_RectifyRecord.Nav_RiskArea ? res.Nav_RectifyRecord.Nav_RiskArea : [] - this.model.HIDDEN_DESCRIPTION = res.Nav_RectifyRecord.Nav_Question.DESCREPTION + this.model.Nav_Question = res.Nav_RectifyRecord.Nav_Question + this.model.HIDDEN_DESCRIPTION = res.Nav_RectifyRecord.HIDDEN_DESCRIPTION this.model.HIDDEN_PLACE = res.Nav_RectifyRecord.HIDDEN_PLACE this.model.HIDDEN_LEVEL = res.Nav_RectifyRecord.HIDDEN_LEVEL this.model.RECITIFY_TIME = uni.$u.timeFormat(res.Nav_RectifyRecord.RECITIFY_TIME, 'yyyy-mm-dd') @@ -313,7 +318,8 @@ this.model.CODE = val.CODE this.model.Nav_RectifyPhotoas = val.Nav_RectifyPhotoas ? val.Nav_RectifyPhotoas : [] this.model.Nav_RiskArea = val.Nav_RiskArea ? val.Nav_RiskArea : [] - this.model.HIDDEN_DESCRIPTION = val.Nav_Question.DESCREPTION + this.model.Nav_Question = val.Nav_Question + this.model.HIDDEN_DESCRIPTION = val.HIDDEN_DESCRIPTION this.model.HIDDEN_PLACE = val.HIDDEN_PLACE this.model.HIDDEN_LEVEL = val.HIDDEN_LEVEL this.model.RECITIFY_TIME = uni.$u.timeFormat(val.RECITIFY_TIME, 'yyyy-mm-dd') diff --git a/pages/apply/subPages/SK/riskRectifyDeferredShow.vue b/pages/apply/subPages/SK/riskRectifyDeferredShow.vue index 800ea26..88dd771 100644 --- a/pages/apply/subPages/SK/riskRectifyDeferredShow.vue +++ b/pages/apply/subPages/SK/riskRectifyDeferredShow.vue @@ -15,42 +15,46 @@ - + - + - + - + - + - + + + + + - + - + 整改前照片： - + From aae9f75c91c77f554d4b267b2f387d4b8d78be97 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Thu, 9 Jul 2026 17:03:18 +0800 Subject: [PATCH 32/33] 1 --- pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue index 83c76fc..726a69e 100644 --- a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue +++ b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue @@ -222,7 +222,7 @@ GetRectifyDelayApplyReport(json).then(res => { this.model = res; this.model.ID = this.ID - this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = res.ID + // this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = res.ID this.model.CODE = res.Nav_RectifyRecord.CODE this.model.Nav_RectifyPhotoas = res.Nav_RectifyRecord.Nav_RectifyPhotoas ? res.Nav_RectifyRecord.Nav_RectifyPhotoas : [] this.model.Nav_RiskArea = res.Nav_RectifyRecord.Nav_RiskArea ? res.Nav_RectifyRecord.Nav_RiskArea : [] From 7faa26635714e5e255765c9006fae60e3a2af300 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 13 Jul 2026 15:44:38 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E2=80=9D=E6=8C=89=E9=92=AE=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subPages/FO/1preShiftMeetingEdit.vue | 4 +- pages/apply/subPages/FO/4teamActivityEdit.vue | 1256 ++++++------ pages/apply/subPages/FO/FO041Edit.vue | 51 +- pages/apply/subPages/FO/jobFireEdit.vue | 16 +- pages/apply/subPages/FO/jobFireTenEdit.vue | 1675 +++++++-------- pages/apply/subPages/FO/jobFireTwoEdit.vue | 1801 +++++++++-------- pages/apply/subPages/FO2/jobEdit.vue | 25 +- 7 files changed, 2434 insertions(+), 2394 deletions(-) diff --git a/pages/apply/subPages/FO/1preShiftMeetingEdit.vue b/pages/apply/subPages/FO/1preShiftMeetingEdit.vue index efc2ff6..4aaa76c 100644 --- a/pages/apply/subPages/FO/1preShiftMeetingEdit.vue +++ b/pages/apply/subPages/FO/1preShiftMeetingEdit.vue @@ -83,9 +83,9 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 附件 - - - - - - - - + - - - - \ No newline at end of file diff --git a/pages/apply/subPages/FO/FO041Edit.vue b/pages/apply/subPages/FO/FO041Edit.vue index 6a37b31..3f09dfb 100644 --- a/pages/apply/subPages/FO/FO041Edit.vue +++ b/pages/apply/subPages/FO/FO041Edit.vue @@ -9,12 +9,12 @@ 基本信息填写 - + - + @@ -33,12 +33,12 @@ - + - + @@ -49,7 +49,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -137,9 +137,12 @@ - - 上一步 - 提交 + + 保存 + + 上一步 + 提交 + @@ -475,8 +478,8 @@ handleNewCheckArea() { this.model.Nav_Details.push({ ID: guid(), - LEADER_WELL_RECORD_ID:this.model.ID, - ORG_ID:uni.getStorageSync('orgId'), + LEADER_WELL_RECORD_ID: this.model.ID, + ORG_ID: uni.getStorageSync('orgId'), START_DATE: '', END_DATE: '', Nav_DetailAreas: [], @@ -730,24 +733,24 @@ this.dateTimePickerInfo.showCheckDate = false }, - submit() { + submit(type) { this.modelEdit = JSON.parse(JSON.stringify(this.model)) delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_Class delete this.modelEdit.Nav_ProductionUnit - if(this.modelEdit.Nav_Details&&this.modelEdit.Nav_Details.length>0){ + if (this.modelEdit.Nav_Details && this.modelEdit.Nav_Details.length > 0) { this.modelEdit.Nav_Details.map(item => { - item.PUBLISH = 'SaveAndNotify' - delete item.Nav_User - if(item.Nav_DetailAreas&&item.Nav_DetailAreas.length>0){ - item.Nav_DetailAreas.map(item1=>{ - delete item1.Nav_Area - }) - } - }) + item.PUBLISH = type + delete item.Nav_User + if (item.Nav_DetailAreas && item.Nav_DetailAreas.length > 0) { + item.Nav_DetailAreas.map(item1 => { + delete item1.Nav_Area + }) + } + }) } - + if (this.TaskID == null || this.TaskID == '') { this.modelEdit.TaskID = '00000000-0000-0000-0000-000000000000' } else { @@ -756,7 +759,7 @@ if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') this.modelEdit.ORG_ID = this.ORG_ID - this.modelEdit.PUBLISH = 'SaveAndNotify' + this.modelEdit.PUBLISH = type; fullFOLeaderWellRecord(this.modelEdit).then(res => { if (res) { uni.$showMsgFunc('操作成功!', () => { diff --git a/pages/apply/subPages/FO/jobFireEdit.vue b/pages/apply/subPages/FO/jobFireEdit.vue index d620c1d..b516c22 100644 --- a/pages/apply/subPages/FO/jobFireEdit.vue +++ b/pages/apply/subPages/FO/jobFireEdit.vue @@ -191,9 +191,12 @@ - - 上一步 - 提交 + + 保存 + + 上一步 + 提交 + @@ -921,7 +924,7 @@ this.dateTimePickerInfo.showCheckDate = false }, - submit() { + submit(type) { this.modelEdit = JSON.parse(JSON.stringify(this.model)) delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyUser @@ -939,7 +942,7 @@ } if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) { this.modelEdit.Nav_Users.map(item => { - item.PUBLISH = 'SaveAndNotify' + item.PUBLISH = type delete item.Nav_Train delete item.Nav_User delete item.Nav_UserType @@ -958,8 +961,7 @@ } if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') this.modelEdit.ORG_ID = this.ORG_ID - - this.modelEdit.PUBLISH = 'SaveAndNotify' + this.modelEdit.PUBLISH = type; fullFOFireJob(this.modelEdit).then(res => { if (res) { uni.$showMsgFunc('操作成功!', () => { diff --git a/pages/apply/subPages/FO/jobFireTenEdit.vue b/pages/apply/subPages/FO/jobFireTenEdit.vue index eaff00a..043befc 100644 --- a/pages/apply/subPages/FO/jobFireTenEdit.vue +++ b/pages/apply/subPages/FO/jobFireTenEdit.vue @@ -1,833 +1,844 @@ - - - - - \ No newline at end of file diff --git a/pages/apply/subPages/FO/jobFireTwoEdit.vue b/pages/apply/subPages/FO/jobFireTwoEdit.vue index fe8010a..5b2d986 100644 --- a/pages/apply/subPages/FO/jobFireTwoEdit.vue +++ b/pages/apply/subPages/FO/jobFireTwoEdit.vue @@ -1,102 +1,102 @@ -