diff --git a/components/custom/check-action.vue b/components/custom/check-action.vue
index 6083e43..c4e14e1 100644
--- a/components/custom/check-action.vue
+++ b/components/custom/check-action.vue
@@ -5,8 +5,8 @@
-
-
+
+
@@ -53,25 +53,26 @@
data() {
return {
value: '',
- localIsBtnRefuseDisable: this.isBtnRefuseDisable
+ localIsBtnRefuseDisable: this.isBtnRefuseDisable,
+ isDisabled: false
}
},
// beforeCreate() KO
// beforeMount() mounted() OK
created() {
- if (this.refuseApi) {
- this.localIsBtnRefuseDisable = false
- } else {
- const pages = getCurrentPages()
- const currentPage = pages[pages.length - 1]
- const query = currentPage.options || {}
- this.localIsBtnRefuseDisable = !(query.refuseApi && query.refuseApi !== 'undefined')
- }
+ if (this.refuseApi) {
+ this.localIsBtnRefuseDisable = false
+ } else {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ const query = currentPage.options || {}
+ this.localIsBtnRefuseDisable = !(query.refuseApi && query.refuseApi !== 'undefined')
+ }
},
mounted() {
- if (this.$route && this.$route.query) {
- this.localIsBtnRefuseDisable = !(this.$route.query.refuseApi && this.$route.query.refuseApi !== 'undefined')
- }
+ if (this.$route && this.$route.query) {
+ this.localIsBtnRefuseDisable = !(this.$route.query.refuseApi && this.$route.query.refuseApi !== 'undefined')
+ }
},
watch: {
isBtnRefuseDisable(newValue) {
@@ -81,6 +82,7 @@
methods: {
handlePass() {
+ this.isDisabled = true
const genParams = this.handleGenParams(10)
handlePassAudit(genParams, this.okApi).then(res => {
// this.$emit('pass', this.dataSource)
@@ -95,9 +97,11 @@
//最后一个节点处理问题
handlePassAuditCallBack(res.Data + "?id=" + genParams.DATA_ID).then(
res2 => {
+ this.isDisabled = false
uni.navigateBack()
})
} else {
+ this.isDisabled = false
uni.navigateBack()
}
// }
@@ -105,14 +109,17 @@
})
},
handleReject() {
+ this.isDisabled = true
if (this.value == undefined || this.value === '' || this.value.length < 1) {
uni.$showErrorInfo('请输入驳回意见！')
+ this.isDisabled = false
return false
}
const genParams = this.handleGenParams(20)
handleRejestAudit(genParams, this.refuseApi).then(res => {
// this.$emit('reject', this.dataSource)
uni.$showMsgFunc('驳回成功!', () => {
+ this.isDisabled = false
uni.navigateBack()
}, 'success', 1000)
@@ -133,7 +140,7 @@
this.dataSource.CurrentNode = currentNodes[0];
}
}
- if(this.TASK_ORGID&&this.TASK_ORGID.length>0){
+ if (this.TASK_ORGID && this.TASK_ORGID.length > 0) {
this.dataSource.Parameter22 = this.TASK_ORGID
}
const params = {
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 @@
-
-
-
-
-
-
-
- *
-
-
- 基本信息填写
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 附件：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 现场条件验收附件：
-
-
-
-
- 下一步
-
-
-
-
-
-
-
- *
-
-
- 作业流程及安全措施
-
-
-
-
-
-
- {{item.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 附件：
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
-
- 上一步
- 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
- *
-
-
- 基本信息填写
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 附件：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 完工验收附件：
-
-
-
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完工验收附件：
+
+
+
下一步
-
-
+
+
-
+
*
-
+
作业流程及安全措施
@@ -124,14 +124,14 @@
-
+
- 附件：
-
+ 附件：
+
-
-
+
+
@@ -140,327 +140,330 @@
-
+
-
-
- 上一步
- 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/apply/subPages/FO2/jobEdit.vue b/pages/apply/subPages/FO2/jobEdit.vue
index 9426d5d..f037e99 100644
--- a/pages/apply/subPages/FO2/jobEdit.vue
+++ b/pages/apply/subPages/FO2/jobEdit.vue
@@ -270,11 +270,13 @@
-
-
-
+
+ 保存
+
+ 上一步
+ 提交
+
+
@@ -364,7 +366,7 @@
Nav_Department: {
NAME: ''
},
- Nav_Area:{
+ Nav_Area: {
NAME: ''
},
// Nav_ApplyUser: {
@@ -1272,7 +1274,7 @@
formIndex: undefined
}
},
- stepSubmit() {
+ stepSubmit(type) {
this.numC = 0;
this.dataModel.Nav_DealMeasures.map((item) => {
if (item.NAME == '') {
@@ -1285,7 +1287,7 @@
uni.$showErrorInfo('添加作业后处理措施信息不能为空')
} else {
this.modelEdit = JSON.parse(JSON.stringify(this.dataModel))
- this.modelEdit.PUBLISH = "SaveAndNotify";
+
if (this.TaskID !== null) {
this.modelEdit.TaskID = this.TaskID;
}
@@ -1300,7 +1302,12 @@
}
}
delete this.modelEdit.Nav_Department
- delete this.modelEdit.Nav_Area
+ delete this.modelEdit.Nav_Area
+ if (type == 'SaveAndNotify') {
+ this.modelEdit.PUBLISH = "SaveAndNotify";
+ } else {
+ this.modelEdit.PUBLISH = null;
+ }
saveJobRecord(this.modelEdit).then(res => {
uni.$showMsgFunc('操作成功!', () => {
// if (this.tableKey == null || this.tableKey == 0) {
diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue
index 5deea30..1e49d01 100644
--- a/pages/apply/subPages/SE/1trainNotifyEdit.vue
+++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue
@@ -117,11 +117,11 @@
disabled disabledColor="#fff">
-
+
-
+
@@ -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/riskDouPreEditNew.vue b/pages/apply/subPages/SK/riskDouPreEditNew.vue
index 2d38804..6aa9db9 100644
--- a/pages/apply/subPages/SK/riskDouPreEditNew.vue
+++ b/pages/apply/subPages/SK/riskDouPreEditNew.vue
@@ -9,19 +9,19 @@
基本信息填写
-
+
-
+
-
+
@@ -52,19 +52,19 @@
辨识内容
-
-
+
+
-
+
-
-
-
+
+
+
@@ -80,104 +80,100 @@
-->
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+ 新增管控措施
+
+
+
+
+
+
+
-
+
-
+
+
+
-
-
-
-
-
- {{index2+1+'.检查内容 : ' +item2.Nav_Contents.CHECKCONTENT}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
+
-
+
-
+
@@ -185,13 +181,13 @@
-
-
+
-
-
+
@@ -201,31 +197,27 @@
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
@@ -239,84 +231,75 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+ 新增辨识岗位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增管控层级
+
+
+
-
+
- {{index1+1+'.管控部门 : ' +item1.Nav_Department.NAME}}
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
- {{index1+1+'.辨识部门 : ' +item1.Nav_Department.NAME}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -376,7 +359,9 @@
GetRiskNameInfo,
GetScorel,
GetScoree,
- GetScorec
+ GetScorec,
+ GetNewRiskAreaInfo,
+ GetNewRiskTypeInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -492,7 +477,7 @@
onLoad(option) {
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : '';
- this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -548,40 +533,34 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.model.Nav_DoubleDetails.map(item => {
item['showPack'] = false
- item.Nav_SCOREL = item.Nav_SCOREL ? item.Nav_SCOREL : {
- SCORE: ''
- }
- item.Nav_SCOREE = item.Nav_SCOREE ? item.Nav_SCOREE : {
- SCORE: ''
- }
- item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
- SCORE: ''
- }
-
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailPosts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item4 => item4.code === item1.DEPARTMENT_TYPE).name : '';
})
- item.Nav_DetailDeparts.map(item1 => { //辨识岗位
- if (item1.Nav_DepartDetails.length > 0) {
- let areaShow = ''
- item1.Nav_DepartDetails.map(o => {
- areaShow += o.Nav_Post.NAME
- })
- item1['Nav_DepartDetailsName'] = areaShow
- } else {
- item1['Nav_DepartDetailsName'] = ''
- }
- })
- if (item.Nav_DoubleDetailMeasures.length > 0) { //管控措施
+ if (item.Nav_DetailDeparts && item.Nav_DetailDeparts.length > 0) {
+ item.Nav_DetailDeparts.map(item1 => {
+ if (item1.Nav_DepartDetails && item1.Nav_DepartDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_DepartDetails.map(item2 => {
+ if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
+ Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
+ }
+ })
+ item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
+ }
+ })
+
+ }
+ if (item.Nav_DoubleDetailMeasures && item.Nav_DoubleDetailMeasures.length > 0) { //管控措施
item.Nav_DoubleDetailMeasures.map(item1 => {
item1['ishowCheckCo'] = false
- if (item1.Nav_DetailMeasureContents.length > 0) { //检查内容
+ if (item1.Nav_DetailMeasureContents && item1.Nav_DetailMeasureContents.length > 0) { //检查内容
item1.Nav_DetailMeasureContents.map(item2 => {
item2['ishowCheckLe'] = false
item2['ishowRiskDes'] = false
- if (item2.Nav_DetailMeasureContentBasics.length > 0) {
+ if (item2.Nav_DetailMeasureContentBasics && item2.Nav_DetailMeasureContentBasics.length > 0) {
let areaShow = ''
item2.Nav_DetailMeasureContentBasics.map(o => {
if (o.Nav_Law && o.Nav_Law.NAME) {
@@ -593,7 +572,7 @@
} else {
item2['Nav_DetailMeasureContentBasicsName'] = ''
}
- if (item2.Nav_DetailMeasureContentPosts.length > 0) {
+ if (item2.Nav_DetailMeasureContentPosts && item2.Nav_DetailMeasureContentPosts.length > 0) {
item2.Nav_DetailMeasureContentPosts.map(item3 => {
item3.CHECK_CYCLEName = item3.CHECK_CYCLE !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item4 => item4.code === item3
.CHECK_CYCLE).name : '';
@@ -610,13 +589,10 @@
}
})
}
- if (item2.Nav_DetailMeasureContentHiddens.length > 0) {
+ if (item2.Nav_DetailMeasureContentHiddens && item2.Nav_DetailMeasureContentHiddens.length > 0) {
item2.Nav_DetailMeasureContentHiddens.map(item3 => {
- item3.Nav_Question = item3.Nav_Question ? item3.Nav_Question : {
- DESCREPTION: ''
- },
- item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3
- .HIDDEN_LEVEL).name : '';
+ item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3
+ .HIDDEN_LEVEL).name : '';
})
}
@@ -625,21 +601,11 @@
}
})
}
-
})
})
},
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
@@ -670,6 +636,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -680,6 +647,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -690,6 +658,138 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_Area") {
+ dataSelect = await GetNewRiskAreaInfo(json).then(res => {
+ 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 GetNewRiskTypeInfo(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_PostDetails && p.itemData.Nav_PostDetails.length > 0) {
+ // this.selectorInfo.defaultChecked = []
+
+ p.itemData.Nav_PostDetails.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
+ }
+ } else if (p.name == 'Nav_DetailDeparts') {
+ json.Include = ['Nav_User']
+ 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 == 'Sub_Nav_Contents') {
+ json.Sort = 'CHECKCONTENT'
+ dataSelect = await GetCheckContentsInfo(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].CHECKCONTENT
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckThreeDep') {
+ 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 == 'CheckThreeType') {
+ json.Include = ['Nav_ProductionUnit']
+ dataSelect = await CheckTypeNewOrderPaged(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
+ res.Data[i].code = res.Data[i].Nav_ProductionUnit.NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'RiskDesThree') {
+ json.Sort = 'DESCREPTION'
+ dataSelect = await GetHiddenScripList(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].DESCREPTION
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckArea') {
+ dataSelect = await GetRiskAreaInfo(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 == 'CheckContent') {
+ dataSelect = await GetCheckContentsInfo(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].CHECKCONTENT
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'RiskDes') {
+ json.Sort = 'DESCREPTION'
+ dataSelect = await GetHiddenScripList(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].DESCREPTION
}
}
return res.Data
@@ -729,57 +829,118 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_DoubleDetails.findIndex(item => item === validDetails[index]);
- if (this.selectorInfo.name == 'EVALUATE_L') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREL = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREL_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_E') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREE = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREE_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_C') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREC = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREC_ID = e.ID;
+ if (this.selectorInfo.name == 'EVALUATE_L' || this.selectorInfo.name == 'EVALUATE_E' || this.selectorInfo.name == 'EVALUATE_C') {
+ if (this.selectorInfo.name == 'EVALUATE_L') {
+ this.selectorInfo.itemData.Nav_SCOREL = e;
+ this.selectorInfo.itemData.SCOREL_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_E') {
+ this.selectorInfo.itemData.Nav_SCOREE = e;
+ this.selectorInfo.itemData.SCOREE_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_C') {
+ this.selectorInfo.itemData.Nav_SCOREC = e;
+ this.selectorInfo.itemData.SCOREC_ID = e.ID;
+ }
+
+ let l = this.selectorInfo.itemData.Nav_SCOREL.SCORE
+ let o = this.selectorInfo.itemData.Nav_SCOREE.SCORE
+ let c = this.selectorInfo.itemData.Nav_SCOREC.SCORE
+ this.selectorInfo.itemData.EVALUATE_SCORE = Math.round(l * o * c)
+ let D = this.selectorInfo.itemData.EVALUATE_SCORE
+ if (D >= 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "重大风险";
+ } else if (D >= 160 && D < 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "较大风险";
+ } else if (D >= 70 && D < 160) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "一般风险";
+ } else {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "低风险";
+ }
+ this.selectorInfo.itemData.EVALUATE_LEVEL = this.selectorInfo.itemData.EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.selectorInfo.itemData
+ .EVALUATE_LEVELName).code : ''
+
+ this.$forceUpdate()
}
- let l = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREL.SCORE
- let o = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREE.SCORE
- let c = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREC.SCORE
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_SCORE = l * o * c
- let D = this.model.Nav_DoubleDetails[realIndex].EVALUATE_SCORE
- if (D >= 320) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "重大风险";
- } else if (D >= 160 && D < 320) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "较大风险";
- } else if (D >= 70 && D < 160) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "一般风险";
- } else {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "低风险";
+ 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_DetailDeparts') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ this.selectorInfo.itemData.Nav_User = e.Nav_User
+ this.selectorInfo.itemData.USER_ID = e.Nav_User?.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_EVALUATION_DETAIL_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_PostDetails = listArea
+ this.selectorInfo.itemData.Nav_ResultPostDetsName = areaShow
+ } else if (this.selectorInfo.name == 'Sub_Nav_Contents') {
+ this.selectorInfo.itemData.Nav_Contents = e
+ this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckThreeDep') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckThreeType') {
+ this.selectorInfo.itemData.Nav_CheckType = e
+ this.selectorInfo.itemData.CHECK_TYPE_ID = e.ID
+ } else if (this.selectorInfo.name == 'RiskDesThree') {
+ this.selectorInfo.itemData.Nav_Question = e
+ this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID
+ this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
+ this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item => item.code == e.QUESTION_LEVEL).NAME
+ this.selectorInfo.itemData.RECTIFICATION_MEASURES = e.DEMAND
+ } else if (this.selectorInfo.name == 'CheckArea') {
+ this.model.Nav_RiskArea = e
+ this.model.RISK_AREA_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckContent') {
+ this.model.Nav_Contents = e
+ this.model.CHECK_CONTENTS_ID = e.ID
+ } else if (this.selectorInfo.name == 'RiskDes') {
+ this.model.Nav_Question = e
+ this.model.CHECK_QUESTION_ID = e.ID
}
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVEL = this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this
- .model
- .Nav_DoubleDetails[
- realIndex].EVALUATE_LEVELName).code : ''
+
},
- handlePack(index) {
- this.model.Nav_DoubleDetails[index].showPack = this.model.Nav_DoubleDetails[index].showPack == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckCo(index, index1) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckCo(item) {
+ item.ishowCheckCo = item.ishowCheckCo == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckLe(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowCheckLe = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowCheckLe == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckLe(item) {
+ item.ishowCheckLe = item.ishowCheckLe == false ? true : false
+ this.$forceUpdate()
},
- ishowRiskDes(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowRiskDes = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowRiskDes == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowRiskDes(item) {
+ item.ishowRiskDes = item.ishowRiskDes == false ? true : false
+ this.$forceUpdate()
},
cancelUnit() {
this.showPopupUnit = false
@@ -878,7 +1039,7 @@
Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -901,101 +1062,91 @@
Nav_DetailPosts: [],
Nav_DoubleDetailMeasures: [],
Nav_DetailDeparts: [],
+ DOUBLE_PREVENT_MECHANISM_ID: this.ID,
})
this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
},
- handleNewControlMea(name, index) {
- if (name == 'Mea') {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures.push({
- NUM: 0,
- MEASURES_NAME: '',
- EMERGENCY: '',
- Nav_DetailMeasureContents: []
- })
- } else if (name == 'Lel') {
- this.model.Nav_DoubleDetails[index].Nav_DetailPosts.push({
- DEPARTMENT_TYPE: '',
- Nav_Department: {
- NAME: ''
- },
- Nav_User: {
- NAME: ''
- },
- })
- } else if (name == 'Post') {
- this.model.Nav_DoubleDetails[index].Nav_DetailDeparts.push({
- Nav_Department: {
- NAME: '',
- ID: ''
- },
- Nav_DepartDetails: []
- })
- } else if (name == 'CheckCo') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents.push({
- Nav_Contents: {
- CHECKCONTENT: ''
- },
- Nav_DetailMeasureContentBasicsName: '',
- Nav_DetailMeasureContentBasics: [],
- CHECK_STANDARD: '',
- Nav_DetailMeasureContentPosts: [],
- Nav_DetailMeasureContentHiddens: []
- })
- } else if (name == 'CheckThreeLel') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents[index[2]].Nav_DetailMeasureContentPosts.push({
- NUM: 0,
- CHECK_TYPE: '',
- Nav_Department: {
- NAME: '',
- ID: ''
- },
- Nav_CheckType: {
- NAME: ''
- },
- CHECK_CYCLE: '',
- Nav_DetailPosts: '',
- })
- } else if (name == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents[index[2]].Nav_DetailMeasureContentHiddens.push({
- Nav_Question: {
- DESCREPTION: ''
- },
- HIDDEN_LEVEL: '一般',
- RECTIFICATION_MEASURES: '',
- })
- }
+ handleNewControlMea(item) {
+ item.Nav_DoubleDetailMeasures.unshift({
+ NUM: 1,
+ ID: guid(),
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID,
+ MEASURES_NAME: '',
+ IS_DELETED: false,
+ Nav_DetailMeasureContents: []
+ })
+ },
+ handleNewPost(item) {
+ item.Nav_DetailDeparts.unshift({
+ ID: guid(),
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID,
+ Nav_Department: {
+ NAME: ''
+ },
+ DEPARTMENT_ID: '',
+ Nav_DepartDetails: [],
+ Nav_ResultPostDetsName: '',
+ IS_DELETED: false,
+ })
+ },
+ handleNewControlLev(item) {
+ item.Nav_DetailPosts.unshift({
+ DEPARTMENT_TYPE: '',
+ Nav_Department: {
+ NAME: ''
+ },
+ Nav_User: {
+ NAME: ''
+ },
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID
+ })
+ },
+ handleNewSubCheck(item) {
+ item.Nav_DetailMeasureContents.unshift({
+ Nav_Contents: {
+ CHECKCONTENT: ''
+ },
+ NUM: 1,
+ ishowCheckLe: false,
+ Nav_DetailMeasureContentPosts: [],
+ ishowRiskDes: false,
+ Nav_DetailMeasureContentHiddens: [],
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_ID: item.ID
+ })
+ },
+ handleNewSubPost(item) {
+ item.Nav_DetailMeasureContentPosts.unshift({
+ NUM: 1,
+ CHECK_TYPEName: '',
+ CHECK_TYPE: '',
+ Nav_Department: {
+ NAME: ''
+ },
+ Nav_CheckType: {
+ NAME: ''
+ },
+ CHECK_CYCLEName: '',
+ CHECK_CYCLE: '',
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID
+ })
+ },
+ handleNewSubRisk(item) {
+ item.Nav_DetailMeasureContentHiddens.unshift({
+ NUM: 1,
+ Nav_Question: {
+ DESCREPTION: ''
+ },
+ HIDDEN_LEVEL: '',
+ HIDDEN_LEVELName: '',
+ RECTIFICATION_MEASURES: '',
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID
+ })
+ },
- // this.$nextTick(() => {
- // this.$refs.collapse.resize();
- // });
- },
- handleDelRowBefore(name, nowIndex) {
- this.showDelModalIndex = nowIndex[0]
- this.nowName = name
- this.nowIndex = nowIndex
- },
- confirmDel() {
- if (this.nowName == 'Area') {
- this.model.Nav_DoubleDetails.splice(this.nowIndex[0], 1)
- } else if (this.nowName == 'Num') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures.splice(this.nowIndex[1], 1)
- } else if (this.nowName == 'RecDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts.splice(this.nowIndex[1], 1)
- } else if (this.nowName == 'CheckCoTwo') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents.splice(this.nowIndex[2], 1)
- } else if (this.nowName == 'CheckNum') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts.splice(this.nowIndex[3], 1)
- } else if (this.nowName == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens.splice(this.nowIndex[3], 1)
- } else {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts.splice(this.nowIndex[1], 1)
- }
- this.showDelModalIndex = undefined
-
- },
- cacelDel() {
- this.showDelModalIndex = undefined
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
cancelRecitifyDate() {
this.showPopupRecitifyDate = false
@@ -1018,275 +1169,10 @@
this.showPopupRecitifyDate = false
},
- handleChangeStep(name, nowIndex) {
- this.currentOperateStep = {}
- this.showPopupStep = true
- this.nowName = name
- this.nowIndex = nowIndex
- this.handleSearchStep('init')
- },
- handleClosePopupStep() {
- this.showPopupStep = false
- this.isMultiple = false
- this.defaultChecked = []
- // this.showPopupCertificate = false
- },
- handleSearchStep(val, pageIndex) {
- const orgId = uni.getStorageSync('orgId')
- const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
- json.Limit = 20
- if (pageIndex) {
- json.Start = (pageIndex - 1) * json.Limit;
- }
- this.defaultChecked = []
-
- if (val !== 'init') {
- const tempGroup = initFilterGroup(false);
- if (this.nowName == 'CheckContent' || this.nowName == 'CheckCoTwo') {
- extendGroupRule(tempGroup, 'CHECKCONTENT', 9, val)
- } else if (this.nowName == 'RecPost' || this.nowName == 'CheckThreePost') {
- extendGroupRule(tempGroup, 'DESCREPTION', 9, val)
- } else {
- extendGroupRule(tempGroup, 'NAME', 9, val)
- }
- extendFilterGroup(json, tempGroup);
- }
- let requestInfo = this.nowName == 'CheckArea' || this.nowName == 'Area' ? GetRiskAreaInfo :
- this.nowName == 'CheckContent' || this.nowName == 'CheckCoTwo' ? GetCheckContentsInfo :
- this.nowName == 'RiskDes' || this.nowName == 'RiskDesThree' ? GetHiddenScripList :
- this.nowName == 'demand' ? GetSKRequestInfo :
- this.nowName == 'Category' ? GetRiskTypeInfo :
- this.nowName == 'RecPost' || this.nowName == 'CheckThreePost' ? GetPostOrderPaged :
- this.nowName == 'Inspection' ? GetCheckInspection :
- this.nowName == 'CheckThreeType' ? CheckTypeNewOrderPaged :
- this.nowName == 'Dep' || this.nowName == 'RecDep' || this.nowName == 'CheckThreeDep' ?
- GetDepartmentInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : getUserLists
- if (this.nowName == 'CheckThreeType') {
- if (this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== undefined && this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== null) {
- extendRule(json, 'PRODUCTION_UNIT_ID', 1, String(this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID));
- }
-
- }
- if (this.nowName == 'Inspection') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]]
- if (p.Nav_DetailMeasureContentBasics && p.Nav_DetailMeasureContentBasics.length > 0) {
-
- p.Nav_DetailMeasureContentBasics.map(item => {
- let newId = item.LAW_ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- // 将新对象添加到 this.defaultChecked 数组中
- this.defaultChecked.push(newItem);
- })
- } else {
- this.defaultChecked = []
- }
- } else if (this.nowName == 'RecPost') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]]
- if (p.Nav_DepartDetails && p.Nav_DepartDetails.length > 0) {
-
- p.Nav_DepartDetails.map(item => {
- let newId = item.Nav_Post ? item.Nav_Post.ID : item.ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- this.defaultChecked.push(newItem)
- })
- } else {
- this.defaultChecked = []
- }
- if (p.Nav_Department.ID) {
- extendFilterGroupGroupRules(json, 'DEPARTMENT_ID', 1, p.Nav_Department.ID)
- }
-
-
- } else if (this.nowName == 'CheckThreePost') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- if (p.Nav_DetailPosts && p.Nav_DetailPosts.length > 0) {
- p.Nav_DetailPosts.map(item => {
- let newId = item.Nav_Post ? item.Nav_Post.ID : item.ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- this.defaultChecked.push(newItem)
- })
- } else {
- this.defaultChecked = []
- }
- if (p.Nav_Department.ID) {
- extendFilterGroupGroupRules(json, 'DEPARTMENT_ID', 1, p.Nav_Department.ID)
- }
-
- } else {
- this.isMultiple = false
- }
- json.Limit = 100
- requestInfo(json).then(res => {
- this.stepLists = (res.Data || res).map(i => {
- return {
- ...i,
- id: i.ID,
- name: i.NAME || i.CHECKCONTENT || i.DEMAND,
- }
- })
- this.curTotalStep = res.TotalCount
- // }
- })
-
-
-
- },
- handleSelectedStep(val) {
- this.defaultChecked = []
- if (this.nowName == 'demand') {
- this.model.Nav_Require.NAME = val.NAME
- this.model.REQUIRE_ID = val.ID
- this.model.RequireName = val.NAME
- } else if (this.nowName == 'Area') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_Area.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].AREA_ID = val.ID
- } else if (this.nowName == 'Category') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_Type.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].TYPE_ID = val.ID
- } else if (this.nowName == 'Dep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].Nav_Department = val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'RecDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_Department = val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'RecPost') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- MECHANISM_DETAIL_DEPART_ID: item.ID,
- POST_ID: item.ID,
- NAME: item.NAME || item.Nav_Post.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Post && item.Nav_Post.NAME != null) {
- areaShow += item.Nav_Post.NAME
- }
-
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_DepartDetails = listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_DepartDetailsName = areaShow
- } else if (this.nowName == 'CheckCoTwo') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_Contents.CHECKCONTENT = val.CHECKCONTENT
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].CHECK_CONTENTS_ID = val.ID
- } else if (this.nowName == 'Inspection') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- let newItem = {
- ...item,
- LAW_ID: item.ID,
- DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID,
- NAME: item.NAME || item.Nav_Law.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Law && item.Nav_Law.NAME != null) {
- areaShow += item.Nav_Law.NAME
- }
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentBasics = listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentBasicsName = areaShow
- } else if (this.nowName == 'CheckThreePost') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- POST_ID: item.ID,
- DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID,
- NAME: item.NAME || item.Nav_Post.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Post && item.Nav_Post.NAME != null) {
- areaShow += item.Nav_Post.NAME
- }
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_DetailPosts =
- listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .Nav_DetailPostsName = areaShow
- } else if (this.nowName == 'CheckThreeDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_Department =
- val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'CheckThreeType') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_CheckType =
- val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .CHECK_TYPE_ID = val.ID
- } else if (this.nowName == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]]
- .CHECK_QUESTION_ID = val.ID
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]].Nav_Question
- .DESCREPTION = val.DESCREPTION
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]]
- .RECTIFICATION_MEASURES = val.DEMAND
- } else if (this.nowName == 'CheckArea') {
- this.model.Nav_RiskArea.NAME = val.NAME
- this.model.RISK_AREA_ID = val.ID
-
- } else if (this.nowName == 'CheckContent') {
- this.model.Nav_Contents.CHECKCONTENT = val.CHECKCONTENT
- this.model.CHECK_CONTENTS_ID = val.ID
- } else if (this.nowName == 'RiskDes') {
- this.model.Nav_Question.DESCREPTION = val.DESCREPTION
- this.model.CHECK_QUESTION_ID = val.ID
- this.model.HIDDEN_LEVEL = val.QUESTION_LEVEL == 0 ? '一般' : '重大'
- this.model.HIDDEN_DESCRIPTION = val.DEMAND
- } else if (this.nowName == 'RiskName') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].RISK_NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].RISK_NAME_ID = val.ID
- } else {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].Nav_User.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].USER_ID = val.ID
- }
- this.showPopupStep = false
-
- },
submit() {
let i = 1
- for (let item of this.model.Nav_DoubleDetails) {
+ for (let item of this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({
title: '顺序' + i + '生产单元不能为空',
@@ -1350,22 +1236,8 @@
})
return
}
- if (!item.EVALUATE_SCORE) {
- uni.showToast({
- title: '顺序' + i + '分值D不能为空',
- icon: 'none'
- })
- return
- }
- if (!item.EVALUATE_LEVEL) {
- uni.showToast({
- title: '顺序' + i + '风险等级不能为空',
- icon: 'none'
- })
- return
- }
- if (item.Nav_DoubleDetailMeasures.length !== 0) {
- for (let item1 of item.Nav_DoubleDetailMeasures) {
+ if (item.Nav_DoubleDetailMeasures.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DoubleDetailMeasures.filter(i => !i.IS_DELETED)) {
if (!item1.MEASURES_NAME) {
uni.showToast({
title: '顺序' + i + '管控措施不能为空',
@@ -1380,8 +1252,8 @@
// })
// return
// }
- if (item1.Nav_DetailMeasureContents.length !== 0) {
- for (let item2 of item1.Nav_DetailMeasureContents) {
+ if (item1.Nav_DetailMeasureContents.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item2 of item1.Nav_DetailMeasureContents.filter(i => !i.IS_DELETED)) {
if (!item2.CHECK_CONTENTS_ID) {
uni.showToast({
title: '顺序' + i + '检查内容不能为空',
@@ -1389,8 +1261,8 @@
})
return
}
- if (item2.Nav_DetailMeasureContentPosts.length !== 0) {
- for (let item3 of item2.Nav_DetailMeasureContentPosts) {
+ if (item2.Nav_DetailMeasureContentPosts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item3 of item2.Nav_DetailMeasureContentPosts.filter(i => !i.IS_DELETED)) {
if (!item3.CHECK_TYPEName) {
uni.showToast({
title: '顺序' + i + '检查层级不能为空',
@@ -1419,17 +1291,10 @@
})
return
}
- if (item3.Nav_DetailPosts.length == 0) {
- uni.showToast({
- title: '顺序' + i + '检查岗位不能为空',
- icon: 'none'
- })
- return
- }
}
}
- if (item2.Nav_DetailMeasureContentHiddens.length !== 0) {
- for (let item3 of item2.Nav_DetailMeasureContentHiddens) {
+ if (item2.Nav_DetailMeasureContentHiddens.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item3 of item2.Nav_DetailMeasureContentHiddens.filter(i => !i.IS_DELETED)) {
if (!item3.CHECK_QUESTION_ID) {
uni.showToast({
title: '顺序' + i + '隐患描述不能为空',
@@ -1458,8 +1323,8 @@
}
}
}
- if (item.Nav_DetailPosts.length !== 0) {
- for (let item1 of item.Nav_DetailPosts) {
+ if (item.Nav_DetailPosts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailPosts.filter(i => !i.IS_DELETED)) {
if (!item1.DEPARTMENT_TYPEName) {
uni.showToast({
title: '顺序' + i + '管控层级不能为空',
@@ -1474,17 +1339,10 @@
})
return
}
- if (!item1.USER_ID) {
- uni.showToast({
- title: '顺序' + i + '管控责任人不能为空',
- icon: 'none'
- })
- return
- }
}
}
- if (item.Nav_DetailDeparts.length !== 0) {
- for (let item1 of item.Nav_DetailDeparts) {
+ if (item.Nav_DetailDeparts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailDeparts.filter(i => !i.IS_DELETED)) {
if (!item1.DEPARTMENT_ID) {
uni.showToast({
title: '顺序' + i + '辨识部门不能为空',
diff --git a/pages/apply/subPages/SK/riskDouPreShow.vue b/pages/apply/subPages/SK/riskDouPreShow.vue
index b8b5209..bd2d562 100644
--- a/pages/apply/subPages/SK/riskDouPreShow.vue
+++ b/pages/apply/subPages/SK/riskDouPreShow.vue
@@ -66,8 +66,8 @@
-
-
+
+
@@ -125,7 +125,7 @@
-
+
@@ -149,7 +149,7 @@
-->
-
+
@@ -175,14 +175,10 @@
-
-
-
-
-
+
-
+
@@ -227,7 +223,7 @@
-
+
@@ -246,9 +242,9 @@
-
-
+
+
@@ -561,29 +557,22 @@
})
this.isLoadOK = true
},
- sectionChange(index, e) {
- this.model.Nav_DoubleDetails[index].curNow = e
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
+
},
-
- handlePack(index) {
- this.model.Nav_DoubleDetails[index].showPack = this.model.Nav_DoubleDetails[index].showPack == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
-
+ ishowCheckCo(item) {
+ item.ishowCheckCo = item.ishowCheckCo == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckCo(index, index1) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckLe(item) {
+ item.ishowCheckLe = item.ishowCheckLe == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckLe(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowCheckLe = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowCheckLe == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
- },
- ishowRiskDes(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowRiskDes = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowRiskDes == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowRiskDes(item) {
+ item.ishowRiskDes = item.ishowRiskDes == false ? true : false
+ this.$forceUpdate()
},
diff --git a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue
index a3daddf..726a69e 100644
--- a/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue
+++ b/pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue
@@ -31,9 +31,13 @@
-
+
+
+
+
+
@@ -218,11 +222,12 @@
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_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 @@
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
整改前照片：
-
+
diff --git a/pages/apply/subPages/SK/riskRectifyEditNew.vue b/pages/apply/subPages/SK/riskRectifyEditNew.vue
index 4adc0f2..0a1d26e 100644
--- a/pages/apply/subPages/SK/riskRectifyEditNew.vue
+++ b/pages/apply/subPages/SK/riskRectifyEditNew.vue
@@ -9,29 +9,26 @@
基本信息填写
-
+
-
+
+
-
+
+
-
+
-
-
+
+ -->
@@ -58,7 +55,7 @@
检查内容
-
+
@@ -69,26 +66,31 @@
-->
-
+
-
+
-
+
+
+
+
+
+
-
+
@@ -97,10 +99,12 @@
-
-
-
+
+
+
+
+
@@ -108,12 +112,12 @@
-
+
-
+
@@ -121,10 +125,14 @@
-
-
-
+
+
+
+
+
+
+
@@ -185,7 +193,8 @@
GetHiddenScripList,
GetNewRiskAreaInfo,
getUserLists,
- CheckTypeNewOrderPaged
+ CheckTypeNewOrderPaged,
+ SKHiddenReason
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -396,6 +405,14 @@
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : ''
item.RECITIFY_TIME = item.RECITIFY_TIME ? uni.$u.timeFormat(item.RECITIFY_TIME,
'yyyy-mm-dd') : ''
+ let ReasonsNAME = ''
+ if (item.Nav_RectifyDetailReasons && item.Nav_RectifyDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_RectifyDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_RectifyDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
})
}
@@ -435,22 +452,12 @@
this.model.CHECK_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd hh:MM:ss')
} else if (this.dateTimePickerInfo.dataIndex == 2) {
- const realIndex = getRealIndex(this.dateTimePickerInfo.item, this.model.Nav_RectifyDetails)
- this.model.Nav_RectifyDetails[realIndex].RECITIFY_TIME = uni.$u.timeFormat(e.value,
+ this.dateTimePickerInfo.item.RECITIFY_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd')
}
this.dateTimePickerInfo.showCheckDate = false
},
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
@@ -489,10 +496,8 @@
if (p.val) {
extendRule(json, 'DESCREPTION', 9, p.val);
}
-
- let data = this.model.Nav_RectifyDetails[p.index]
- if (data.CHECK_CONTENTS_ID && data.CHECK_CONTENTS_ID !== '') {
- extendRule(json, 'CHECK_CONTENTS_ID', 1, data.CHECK_CONTENTS_ID);
+ if (p.itemData.CHECK_CONTENTS_ID && p.itemData.CHECK_CONTENTS_ID !== '') {
+ extendRule(json, 'CHECK_CONTENTS_ID', 1, p.itemData.CHECK_CONTENTS_ID);
}
json.Sort = 'DESCREPTION'
dataSelect = await GetHiddenScripList(json).then(res => {
@@ -519,6 +524,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 (p.itemData.Nav_RectifyDetailReasons.length > 0 && p.itemData.Nav_RectifyDetailReasons[0]
+ .Nav_Reason != null) {
+ // this.selectorInfo.defaultChecked = []
+ p.itemData.Nav_RectifyDetailReasons.forEach(e => {
+ defaultChecked.push(e.Nav_Reason)
+ })
+ } else {
+ defaultChecked = null
+ }
}
if (defaultChecked == null)
@@ -554,46 +590,80 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_RectifyDetails.findIndex(item => item === validDetails[index]);
if (this.selectorInfo.name == 'Nav_RiskArea') {
- this.model.Nav_RectifyDetails[realIndex].Nav_RiskArea = e;
- this.model.Nav_RectifyDetails[realIndex].RISK_AREA_ID = e.ID;
+ this.selectorInfo.itemData.Nav_RiskArea = e;
+ this.selectorInfo.itemData.RISK_AREA_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_ImplementUser') {
- this.model.Nav_RectifyDetails[realIndex].Nav_ImplementUser = e;
- this.model.Nav_RectifyDetails[realIndex].IMPLEMENT_USER_ID = e.ID;
+ this.selectorInfo.itemData.Nav_ImplementUser = e;
+ this.selectorInfo.itemData.IMPLEMENT_USER_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_Question') {
- this.model.Nav_RectifyDetails[realIndex].Nav_Question = e;
- this.model.Nav_RectifyDetails[realIndex].CHECK_QUESTION_ID = e.ID;
+ this.selectorInfo.itemData.Nav_Question = e;
+ this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_AcceptUser') {
- this.model.Nav_RectifyDetails[realIndex].Nav_AcceptUser = e;
- this.model.Nav_RectifyDetails[realIndex].ACCEPT_USER_ID = e.ID;
+ this.selectorInfo.itemData.Nav_AcceptUser = e;
+ this.selectorInfo.itemData.ACCEPT_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.selectorInfo.itemData.ID,
+ REASON_ID: item.ID,
+ ORG_ID: item.ORG_ID,
+ Nav_Reason: item
+ })
+ projectShow += item.NAME
+ }
+ })
+ }
+ this.selectorInfo.itemData.Nav_RectifyDetailReasons = listProject
+ this.selectorInfo.itemData.ReasonsNAME = projectShow
}
},
- handleChange(item) {
- this.comPickerInfo = {
- showSheet: true,
- columns: [this.enumsText['SKHiddenLevel']],
- dataItem: item,
- name: name
+ handleChange(name, item) {
+ if (name == 'SKProductionUnit') {
+ const json = initFilter(this.ORG_ID)
+ getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
+ this.comPickerInfo = {
+ showSheet: true,
+ columns: [res],
+ name: name
+ }
+ })
+
+
+ } else {
+ this.comPickerInfo = {
+ showSheet: true,
+ columns: [this.enumsText[name]],
+ name: name,
+ dataItem: item,
+ }
}
},
onConfirmPicker(e) {
+ if (this.comPickerInfo.name == 'SKProductionUnit') {
+ this.model.Nav_ProductionUnit = e.value[0]
+ this.model.PRODUCTION_UNIT_ID = e.value[0].ID
+ } else {
+ this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
+ this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
+ }
this.comPickerInfo = {
showSheet: false,
- dataItem: this.comPickerInfo.dataItem,
columns: [],
title: '',
formIndex: undefined
}
- this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
- this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
-
-
},
handleNewCheckContent() {
this.model.Nav_RectifyDetails.unshift({
@@ -610,7 +680,8 @@
NAME: ''
},
Nav_Question: {
- DESCREPTION: ''
+ DESCREPTION: '',
+ DEMAND:''
},
Nav_ImplementUser: {
NAME: ''
@@ -622,12 +693,16 @@
CHECK_QUESTION_ID: '',
IMPLEMENT_USER_ID: '',
ACCEPT_USER_ID: '',
+ Nav_RectifyDetailReasons:[],
+ ReasonsNAME:'',
+
+
})
this.model.Nav_RectifyDetails = [...this.model.Nav_RectifyDetails]
},
- handleDelRowBefore(index) {
- this.nowIndex = index
- this.showDelModalIndex = index
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
confirmDel() {
@@ -638,7 +713,7 @@
this.showDelModalIndex = undefined
},
submit() {
- for (let item of this.model.Nav_RectifyDetails) {
+ for (let item of this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED)) {
if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) {
uni.showToast({
title: '请选择检查区域',
diff --git a/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue b/pages/apply/subPages/SK/riskRectifyRecordEditNew.vue
index 36259ae..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 fe3da2b..b6a6a02 100644
--- a/pages/apply/subPages/SK/riskRectifyRecordShow.vue
+++ b/pages/apply/subPages/SK/riskRectifyRecordShow.vue
@@ -1,277 +1,293 @@
-
-
-
-
-
-
-
- *
-
-
- 基本信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 整改前照片：
-
- 整改后照片：
-
- 预案或方案：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 整改前照片：
+
+ 整改后照片：
+
+ 预案或方案：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
审阅
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/apply/subPages/SK/riskRectifyShow.vue b/pages/apply/subPages/SK/riskRectifyShow.vue
index ed76b0e..1be65e9 100644
--- a/pages/apply/subPages/SK/riskRectifyShow.vue
+++ b/pages/apply/subPages/SK/riskRectifyShow.vue
@@ -24,7 +24,7 @@
-
+
@@ -71,9 +71,13 @@
-
+
-
+
+
+
+
+
@@ -84,10 +88,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
@@ -104,10 +114,10 @@
-
-
-
+
+
+
@@ -238,6 +248,14 @@
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : ''
item.RECITIFY_TIME = item.RECITIFY_TIME ? uni.$u.timeFormat(item.RECITIFY_TIME,
'yyyy-mm-dd') : ''
+ let ReasonsNAME = ''
+ if (item.Nav_RectifyDetailReasons && item.Nav_RectifyDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_RectifyDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_RectifyDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
})
}
diff --git a/pages/apply/subPages/SK/riskReportEditNew.vue b/pages/apply/subPages/SK/riskReportEditNew.vue
index 241e96b..bddf33a 100644
--- a/pages/apply/subPages/SK/riskReportEditNew.vue
+++ b/pages/apply/subPages/SK/riskReportEditNew.vue
@@ -62,7 +62,7 @@
检查内容
-
+
@@ -73,24 +73,24 @@
-
+
-
+
-
+
-
+
@@ -110,7 +110,7 @@
-
+
@@ -125,9 +125,9 @@
-
-
+
+
@@ -413,15 +413,6 @@
stepReduce() {
this.stepsPageList = this.stepsPageList - 1
},
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_ReportDetails.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
@@ -475,10 +466,8 @@
if (p.val) {
extendRule(json, 'DESCREPTION', 9, p.val);
}
-
- let data = this.model.Nav_ReportDetails[p.index]
- if (data.CHECK_CONTENTS_ID && data.CHECK_CONTENTS_ID !== '') {
- extendRule(json, 'CHECK_CONTENTS_ID', 1, data.CHECK_CONTENTS_ID);
+ if (p.itemData.CHECK_CONTENTS_ID && p.itemData.CHECK_CONTENTS_ID !== '') {
+ extendRule(json, 'CHECK_CONTENTS_ID', 1, p.itemData.CHECK_CONTENTS_ID);
}
json.Sort = 'DESCREPTION'
dataSelect = await GetHiddenScripList(json).then(res => {
@@ -540,23 +529,20 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_ReportDetails.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_ReportDetails.findIndex(item => item === validDetails[index]);
if (this.selectorInfo.name == 'Nav_RiskArea') {
- this.model.Nav_ReportDetails[realIndex].Nav_RiskArea = e;
- this.model.Nav_ReportDetails[realIndex].RISK_AREA_ID = e.ID;
+ this.selectorInfo.itemData.Nav_RiskArea = e;
+ this.selectorInfo.itemData.RISK_AREA_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_Contents') {
- this.model.Nav_ReportDetails[realIndex].Nav_Contents = e;
- this.model.Nav_ReportDetails[realIndex].CHECK_CONTENTS_ID = e.ID;
+ this.selectorInfo.itemData.Nav_Contents = e;
+ this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_Question') {
- this.model.Nav_ReportDetails[realIndex].Nav_Question = e;
- this.model.Nav_ReportDetails[realIndex].CHECK_QUESTION_ID = e.ID;
- this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVEL = e.QUESTION_LEVEL
- this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.code === e.QUESTION_LEVEL).name;
+ this.selectorInfo.itemData.Nav_Question = e;
+ this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
+ this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
+ this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.code === e.QUESTION_LEVEL).name;
} else if (this.selectorInfo.name == 'Nav_RecitifyUser') {
- this.model.Nav_ReportDetails[realIndex].Nav_RecitifyUser = e;
- this.model.Nav_ReportDetails[realIndex].RECITIFY_USER_ID = e.ID;
+ this.selectorInfo.itemData.Nav_RecitifyUser = e;
+ this.selectorInfo.itemData.RECITIFY_USER_ID = e.ID;
}
@@ -601,8 +587,7 @@
this.model.CHECK_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd hh:MM:ss')
} else if (this.dateTimePickerInfo.dataIndex == 2) {
- const realIndex = getRealIndex(this.dateTimePickerInfo.item, this.model.Nav_ReportDetails)
- this.model.Nav_ReportDetails[realIndex].RECITIFY_TIME = uni.$u.timeFormat(e.value,
+ this.dateTimePickerInfo.item.RECITIFY_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd')
}
this.dateTimePickerInfo.showCheckDate = false
@@ -638,8 +623,9 @@
})
this.model.Nav_ReportDetails = [...this.model.Nav_ReportDetails]
},
- handleDelRowBefore(index) {
- this.showDelModalIndex = index
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
@@ -665,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/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/riskSafeEvaSumShow.vue b/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
index 432b771..504154d 100644
--- a/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -59,11 +59,11 @@
-
+
-
-
+
+
@@ -81,7 +81,7 @@
-
+
@@ -107,45 +107,76 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -274,7 +305,7 @@
...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : ''
}
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -316,40 +347,45 @@
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')
+ 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['isShowControl'] = false
- item['curNow'] = 0
- item.Nav_SCOREL = item.Nav_SCOREL ? item.Nav_SCOREL : {
- SCORE: ''
- }
- item.Nav_SCOREE = item.Nav_SCOREE ? item.Nav_SCOREE : {
- SCORE: ''
- }
- item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
- SCORE: ''
- }
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
})
+ if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
+ item.Nav_DetailPosts.map(item1 => {
+ if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_PostDetails.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
},
- sectionChange(index, e) {
- this.dataModel.Nav_Details[index].curNow = e
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
- },
- changeControl(index) {
- this.dataModel.Nav_Details[index].isShowControl = this.dataModel.Nav_Details[index].isShowControl == false ? true : false
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
- },
- 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()
},
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
index f4ca2e8..43891bd 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
@@ -31,13 +31,20 @@
-
+
+
+
+
+
+
+
附件：
@@ -56,19 +63,19 @@
辨识内容
-
-
+
+
-
+
-
-
-
+
+
+
@@ -91,23 +98,23 @@
-
-
+
+
-
+
-
+
-
+
@@ -116,76 +123,99 @@
-
-
+
+
-
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增管控层级
+
-
-
-
-
-
-
-
-
- {{item1.Nav_Department?index1+1+'.管控部门 : ' +'.'+item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
@@ -231,13 +261,14 @@
EvaluationFullUpdate,
getUserLists,
GetEvaluationInfo,
- GetRiskAreaInfo,
- GetRiskTypeInfo,
+ GetNewRiskAreaInfo,
+ GetNewRiskTypeInfo,
GetDepartmentInfo,
GetRiskNameInfo,
GetScorel,
GetScoree,
- GetScorec
+ GetScorec,
+ GetPostOrderPaged
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum,
@@ -281,10 +312,10 @@
Nav_Files: [],
Nav_Details: [{
showPack: false,
- Nav_ProductionUnit:{
+ Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -310,7 +341,6 @@
EVALUATE_LEVELName: '',
Nav_DetailDeparts: [],
Nav_DetailMeasures: [],
- isShowControl: false,
}]
},
dateRecitifyTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
@@ -321,7 +351,6 @@
nowName: '',
nowIndex: 0,
childList: ['管控措施', '管控层级'],
- curNow: 0,
comPickerInfo: {
showSheet: false,
dataItem: {},
@@ -352,7 +381,7 @@
onLoad(option) {
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : '';
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -391,39 +420,44 @@
this.model.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.model.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
this.model.RequireName = res.Nav_Require.NAME
+ let Nav_RequiresName = ''
+ if (this.model.Nav_Requires && this.model.Nav_Requires.length > 0) {
+ this.model.Nav_Requires.map(item => {
+ if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
+ Nav_RequiresName += item.Nav_Require.NAME + ' ';
+ }
+ })
+ }
+ this.model.Nav_RequiresName = Nav_RequiresName
this.model.Nav_Details.map(item => {
item['showPack'] = false
- item['isShowControl'] = false
- item['curNow'] = 0
- item.Nav_SCOREL = item.Nav_SCOREL ? item.Nav_SCOREL : {
- SCORE: ''
- }
- item.Nav_SCOREE = item.Nav_SCOREE ? item.Nav_SCOREE : {
- SCORE: ''
- }
- item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
- SCORE: ''
- }
- item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK)?.name : '';
+ item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL)?.name : '';
item.Nav_DetailDeparts.map(item1 => {
- item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
+ item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE)?.name : '';
})
+ if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
+ item.Nav_DetailPosts.map(item1 => {
+ if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_PostDetails.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
})
},
- sectionChange(index, e) {
- this.model.Nav_Details[index].curNow = e
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- changeControl(index) {
- this.model.Nav_Details[index].isShowControl = this.model.Nav_Details[index].isShowControl == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- handlePack(index) {
- this.model.Nav_Details[index].showPack = this.model.Nav_Details[index].showPack == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
handleChangeUnit(name, item) {
@@ -450,7 +484,6 @@
},
onConfirmPicker(e) {
- console.log(this.comPickerInfo.dataItem)
if (this.comPickerInfo.name == 'SKProductionUnit') {
this.comPickerInfo.dataItem.Nav_ProductionUnit = e.value[0]
this.comPickerInfo.dataItem.PRODUCTION_UNIT_ID = e.value[0].ID
@@ -488,10 +521,10 @@
handleNewCheckContent() {
this.model.Nav_Details.push({
showPack: false,
- Nav_ProductionUnit:{
+ Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -517,20 +550,37 @@
EVALUATE_LEVELName: '低风险',
Nav_DetailDeparts: [],
Nav_DetailMeasures: [],
- isShowControl: false,
+ Nav_DetailPosts:[],
+ MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
+ MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
+ ID: guid()
})
this.model.Nav_Details = [...this.model.Nav_Details]
},
- handleNewControlMea(index) {
- this.model.Nav_Details[index].Nav_DetailMeasures.push({
- NUM: 0,
+ handleNewControlMea(item) {
+ item.Nav_DetailMeasures.push({
+ NUM: 1,
+ ID: guid(),
+ RISK_EVALUATION_DETAIL_ID: item.ID,
MEASURES_NAME: '',
- EMERGENCY: '',
+ IS_DELETED: false,
})
},
- handleNewControlLev(index) {
- this.model.Nav_Details[index].Nav_DetailDeparts.push({
+ handleNewPost(item) {
+ item.Nav_DetailPosts.unshift({
+ ID: guid(),
+ RISK_EVALUATION_DETAIL_ID: item.ID,
+ Nav_Department: {
+ NAME: ''
+ },
+ DEPARTMENT_ID: '',
+ Nav_PostDetails: [],
+ IS_DELETED: false,
+ })
+ },
+ handleNewControlLev(item) {
+ item.Nav_DetailDeparts.push({
DEPARTMENT_TYPE: '',
Nav_Department: {
NAME: ''
@@ -538,11 +588,12 @@
Nav_User: {
NAME: ''
},
+ RISK_EVALUATION_DETAIL_ID:item.ID
})
},
- handleDelRowBefore(index, index1, name) {
- this.showDelModalIndex = index
- this.nowIndex = [index, index1, name]
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
@@ -581,89 +632,13 @@
this.showPopupRecitifyDate = false
},
- handleChangeStep(index, index1, name) {
- this.currentOperateStep = {}
- this.showPopupStep = true
- this.nowIndex = [index, index1, name]
- this.handleSearchStep('init')
- },
- handleClosePopupStep() {
- this.showPopupStep = false
- // this.showPopupCertificate = false
- },
- handleSearchStep(val, pageIndex) {
- let requestInfo = this.nowIndex[2] == 'demand' ? GetEvaluationInfo : this.nowIndex[2] == 'Area' ? GetRiskAreaInfo : this.nowIndex[2] == 'Category' ? GetRiskTypeInfo : this.nowIndex[2] == 'Dep' ?
- GetDepartmentInfo : this.nowIndex[1] == 'RiskName' ? GetRiskNameInfo : getUserLists
- const orgId = uni.getStorageSync('orgId')
- const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
- json.Limit = 20
- if (pageIndex) {
- json.Start = (pageIndex - 1) * json.Limit;
- }
- if (val !== 'init') {
- const tempGroup = initFilterGroup(false);
- extendGroupRule(tempGroup, 'NAME', 9, val)
- extendFilterGroup(json, tempGroup);
- }
- requestInfo(json).then(res => {
- // if (res.IsSuccessful) {
- this.stepLists = (res.Data || res).map(i => {
- return {
- ...i,
- id: i.ID,
- name: i.NAME,
- }
- })
- this.curTotalStep = res.TotalCount
- // }
- })
-
-
- },
- handleSelectedStep(val) {
- if (this.nowIndex[2] == 'demand') {
- this.model.Nav_Require.NAME = val.NAME
- this.model.REQUIRE_ID = val.ID
- this.model.RequireName = val.NAME
- } else if (this.nowIndex[2] == 'Area') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID
- } else if (this.nowIndex[2] == 'Category') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID
- } else if (this.nowIndex[2] == 'Dep') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_Department.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowIndex[1] == 'RiskName') {
- this.model.Nav_Details[this.nowIndex[0]].RISK_NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID
- } else {
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_User.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].USER_ID = val.ID
- }
- this.showPopupStep = false
-
- },
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_Details.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
- // const json = initFilter(this.ORG_ID, "", "", 0, p.pageIndex ?? 1)
let dataSelect = []
+ // this.selectorInfo.defaultChecked = []
var defaultChecked = []
this.selectorInfo.isMultiple = false
-
-
-
-
if (p.val) {
extendRule(json, 'NAME', 9, p.val);
}
@@ -671,10 +646,7 @@
if (p.pageIndex) {
json.Start = (p.pageIndex - 1) * json.Limit;
}
- json.Sort = 'NAME'
- // json.SelectField = ["ID", "NAME", "NAME", "CODE"]
- // json.Sort = "NAME"
- // json.Order = 1
+ json.Sort = "NAME"
if (p.name == 'EVALUATE_L') {
// extendRule(json, 'DEVICE_STATUS', 1, '1');
@@ -683,6 +655,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -693,6 +666,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -701,6 +675,70 @@
dataSelect = await GetScorec(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount
if (res != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_Area") {
+ dataSelect = await GetNewRiskAreaInfo(json).then(res => {
+ 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 GetNewRiskTypeInfo(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_PostDetails && p.itemData.Nav_PostDetails.length > 0) {
+ // this.selectorInfo.defaultChecked = []
+
+ p.itemData.Nav_PostDetails.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
+ }
+ } else if (p.name == 'Nav_DetailDeparts') {
+ json.Include=['Nav_User']
+ 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
}
@@ -708,7 +746,6 @@
return res.Data
})
}
-
if (defaultChecked == null)
defaultChecked = []
if (dataSelect.length) {
@@ -721,8 +758,7 @@
title: p.title,
name: p.name,
dataLists: dataSelect,
- defaultChecked: defaultChecked,
- index: p.index
+ defaultChecked: defaultChecked
}
} else {
// 暂无数据
@@ -742,43 +778,85 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_Details.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_Details.findIndex(item => item === validDetails[index]);
- if (this.selectorInfo.name == 'EVALUATE_L') {
- this.model.Nav_Details[realIndex].Nav_SCOREL = e;
- this.model.Nav_Details[realIndex].SCOREL_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_E') {
- this.model.Nav_Details[realIndex].Nav_SCOREE = e;
- this.model.Nav_Details[realIndex].SCOREE_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_C') {
- this.model.Nav_Details[realIndex].Nav_SCOREC = e;
- this.model.Nav_Details[realIndex].SCOREC_ID = e.ID;
- }
- let l = this.model.Nav_Details[realIndex].Nav_SCOREL.SCORE
- let o = this.model.Nav_Details[realIndex].Nav_SCOREE.SCORE
- let c = this.model.Nav_Details[realIndex].Nav_SCOREC.SCORE
- this.model.Nav_Details[realIndex].EVALUATE_SCORE = l * o * c
- let D = this.model.Nav_Details[realIndex].EVALUATE_SCORE
- if (D >= 320) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "重大风险";
- } else if (D >= 160 && D < 320) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "较大风险";
- } else if (D >= 70 && D < 160) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "一般风险";
- } else {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "低风险";
- }
- this.model.Nav_Details[realIndex].EVALUATE_LEVEL = this.model.Nav_Details[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.model
- .Nav_Details[
- realIndex].EVALUATE_LEVELName).code : ''
+ if (this.selectorInfo.name == 'EVALUATE_L' || this.selectorInfo.name == 'EVALUATE_E' || this.selectorInfo.name == 'EVALUATE_C') {
+ if (this.selectorInfo.name == 'EVALUATE_L') {
+ this.selectorInfo.itemData.Nav_SCOREL = e;
+ this.selectorInfo.itemData.SCOREL_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_E') {
+ this.selectorInfo.itemData.Nav_SCOREE = e;
+ this.selectorInfo.itemData.SCOREE_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_C') {
+ this.selectorInfo.itemData.Nav_SCOREC = e;
+ this.selectorInfo.itemData.SCOREC_ID = e.ID;
+ }
+
+ let l = this.selectorInfo.itemData.Nav_SCOREL.SCORE
+ let o = this.selectorInfo.itemData.Nav_SCOREE.SCORE
+ let c = this.selectorInfo.itemData.Nav_SCOREC.SCORE
+ this.selectorInfo.itemData.EVALUATE_SCORE = Math.round(l * o * c)
+ let D = this.selectorInfo.itemData.EVALUATE_SCORE
+ if (D >= 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "重大风险";
+ } else if (D >= 160 && D < 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "较大风险";
+ } else if (D >= 70 && D < 160) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "一般风险";
+ } else {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "低风险";
+ }
+ this.selectorInfo.itemData.EVALUATE_LEVEL = this.selectorInfo.itemData.EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.selectorInfo.itemData
+ .EVALUATE_LEVELName).code : ''
+
+ this.$forceUpdate()
+ }
+
+ 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_DetailDeparts') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ this.selectorInfo.itemData.Nav_User = e.Nav_User
+ this.selectorInfo.itemData.USER_ID = e.Nav_User?.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_EVALUATION_DETAIL_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_PostDetails = listArea
+ this.selectorInfo.itemData.Nav_ResultPostDetsName = areaShow
+ }
+
- this.$forceUpdate()
},
+
submit() {
let i = 1
- for (let item of this.model.Nav_Details) {
+ for (let item of this.model.Nav_Details.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({
title: '顺序' + i + '生产单元不能为空',
@@ -842,22 +920,8 @@
})
return
}
- if (!item.EVALUATE_SCORE) {
- uni.showToast({
- title: '顺序' + i + '分值D不能为空',
- icon: 'none'
- })
- return
- }
- if (!item.EVALUATE_LEVELName) {
- uni.showToast({
- title: '顺序' + i + '风险等级不能为空',
- icon: 'none'
- })
- return
- }
- if (item.Nav_DetailMeasures.length !== 0) {
- for (let item1 of item.Nav_DetailMeasures) {
+ if (item.Nav_DetailMeasures.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailMeasures.filter(i => !i.IS_DELETED)) {
if (!item1.MEASURES_NAME) {
uni.showToast({
title: '顺序' + i + '管控措施不能为空',
@@ -874,8 +938,8 @@
// }
}
}
- if (item.Nav_DetailDeparts.length !== 0) {
- for (let item1 of item.Nav_DetailDeparts) {
+ if (item.Nav_DetailDeparts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailDeparts.filter(i => !i.IS_DELETED)) {
if (!item1.DEPARTMENT_TYPEName) {
uni.showToast({
title: '顺序' + i + '管控层级不能为空',
@@ -890,13 +954,7 @@
})
return
}
- if (!item1.Nav_User.NAME) {
- uni.showToast({
- title: '顺序' + i + '管控责任人不能为空',
- icon: 'none'
- })
- return
- }
+
}
}
i++
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
index ace4cde..3fd8b85 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -59,11 +59,11 @@
-
+
-
-
+
+
@@ -107,47 +107,76 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -277,7 +306,7 @@
...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : ''
}
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -319,40 +348,45 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.model.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.model.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
+ let Nav_RequiresName = ''
+ if (this.model.Nav_Requires && this.model.Nav_Requires.length > 0) {
+ this.model.Nav_Requires.map(item => {
+ if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
+ Nav_RequiresName += item.Nav_Require.NAME + ' ';
+ }
+ })
+ }
+ this.model.Nav_RequiresName = Nav_RequiresName
this.model.Nav_Details.map(item => {
item['showPack'] = false
- item['isShowControl'] = false
- item['curNow'] = 0
- item.Nav_SCOREL = item.Nav_SCOREL ? item.Nav_SCOREL : {
- SCORE: ''
- }
- item.Nav_SCOREE = item.Nav_SCOREE ? item.Nav_SCOREE : {
- SCORE: ''
- }
- item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
- SCORE: ''
- }
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
})
+ if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
+ item.Nav_DetailPosts.map(item1 => {
+ if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_PostDetails.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
},
- sectionChange(index, e) {
- this.model.Nav_Details[index].curNow = e
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- changeControl(index) {
- this.model.Nav_Details[index].isShowControl = this.model.Nav_Details[index].isShowControl == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- handlePack(index) {
- this.model.Nav_Details[index].showPack = this.model.Nav_Details[index].showPack == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
diff --git a/pages/apply/subPages/SK/riskSafeIdenEdit.vue b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
index 161b28d..5c5b518 100644
--- a/pages/apply/subPages/SK/riskSafeIdenEdit.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenEdit.vue
@@ -30,13 +30,13 @@
-
-
-
-
-
+
+
+
-
+
附件：
@@ -55,22 +55,22 @@
辨识内容
-
+
-
+
{{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
-
-
-
+
+
+
-
+
@@ -89,15 +89,32 @@
-
-
+
+
-
-
+
+
+ 新增管控措施
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -105,16 +122,11 @@
-
-
-
-
-
-
+
- 新增检查区域
+ 新增辨识区域
导入企业库内容
@@ -304,31 +316,42 @@
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&&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
})
},
- 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 => {
@@ -341,12 +364,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
},
@@ -356,9 +379,23 @@
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()
+ },
handleNewCheckContent() {
this.dataModel.Nav_Details.push({
showPack: false,
+ arrow: false,
Nav_ProductionUnit: {
NAME: ''
},
@@ -375,16 +412,16 @@
Nav_Type: {
NAME: ''
},
+ Nav_DetailMeasures:[],
MEASURE: '',
EMERGENCY: '',
- ENABLE_STATUS: this.enumsData['SKEnableStatusEnum'][0].code,
- ENABLE_STATUS_NAME: this.enumsData['SKEnableStatusEnum'][0].name,
MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
})
+ console.log(this.dataModel.Nav_Details)
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
+ this.$forceUpdate()
},
handleNewCheckList() {
// 将现有数据传递给选择页面用于去重判断
@@ -407,6 +444,7 @@
},
// 新增处理企业库选择结果的方法
handleEnterpriseSelection(selectedItems) {
+ console.log(selectedItems, '999')
if (!selectedItems || selectedItems.length === 0) return
const newDetails = []
@@ -414,7 +452,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 || '')
@@ -428,6 +466,11 @@
})
return
}
+ const convertedMeasures = (enterpriseItem.Nav_Details || [])
+ .map((item, index) => ({
+ ...item,
+ MEASURE: item.MEASURES_NAME, // 措施名称
+ }))
const convertedItem = {
showPack: false,
@@ -444,15 +487,15 @@
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,
MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
ORG_ID: this.ORG_ID
@@ -508,11 +551,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)
@@ -543,10 +590,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() {
@@ -554,7 +602,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' ? GetNewRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : GetRiskTypeInfo
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
@@ -583,19 +631,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
@@ -603,7 +651,7 @@
submit() {
let i = 1
- for (let item of this.dataModel.Nav_Details) {
+ for (let item of this.dataModel.Nav_Details.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({
title: '顺序' + i + '生产单元不能为空',
@@ -611,7 +659,7 @@
})
return
}
- if (!item.Nav_Area.NAME) {
+ if (!item.Nav_Area || !item.Nav_Area.NAME) {
uni.showToast({
title: '顺序' + i + '辨识区域不能为空',
icon: 'none'
@@ -639,7 +687,7 @@
})
return
}
- if (!item.Nav_Type.NAME) {
+ if (!item.Nav_Type || !item.Nav_Type.NAME) {
uni.showToast({
title: '顺序' + i + '风险类别不能为空',
icon: 'none'
@@ -649,40 +697,20 @@
i++
}
- // this.model = this.dataModel
+
+ this.model =JSON.parse(JSON.stringify(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/riskSafeIdenResEdit.vue b/pages/apply/subPages/SK/riskSafeIdenResEdit.vue
index 47d1204..6aa50c1 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,14 +915,14 @@
// }
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
@@ -556,39 +930,47 @@
i++
}
- // this.model = this.dataModel
+ this.model =JSON.parse(JSON.stringify(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/riskSafeIdenShow.vue b/pages/apply/subPages/SK/riskSafeIdenShow.vue
index a36265d..89b2a16 100644
--- a/pages/apply/subPages/SK/riskSafeIdenShow.vue
+++ b/pages/apply/subPages/SK/riskSafeIdenShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -78,7 +78,7 @@
-
+
@@ -89,8 +89,8 @@
-
-
+
+
@@ -119,7 +119,8 @@
guid,
initFilter,
initFilterGroup,
- handleOriginalArray
+ handleOriginalArray,
+ transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@@ -137,6 +138,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 +227,9 @@
stepsPageList: 0,
TaskID: '',
nowName: '',
- nowIndex: 0
+ nowIndex: 0,
+ enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
+ enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
}
},
onLoad(option) {
@@ -238,9 +245,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 +288,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&&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
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 @@