diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js
index 8d0c4af..f510992 100644
--- a/src/request/hazard_investigation.js
+++ b/src/request/hazard_investigation.js
@@ -69,7 +69,7 @@ export const getChecklistInspectionStatusRecordMap = (params) =>
export const getInspectionRecordList = (params) =>
post("/checkrecord/allList", params); // 检查记录管理列表
export const getTroubleshootingPlanList = (params) =>
- post("/listmanager/checkPlan", params); // 排查计划列表
+ post("/listmanager/mergeCheckPlan", params); // 排查计划列表
export const getCustomList = (params) =>
post("/hiddenstandardCustom/list", params); // 隐患排查清单管理列表
diff --git a/src/views/hazard_investigation/delete_inventory_management/components/list.vue b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
index 6f5176b..326d756 100644
--- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
@@ -235,9 +235,9 @@ const fnRecovery = debounce(
async (ID) => {
await ElMessageBox.confirm("确定要恢复吗？", { type: "warning" });
if (tabName.name === "risk") {
- await setDeleteInventoryManagementRecovery({ ID });
+ await setDeleteInventoryManagementRecovery({ LISTMANAGER_ID: ID });
} else {
- await setDeleteCustomRecovery({ ID });
+ await setDeleteCustomRecovery({ CUSTOM_ID: ID });
}
ElMessage.success("恢复成功");
diff --git a/src/views/hazard_investigation/inventory_management/add_custom.vue b/src/views/hazard_investigation/inventory_management/add_custom.vue
index de774fa..409b814 100644
--- a/src/views/hazard_investigation/inventory_management/add_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/add_custom.vue
@@ -66,17 +66,7 @@
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/hazard_investigation/inventory_management/components/import_custom.vue b/src/views/hazard_investigation/inventory_management/components/import_custom.vue
index 6871497..aedefa7 100644
--- a/src/views/hazard_investigation/inventory_management/components/import_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/components/import_custom.vue
@@ -66,17 +66,7 @@
-
-
-
-
-
-
+
{
data.userList = resData.userList;
};
const fnClose = () => {
- // form.resetFields();
+ form.value.resetFields();
visible.value = false;
};
const fnSubmit = debounce(
@@ -264,15 +254,9 @@ const fnSubmit = debounce(
if (!form.value.file[0]) {
ElMessage.warning("请上传文件！");
}
- const formData = new FormData();
- Object.keys(form.value).forEach((key) => {
- formData.append(key, form.value[key]);
- });
- formData.append("FFILE", form.value.file[0].raw);
- formData.append("FFILEName", form.value.file[0].name);
- console.log(form.value);
- console.log(formData);
- emits("submit", formData);
+ form.value.FFILE = form.value.file[0].raw;
+ form.value.FFILEName = form.value.file[0].name;
+ emits("submit", form.value);
fnClose();
},
{ atBegin: true }
diff --git a/src/views/hazard_investigation/inventory_management/components/list.vue b/src/views/hazard_investigation/inventory_management/components/list.vue
index 991b275..74c354d 100644
--- a/src/views/hazard_investigation/inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/inventory_management/components/list.vue
@@ -344,7 +344,7 @@ import {
setCustomBatchDeleteTemporary,
setCustomDisable,
setCustomEnable,
- // setCustomImport,
+ setCustomImport,
setInventoryManagementBatchDelete,
setInventoryManagementBatchDeleteTemporary,
setInventoryManagementDisable,
@@ -400,6 +400,8 @@ const data = reactive({
TYPE: "",
dates: [],
file: [],
+ FFILE: [],
+ FFILEName: "",
},
},
});
@@ -528,9 +530,8 @@ const fnInheritanceList = () => {
});
};
const fnSubmitImport = async (formData) => {
- console.log(formData.PERIOD);
- // const resData = await setCustomImport(formData);
- // ElMessage.success(resData.msg);
+ const resData = await setCustomImport(formData);
+ ElMessage.success(resData.msg);
fnResetPagination();
};
diff --git a/src/views/hazard_investigation/inventory_management/components/select_custom.vue b/src/views/hazard_investigation/inventory_management/components/select_custom.vue
index a490b90..ebb5e61 100644
--- a/src/views/hazard_investigation/inventory_management/components/select_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/components/select_custom.vue
@@ -1,13 +1,14 @@
-
+
-
+
-
+
搜索
-
+
重置
@@ -111,12 +116,12 @@ import {
getCheckstandardCommonList,
setCommonItemEdit,
} from "@/request/hazard_investigation.js";
-import { reactive, watch } from "vue";
+import { reactive, ref, watch } from "vue";
import { serialNumber } from "@/assets/js/utils.js";
import { differenceWith } from "lodash-es";
-// import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
import AddCheckstandard from "@/views/hazard_investigation/inventory_management/components/checkstandard_add.vue";
+import useFormValidate from "@/assets/js/useFormValidate.js";
const props = defineProps({
visible: {
@@ -140,7 +145,7 @@ const props = defineProps({
default: () => [],
},
});
-// const formRef = ref(null);
+const formRef = ref(null);
const data = reactive({
itemData: [],
editOrEditDialog: {
@@ -156,10 +161,12 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
clearSelection: false,
});
const getLevelData = () => {
+ searchForm.value.CHECK_ITEM = "";
+ data.itemData = [];
props.standardData.forEach((item) => {
if (
item.PARENT_ID !== "0" &&
- item.PARENT_IDS.includes(searchForm.CHECK_CATEGORY)
+ item.PARENT_IDS.includes(searchForm.value.CHECK_CATEGORY)
) {
data.itemData.push(item);
}
@@ -189,14 +196,12 @@ const fnSubmit = debounce(
);
const goEdit = (row) => {
data.editOrEditDialog.form = row;
- // data.editOrEditDialog.form.CHECK_CATEGORY = row.CHECK_CATEGORY_NAME;
- // data.editOrEditDialog.form.CHECK_ITEM = row.CHECK_ITEM_NAME;
data.editOrEditDialog.visible = true;
};
const fnEditStandardSubmit = debounce(
1000,
async () => {
- // await useFormValidate(formRef);
+ await useFormValidate(formRef);
const params = {
...data.editOrEditDialog.form,
};
@@ -205,6 +210,11 @@ const fnEditStandardSubmit = debounce(
},
{ atBegin: true }
);
+const fnResetPaginationTransfer = () => {
+ searchForm.value = [];
+ data.itemData = [];
+ fnResetPagination();
+};
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
index 975aa7a..37df502 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
@@ -37,12 +37,17 @@
检查内容
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/high/job_data/index.vue b/src/views/high/job_data/index.vue
index 9bc7f2f..a4065bb 100644
--- a/src/views/high/job_data/index.vue
+++ b/src/views/high/job_data/index.vue
@@ -133,7 +133,7 @@