diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js index 988e9d8..cbb36bf 100644 --- a/src/request/hazard_investigation.js +++ b/src/request/hazard_investigation.js @@ -95,10 +95,15 @@ export const setCheckStandardSupplementaryRecordingSubmit = (params) => post("/customCheckrecord/recording", params); // 隐患排查清单检查情况检查记录补录提交 export const setCheckStandardSubmit = (params) => post("/customCheckrecord/add", params); // 清单排查提交 - export const getDeleteCustomList = (params) => post("/customStop/list", params); // 删除清单管理列表 export const setDeleteCustomRecovery = (params) => post("/customStop/restore", params); // 删除清单管理恢复 export const setCustomBatchDelete = (params) => post("/customStop/deleteAll", params); // 清单管理批量删除 export const getCustomStopView = (params) => post("/customStop/goEdit", params); // 清单管理查看 +export const getCustomCheckRecordList = (params) => + post("/customCheckrecord/list", params); // 隐患清单排查列表 +export const getCustomCheckRecordView = (params) => + post("/customCheckrecord/goEdit", params); // 隐患清单排查查询单个 +export const setDeleteCustommCheckrecord = (params) => + post("/customCheckrecord/delete", params); // 删除隐患清单排查记录 diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue index 49bb72e..ab06845 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue @@ -3,7 +3,7 @@ 清单信息 - {{ info.LIST_NAME }} + {{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }} {{ info.SCREENTYPENAME }} @@ -66,7 +66,8 @@ 检查内容 -
+ +
@@ -109,7 +110,7 @@
- +
@@ -153,6 +154,97 @@
序号
+ +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号检查类别检查项目检查内容检查标准参考依据检查结果状态
{{ index + 1 }}{{ item.CHECK_CATEGORY_NAME }}{{ item.CHECK_ITEM_NAME }}{{ item.CHECK_CONTENT }}{{ item.CHECK_STANDARD }}{{ item.REFERENCE_BASIS }}{{ item.CHECK_RESULT }}
其他隐患
@@ -209,6 +301,7 @@ import { useRouter } from "vue-router"; import { reactive, ref } from "vue"; import { getChecklistInspectionStatusRecordView, + getCustomCheckRecordView, getChecklistInspectionStatusRecordViewOtherHiddenDangerList, } from "@/request/hazard_investigation.js"; import { getViewImg } from "@/request/api.js"; @@ -232,6 +325,11 @@ const props = defineProps({ required: true, default: "", }, + listType: { + type: String, + required: true, + default: "", + }, }); const hiddenPath = { checklist_inspection_status: @@ -251,7 +349,9 @@ const data = reactive({ mapDialogVisible: false, }); const { list: inspectionList } = useListData( - getChecklistInspectionStatusRecordView, + props.listType === 1 + ? getChecklistInspectionStatusRecordView + : getCustomCheckRecordView, { otherParams: { CHECKRECORD_ID: props.checkRecordId }, usePagination: false, diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue index 1da56d8..6f0d964 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/index.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue @@ -210,7 +210,8 @@ router.push({ path: '/hazard_investigation/checklist_inspection_status/inspection_record', query: { - LISTMANAGER_ID: row.LISTMANAGER_ID, + LIST_ID: row.LISTMANAGER_ID, + LIST_TYPE: row.list_type, }, }) " diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue index b337385..85bb6f7 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue @@ -86,6 +86,7 @@ path: '/hazard_investigation/checklist_inspection_status/inspection_record/view', query: { CHECKRECORD_ID: row.CHECKRECORD_ID, + LIST_TYPE: LIST_TYPE, }, }) " @@ -114,7 +115,8 @@ CHECKRECORD_ID: row.CHECKRECORD_ID, DATESTART: row.DATESTART, DATEEND: row.DATEEND, - LISTMANAGER_ID, + LIST_TYPE: LIST_TYPE, + LIST_ID, }, }) " @@ -136,6 +138,8 @@ import { serialNumber } from "@/assets/js/utils"; import { getChecklistInspectionStatusRecordList, setChecklistInspectionStatusRecordDelete, + setDeleteCustommCheckrecord, + getCustomCheckRecordList, } from "@/request/hazard_investigation.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; @@ -144,15 +148,23 @@ import useListData from "@/assets/js/useListData.js"; const route = useRoute(); const router = useRouter(); -const { LISTMANAGER_ID } = route.query; +const { LIST_ID, LIST_TYPE } = route.query; const info = ref({}); const { list, pagination, searchForm, fnGetData, fnResetPagination } = - useListData(getChecklistInspectionStatusRecordList, { - otherParams: { LISTMANAGER_ID }, - callbackFn: (list, resData) => { - info.value = resData.ls; - }, - }); + useListData( + LIST_TYPE === "1" + ? getChecklistInspectionStatusRecordList + : getCustomCheckRecordList, + { + otherParams: + LIST_TYPE === "1" + ? { LISTMANAGER_ID: LIST_ID } + : { CUSTOM_ID: LIST_ID }, + callbackFn: (list, resData) => { + info.value = resData.ls; + }, + } + ); const fnGetDataTransfer = () => { fnGetData({ STARTTIME: searchForm.value.dates?.[0], @@ -170,7 +182,9 @@ const fnDelete = debounce( 1000, async (CHECKRECORD_ID) => { await ElMessageBox.confirm("确定要删除吗？", { type: "warning" }); - await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }); + LIST_TYPE === "1" + ? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }) + : await setDeleteCustommCheckrecord({ CHECKRECORD_ID }); ElMessage.success("删除成功"); fnResetPaginationTransfer(); }, diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue index 10432b8..29b895f 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue @@ -4,6 +4,7 @@
@@ -23,7 +24,7 @@ defineProps({ }, }); const route = useRoute(); -const { CHECKRECORD_ID } = route.query; +const { CHECKRECORD_ID, LIST_TYPE } = route.query; diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue index c9b09a0..b6f7046 100644 --- a/src/views/hazard_investigation/inspection_record/index.vue +++ b/src/views/hazard_investigation/inspection_record/index.vue @@ -103,6 +103,7 @@ path: '/hazard_investigation/inspection_record/view', query: { CHECKRECORD_ID: row.CHECKRECORD_ID, + LIST_TYPE: row.LIST_TYPE, }, }) " @@ -114,7 +115,7 @@ type="primary" text link - @click="fnDelete(row.CHECKRECORD_ID)" + @click="fnDelete(row.LIST_TYPE, row.CHECKRECORD_ID)" > 删除 @@ -132,6 +133,7 @@ DATESTART: row.DATESTART, DATEEND: row.DATEEND, LISTMANAGER_ID: row.LISTMANAGER_ID, + LIST_TYPE, }, }) " @@ -153,6 +155,7 @@ import { serialNumber } from "@/assets/js/utils"; import { getInspectionRecordList, setChecklistInspectionStatusRecordDelete, + setDeleteCustommCheckrecord, } from "@/request/hazard_investigation.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; @@ -186,9 +189,11 @@ const fnResetPaginationTransfer = () => { const buttonJurisdiction = await useButtonJurisdiction("checkrecord"); const fnDelete = debounce( 1000, - async (CHECKRECORD_ID) => { + async (LIST_TYPE, CHECKRECORD_ID) => { await ElMessageBox.confirm("确定要删除吗？", { type: "warning" }); - await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }); + LIST_TYPE === "1" + ? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }) + : await setDeleteCustommCheckrecord({ CHECKRECORD_ID }); ElMessage.success("删除成功"); fnResetPaginationTransfer(); }, diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue index 323c507..0cc216c 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue @@ -244,7 +244,7 @@ v-model:form="data.unQualifiedDialog.form" :type="data.unQualifiedDialog.type" :hidden-type="data.unQualifiedDialog.hiddenType" - :list-manager-id="LISTMANAGER_ID" + :list-manager-id="LIST_ID" :info="{ ...data.unQualifiedDialog.info, ...info.value }" :longitude="data.longitude" :latitude="data.latitude" @@ -262,6 +262,7 @@ import { setHiddenDangerDelete, setInventoryTroubleshootingSubmit, setChecklistInspectionStatusRecordSupplementaryRecordingSubmit, + getCheckStandardManagementView, } from "@/request/hazard_investigation.js"; import { useRoute, useRouter } from "vue-router"; import useListData from "@/assets/js/useListData.js"; @@ -283,7 +284,7 @@ import { WarningFilled } from "@element-plus/icons-vue"; const route = useRoute(); const router = useRouter(); -const { LISTMANAGER_ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query; +const { LIST_ID, CHECKRECORD_ID, DATEEND, DATESTART, LIST_TYPE } = route.query; // entrance: supplementaryRecording是补录，空值是正常录入 const props = defineProps({ entrance: { @@ -337,24 +338,32 @@ const data = reactive({ }, }, }); -const { list: inspectionList } = useListData(getInventoryManagementView, { - otherParams: { LISTMANAGER_ID }, - usePagination: false, - callbackFn: (list, resData) => { - for (let i = 0; i < list.length; i++) { - if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; - if (list[i].ELECTRONIC_FENCE_ID) { - // 存在电子围栏禁止清单排查 - data.canDoCheck = false; +const { list: inspectionList } = useListData( + LIST_TYPE === "1" + ? getInventoryManagementView + : getCheckStandardManagementView, + { + otherParams: + LIST_TYPE === "1" ? { LISTMANAGER_ID: LIST_ID } : { ID: LIST_ID }, + usePagination: false, + callbackFn: (list, resData) => { + if (LIST_TYPE === "1") { + for (let i = 0; i < list.length; i++) { + if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; + if (list[i].ELECTRONIC_FENCE_ID) { + // 存在电子围栏禁止清单排查 + data.canDoCheck = false; + } + } } - } - info.value = resData.pd; - }, -}); + info.value = resData.pd; + }, + } +); const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData( getInventoryTroubleshootingOtherHiddenList, { - otherParams: { LISTMANAGER_ID }, + otherParams: { LIST_ID }, usePagination: false, key: "hiddenList", } @@ -501,7 +510,7 @@ const fnSubmit = debounce( const inspectedList = cloneDeep(data.form.inspectedList); if (inspectedList.length > 0) inspectedList.splice(0, 1); const params = { - LISTMANAGER_ID, + LIST_ID, LIST_NAME: info.value.NAME, CHECK_TIME: data.form.CHECK_TIME, DESCR: data.form.DESCR,