From 46487fb9c15b59da90a0882a9736a55f0cdc125c Mon Sep 17 00:00:00 2001 From: "277151821@qq.com" <277151821@qq.com> Date: Mon, 13 May 2024 17:55:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=90=E6=A3=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/mechanical_files.js | 13 + .../tank_truck_inspection/components/add.vue | 112 +++++ .../tank_truck_inspection/components/view.vue | 42 ++ .../tank_truck_inspection/index.vue | 165 +++++++ .../tank_truck_inspection_record/add.vue | 450 ++++++++++++++++++ .../tank_truck_inspection_record/edit.vue | 448 +++++++++++++++++ .../tank_truck_inspection_record/index.vue | 182 +++++++ .../tank_truck_inspection_record/view.vue | 165 +++++++ 8 files changed, 1577 insertions(+) create mode 100644 src/views/mechanical_files/tank_truck/tank_truck_inspection/components/add.vue create mode 100644 src/views/mechanical_files/tank_truck/tank_truck_inspection/components/view.vue create mode 100644 src/views/mechanical_files/tank_truck/tank_truck_inspection/index.vue create mode 100644 src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/add.vue create mode 100644 src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/edit.vue create mode 100644 src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/index.vue create mode 100644 src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/view.vue diff --git a/src/request/mechanical_files.js b/src/request/mechanical_files.js index cf3a6c3..ddfcb89 100644 --- a/src/request/mechanical_files.js +++ b/src/request/mechanical_files.js @@ -54,3 +54,16 @@ export const setBeidouEdit2 = (params) => post("/beidou/edit2", params); // 维 export const getTrailerListCompass = (params) => post("/beidou/vehicleList", params); + +export const getTankTruckInspectionList = (params) => post("/tankTruckInspection/list", params); // 罐检项配置列表 +export const getTankTruckInspectionListAll = (params) => post("/tankTruckInspection/tankTruckInspectionListAll", params); // 罐检项配置不分页列表 +export const getTankTruckInspectionView = (params) => post("/tankTruckInspection/goEdit", params); // 罐检项配置查看 +export const setTankTruckInspectionAdd = (params) => post("/tankTruckInspection/add", params); // 罐检项配置新增 +export const setTankTruckInspectionEdit = (params) => post("/tankTruckInspection/edit", params); // 罐检项配置修改 +export const setTankTruckInspectionDelete = (params) => post("/tankTruckInspection/delete", params); // 罐检项配置删除 + +export const getTankTruckInspectionRecordList = (params) => post("/tankTruckInspectionRecord/list", params); // 罐检项检查列表 +export const getTankTruckInspectionRecordView = (params) => post("/tankTruckInspectionRecord/goEdit", params); // 罐检项检查查看 +export const setTankTruckInspectionRecordAdd = (params) => post("/tankTruckInspectionRecord/add", params); // 罐检项检查新增 +export const setTankTruckInspectionRecordEdit = (params) => post("/tankTruckInspectionRecord/edit", params); // 罐检项检查修改 +export const setTankTruckInspectionRecordDelete = (params) => post("/tankTruckInspectionRecord/delete", params); // 罐检项检查删除 \ No newline at end of file diff --git a/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/add.vue b/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/add.vue new file mode 100644 index 0000000..0fbdce2 --- /dev/null +++ b/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/add.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/view.vue b/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/view.vue new file mode 100644 index 0000000..358f0b4 --- /dev/null +++ b/src/views/mechanical_files/tank_truck/tank_truck_inspection/components/view.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck/tank_truck_inspection/index.vue b/src/views/mechanical_files/tank_truck/tank_truck_inspection/index.vue new file mode 100644 index 0000000..2d40bd4 --- /dev/null +++ b/src/views/mechanical_files/tank_truck/tank_truck_inspection/index.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/add.vue b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/add.vue new file mode 100644 index 0000000..afff9d9 --- /dev/null +++ b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/add.vue @@ -0,0 +1,450 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/edit.vue b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/edit.vue new file mode 100644 index 0000000..334810f --- /dev/null +++ b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/edit.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/index.vue b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/index.vue new file mode 100644 index 0000000..e09f50e --- /dev/null +++ b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/index.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/view.vue b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/view.vue new file mode 100644 index 0000000..6bcc9a1 --- /dev/null +++ b/src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/view.vue @@ -0,0 +1,165 @@ + + + + + From 7874734e3188775e14af8461902303024d20d20d Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 13 May 2024 18:01:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=90=A5=E8=BF=90=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E8=A1=8C=E8=BD=A6=E4=B8=89?= =?UTF-8?q?=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../waybill_registration/add.vue | 19 ++++++++++++++----- .../waybill_registration/edit.vue | 8 ++++---- .../waybill_registration/index.vue | 4 +++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue index 7d8b235..412ceb9 100644 --- a/src/views/electronic_waybill_management/waybill_registration/add.vue +++ b/src/views/electronic_waybill_management/waybill_registration/add.vue @@ -59,9 +59,9 @@ > @@ -294,6 +294,7 @@ import { addSafetyWaybillreView, getUserPersonTypeListAll, + getSecurityWaybillreList, } from "@/request/waybill_registration.js"; import { onMounted, reactive, ref, watchEffect } from "vue"; import useFormValidate from "@/assets/js/useFormValidate.js"; @@ -534,7 +535,16 @@ const changeDESTINATION = () => { const fnVehicle = async () => { const res = await getOperationVehicleList(); const varList = res.varList || []; - data.OperationVehicle = varList.map((item) => item.PLATE_NUMBER); + data.OperationVehicle = varList; + const waybillList = await getSecurityWaybillreList(); + waybillList.varList = waybillList.varList.filter((item) => { + return item.WAYBILLSTATUS !== "2"; + }); + waybillList.varList.forEach((item1) => { + data.OperationVehicle = data.OperationVehicle.filter((item2) => { + return item2.PLATE_NUMBER !== item1.TRANSPORTVEHICLE; + }); + }); }; const fnTruck = async () => { @@ -671,7 +681,6 @@ onMounted(async () => { await fnVehicle(); await fnTruck(); }); - const fnSubmit = async () => { await useFormValidate(formRef); const formData = new FormData(); diff --git a/src/views/electronic_waybill_management/waybill_registration/edit.vue b/src/views/electronic_waybill_management/waybill_registration/edit.vue index cea4749..613ad4e 100644 --- a/src/views/electronic_waybill_management/waybill_registration/edit.vue +++ b/src/views/electronic_waybill_management/waybill_registration/edit.vue @@ -59,9 +59,9 @@ > @@ -550,7 +550,7 @@ fnGetUnitsList(); const fnVehicle = async () => { const res = await getOperationVehicleList(); const varList = res.varList || []; - data.OperationVehicle = varList.map((item) => item.PLATE_NUMBER); + data.OperationVehicle = varList.map((item) => item); }; const fnTruck = async () => { diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue index 9683ca9..2f2ab5c 100644 --- a/src/views/electronic_waybill_management/waybill_registration/index.vue +++ b/src/views/electronic_waybill_management/waybill_registration/index.vue @@ -22,6 +22,7 @@ + @@ -52,7 +53,8 @@