From 3097645a2562da3484ce93b3280085123e8cc5db Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Sat, 3 Feb 2024 17:04:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=AA=E9=99=A4=E6=B8=85=E5=96=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=9A=B1=E6=82=A3=E6=8E=92=E6=9F=A5=E6=B8=85?= =?UTF-8?q?=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delete_inventory_management/components/list.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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("恢复成功"); From 47da726664f95fc00ec9d0f1c181950f8008b3be Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Sun, 4 Feb 2024 17:06:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E8=A8=88=E5=8A=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/hazard_investigation.js | 2 +- src/views/high/job_data/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 @@ From 863092ccb74ffc57a7f41c5a0359d4e1c54ce640 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Sun, 4 Feb 2024 17:06:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory_management/add_custom.vue | 12 +------ .../components/checkstandard_add.vue | 25 ++++++++++++--- .../components/import_custom.vue | 26 +++------------ .../inventory_management/components/list.vue | 9 +++--- .../components/select_custom.vue | 32 ++++++++++++------- .../inspect_custom.vue | 17 ++++++---- 6 files changed, 63 insertions(+), 58 deletions(-) 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 @@