diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue index 49734de..7ed678b 100644 --- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue +++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue @@ -16,6 +16,7 @@ + @@ -134,6 +135,9 @@ 消防点检 + + 点检隐患 + diff --git a/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue b/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue index 03ca396..510ff07 100644 --- a/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue +++ b/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue @@ -23,6 +23,9 @@ + diff --git a/src/views/hidden/zczb/components/hidden.vue b/src/views/hidden/zczb/components/hidden.vue index 02b1c91..b65b7cc 100644 --- a/src/views/hidden/zczb/components/hidden.vue +++ b/src/views/hidden/zczb/components/hidden.vue @@ -19,6 +19,9 @@ + diff --git a/src/views/hiddenUtil/information.vue b/src/views/hiddenUtil/information.vue index 46bd6ba..c4bd98e 100644 --- a/src/views/hiddenUtil/information.vue +++ b/src/views/hiddenUtil/information.vue @@ -28,6 +28,9 @@ + 隐患描述 diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue index 4c7fb05..48939a9 100644 --- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue +++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue @@ -14,6 +14,7 @@ + @@ -111,6 +112,9 @@ 安全环保检查(企业端) + + 点检隐患 + diff --git a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue index fb50645..d3589fb 100644 --- a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue +++ b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue @@ -9,6 +9,7 @@ + @@ -87,6 +88,9 @@ 安全环保检查(企业端) + + 点检隐患 + diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue index 1d02246..6fe19fe 100644 --- a/src/views/keyprojects/hidden/components/list.vue +++ b/src/views/keyprojects/hidden/components/list.vue @@ -151,7 +151,8 @@ export default { sourceState: { 1: 'AI报警', 4: '安全环保检查(监管端)', - 5: '安全环保检查(企业端)' + 5: '安全环保检查(企业端)', + 8: '点检隐患' }, state: { 1: '未整改', @@ -161,7 +162,8 @@ export default { SOURCEList: [ { ID: '1', NAME: 'AI报警' }, { ID: '4', NAME: '安全环保检查(监管端)' }, - { ID: '5', NAME: '安全环保检查(企业端)' } + { ID: '5', NAME: '安全环保检查(企业端)' }, + { ID: '8', NAME: '点检隐患' } ], zList: [ { ID: '1', NAME: '未整改' }, diff --git a/src/views/keyprojects/relevantunits/components/edit.vue b/src/views/keyprojects/relevantunits/components/edit.vue index e3a1021..7e811bd 100644 --- a/src/views/keyprojects/relevantunits/components/edit.vue +++ b/src/views/keyprojects/relevantunits/components/edit.vue @@ -27,6 +27,9 @@ + 隐患描述 diff --git a/src/views/relevantunits/audit/components/list.vue b/src/views/relevantunits/audit/components/list.vue index 4f29611..a733db9 100644 --- a/src/views/relevantunits/audit/components/list.vue +++ b/src/views/relevantunits/audit/components/list.vue @@ -357,7 +357,8 @@ export default { EMPLOYMENT_FORM: this.searchForm.EMPLOYMENT_FORM, SELECT_FORM: this.searchForm.SELECT_FORM, MAIN_DEP: JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID, - CORP_TYPE: this.searchForm.CORP_TYPE + CORP_TYPE: this.searchForm.CORP_TYPE, + canApprove: '1' } ).then((data) => { this.listLoading = false diff --git a/src/views/relevantunits/base/components/corpInfoList.vue b/src/views/relevantunits/base/components/corpInfoList.vue new file mode 100644 index 0000000..a417039 --- /dev/null +++ b/src/views/relevantunits/base/components/corpInfoList.vue @@ -0,0 +1,520 @@ + + + diff --git a/src/views/relevantunits/base/index.vue b/src/views/relevantunits/base/index.vue new file mode 100644 index 0000000..eb2249a --- /dev/null +++ b/src/views/relevantunits/base/index.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/relevantunits/cargo_owner/components/corpInfoList.vue b/src/views/relevantunits/cargo_owner/components/corpInfoList.vue new file mode 100644 index 0000000..dc837bb --- /dev/null +++ b/src/views/relevantunits/cargo_owner/components/corpInfoList.vue @@ -0,0 +1,519 @@ + + + diff --git a/src/views/relevantunits/cargo_owner/index.vue b/src/views/relevantunits/cargo_owner/index.vue new file mode 100644 index 0000000..eb2249a --- /dev/null +++ b/src/views/relevantunits/cargo_owner/index.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/relevantunits/insert/components/corpInfoAdd.vue b/src/views/relevantunits/insert/components/corpInfoAdd.vue index af2e497..a05b3c7 100644 --- a/src/views/relevantunits/insert/components/corpInfoAdd.vue +++ b/src/views/relevantunits/insert/components/corpInfoAdd.vue @@ -80,6 +80,15 @@ + + + + + + + 注意:若相关方企业类型为驻港、货主时,该企业的所有信息将不会被统计在相关方统计中,仅在对应的统计功能中展示 + + @@ -354,7 +363,8 @@ export default { CITY: '', COUNTY: '', VILLAGE: '', - INDUSTRYALL: '' + INDUSTRYALL: '', + TYPE: '' }, hylxList: [], // 国民经济行业分类 (GB-T4754-2017) dialogImageUrl: '', // 上传图片预览 diff --git a/src/views/relevantunits/insert/components/corpInfoEdit.vue b/src/views/relevantunits/insert/components/corpInfoEdit.vue index 99514ec..7a5a61a 100644 --- a/src/views/relevantunits/insert/components/corpInfoEdit.vue +++ b/src/views/relevantunits/insert/components/corpInfoEdit.vue @@ -83,6 +83,14 @@ + + + + + + + + @@ -232,7 +240,6 @@ export default { { RELEVANT_UNIT_NAME: value, CORPINFO_ID: this.$parent.CORPINFO_ID - } ).then((data) => { if (data.pd) { @@ -370,7 +377,8 @@ export default { CITY: '', COUNTY: '', VILLAGE: '', - INDUSTRYALL: '' + INDUSTRYALL: '', + TYPE: '' }, hylxList: [], // 国民经济行业分类 (GB-T4754-2017) dialogImageUrl: '', // 上传图片预览 diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue index f76c6ec..f3f01e8 100644 --- a/src/views/safetyenvironmental/archive/components/accept.vue +++ b/src/views/safetyenvironmental/archive/components/accept.vue @@ -23,6 +23,9 @@ + 隐患描述 diff --git a/src/views/safetyenvironmental/assess/components/info.vue b/src/views/safetyenvironmental/assess/components/info.vue index b5dff48..0adca99 100644 --- a/src/views/safetyenvironmental/assess/components/info.vue +++ b/src/views/safetyenvironmental/assess/components/info.vue @@ -14,6 +14,9 @@ + 位置 diff --git a/src/views/xgf/flow_warden/components/list.vue b/src/views/xgf/flow_warden/components/list.vue index f8638e7..71e87b7 100644 --- a/src/views/xgf/flow_warden/components/list.vue +++ b/src/views/xgf/flow_warden/components/list.vue @@ -42,6 +42,8 @@ + +