diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue index 0cc216c..a7a7647 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue @@ -262,7 +262,6 @@ import { setHiddenDangerDelete, setInventoryTroubleshootingSubmit, setChecklistInspectionStatusRecordSupplementaryRecordingSubmit, - getCheckStandardManagementView, } from "@/request/hazard_investigation.js"; import { useRoute, useRouter } from "vue-router"; import useListData from "@/assets/js/useListData.js"; @@ -284,7 +283,7 @@ import { WarningFilled } from "@element-plus/icons-vue"; const route = useRoute(); const router = useRouter(); -const { LIST_ID, CHECKRECORD_ID, DATEEND, DATESTART, LIST_TYPE } = route.query; +const { ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query; // entrance: supplementaryRecording是补录,空值是正常录入 const props = defineProps({ entrance: { @@ -338,32 +337,24 @@ const data = reactive({ }, }, }); -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; - } - } +const { list: inspectionList } = useListData(getInventoryManagementView, { + otherParams: { LISTMANAGER_ID: 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; } - info.value = resData.pd; - }, - } -); + } + info.value = resData.pd; + }, +}); const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData( getInventoryTroubleshootingOtherHiddenList, { - otherParams: { LIST_ID }, + otherParams: { LISTMANAGER_ID: ID }, usePagination: false, key: "hiddenList", } @@ -510,7 +501,7 @@ const fnSubmit = debounce( const inspectedList = cloneDeep(data.form.inspectedList); if (inspectedList.length > 0) inspectedList.splice(0, 1); const params = { - LIST_ID, + LISTMANAGER_ID: ID, LIST_NAME: info.value.NAME, CHECK_TIME: data.form.CHECK_TIME, DESCR: data.form.DESCR, diff --git a/src/views/risk_control/identifying_parts/components/add.vue b/src/views/risk_control/identifying_parts/components/add.vue index fbf75c1..67d8708 100644 --- a/src/views/risk_control/identifying_parts/components/add.vue +++ b/src/views/risk_control/identifying_parts/components/add.vue @@ -124,7 +124,7 @@ const fnClose = () => { const fnRemoveRegName = debounce( 1000, async () => { - form.value.ELECTRONIC_FENCE = ""; + form.value.ELECTRONIC_FENCE_NAME = ""; form.value.ELECTRONIC_FENCE_ID = ""; }, { atBegin: true }