From 8619753b0a6e2628b9c822fe0e59ccd4a98ea6df Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 1 Apr 2024 10:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E4=BB=A3=E7=A0=81=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E7=9A=84=E8=AD=A6=E5=91=8A=E3=80=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/constant.js | 4 +- src/assets/js/utils.js | 2 - src/request/mechanical_files.js | 9 +- src/request/operation_vehicle.js | 2 - src/request/traffic_driving_commitment.js | 8 +- src/request/traffic_driving_type.js | 6 +- src/request/user_practitioner.js | 3 +- .../driving_commitment/components/add.vue | 11 +- .../driving_type/components/add.vue | 27 +-- .../operation_vehicle/add.vue | 5 +- .../operation_vehicle/edit.vue | 22 +- .../operation_vehicle/index.vue | 16 +- .../information/edit.vue | 1 - .../user_practitioner/details.vue | 62 +++--- .../user_practitioner/edit.vue | 33 ++- .../mechanical_files/assigned_manage/add.vue | 10 +- .../mechanical_files/assigned_manage/view.vue | 204 +++++++++--------- src/views/mechanical_files/beidou/edit.vue | 2 +- .../mechanical_files/inspect_annually/add.vue | 7 +- .../inspect_annually/edit.vue | 7 +- .../inspect_annually/view.vue | 14 +- src/views/mechanical_files/insure/add.vue | 12 +- src/views/mechanical_files/insure/edit.vue | 7 +- src/views/mechanical_files/insure/view.vue | 14 +- .../mechanical_files/maintenance/add.vue | 2 +- .../mechanical_files/maintenance/edit.vue | 2 +- .../mechanical_files/maintenance/view.vue | 4 +- src/views/mechanical_files/operations/add.vue | 7 +- .../mechanical_files/operations/edit.vue | 7 +- .../mechanical_files/operations/index.vue | 1 - .../mechanical_files/scrap_manage/add.vue | 12 +- .../mechanical_files/scrap_manage/view.vue | 96 ++++----- .../mechanical_files/taxation_manage/add.vue | 51 +++-- .../mechanical_files/taxation_manage/edit.vue | 24 ++- .../mechanical_files/taxation_manage/view.vue | 118 +++++----- .../add.vue | 11 +- .../edit.vue | 5 +- .../production_equipment_facility/view.vue | 98 +++++---- .../violation_registration/add.vue | 5 +- .../violation_registration/edit.vue | 8 +- 40 files changed, 494 insertions(+), 445 deletions(-) diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index 09184d6..cf2c357 100644 --- a/src/assets/js/constant.js +++ b/src/assets/js/constant.js @@ -139,11 +139,11 @@ export const REMINDER_STATUS = [ { ID: "1", NAME: "关闭" }, ]; -export const REMIND_DAYS = [ +export const REMIND_DAYS = [ // 提醒天数 { ID: "0", NAME: "30天", NUM: "30" }, { ID: "1", NAME: "45天", NUM: "45" }, - { ID: "2", NAME: "90天", NUM: "90" } + { ID: "2", NAME: "90天", NUM: "90" }, ]; // export const MAINTENANCE_LEVEL_LIST = [ diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js index 5b6acdb..a601c10 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -414,8 +414,6 @@ export function subtractDaysFromDate(date, daysToSubtract, type = false) { } else if (Object.prototype.toString.call(date) === "[object Date]") { // 直接传入了 Date 对象 newDate = date; - } else { - console.log("无效的输入参数"); } if (type) { newDate.setDate(newDate.getDate() + daysToSubtract); diff --git a/src/request/mechanical_files.js b/src/request/mechanical_files.js index 6852fc0..cf3a6c3 100644 --- a/src/request/mechanical_files.js +++ b/src/request/mechanical_files.js @@ -26,7 +26,8 @@ export const getOperationsList = (params) => post("/operations/list", params); / export const getOperationsView = (params) => post("/operations/goEdit", params); // 运营管理查看 export const setOperationsAdd = (params) => post("/operations/add", params); // 运营管理新增 export const setOperationsEdit = (params) => post("/operations/edit", params); // 运营管理修改 -export const getOperationTrailerList = (params) => post("/operations/vehicleList", params); +export const getOperationTrailerList = (params) => + post("/operations/vehicleList", params); export const setOperationsDelete = (params) => post("/operations/delete", params); // 运营管理删除 export const setOperationsEdit2 = (params) => post("/operations/edit2", params); // 运营管理修改开启关闭 @@ -41,7 +42,8 @@ export const setMaintenanceDelete = (params) => export const setMaintenanceEdit2 = (params) => post("/maintenance/edit2", params); // 维保管理修改开启关闭 -export const getTrailerListMaintenance = (params) => post("/maintenance/vehicleList", params); +export const getTrailerListMaintenance = (params) => + post("/maintenance/vehicleList", params); export const getBeidouList = (params) => post("/beidou/list", params); // 维保管理列表 export const getBeidouView = (params) => post("/beidou/goEdit", params); // 维保管理查看 @@ -50,4 +52,5 @@ export const setBeidouEdit = (params) => post("/beidou/edit", params); // 维保 export const setBeidouDelete = (params) => post("/beidou/delete", params); // 维保管理删除 export const setBeidouEdit2 = (params) => post("/beidou/edit2", params); // 维保管理修改开启关闭 -export const getTrailerListCompass = (params) => post("/beidou/vehicleList", params); +export const getTrailerListCompass = (params) => + post("/beidou/vehicleList", params); diff --git a/src/request/operation_vehicle.js b/src/request/operation_vehicle.js index 3a88346..8540f04 100644 --- a/src/request/operation_vehicle.js +++ b/src/request/operation_vehicle.js @@ -108,8 +108,6 @@ export const findByPlateNumber = (params) => const getCorpList = (params) => post("/operatingvehicles/corpList", params); - - export const getOperationVehicleCorpList1 = async () => { const resData = await getCorpList(); return resData.list; diff --git a/src/request/traffic_driving_commitment.js b/src/request/traffic_driving_commitment.js index 7a2ccf0..a316027 100644 --- a/src/request/traffic_driving_commitment.js +++ b/src/request/traffic_driving_commitment.js @@ -6,7 +6,9 @@ export const setDrivingCommitmentDelete = (params) => post("/drivingcommitment/delete", params); // 行车日志删除 export const getSafetyDrivingCommitmentView = (params) => - post("/drivingcommitment/goEdit", params); // 安全例会详情 + post("/drivingcommitment/goEdit", params); // 行车承诺详情 -export const setDrivingCommitmentAdd = (params) => post("/drivingcommitment/add", params); // 风险点单元添加 -export const setDrivingCommitmentEdit = (params) => post("/drivingcommitment/edit", params); // 风险点单元修改 \ No newline at end of file +export const setDrivingCommitmentAdd = (params) => + post("/drivingcommitment/add", params); // 行车承诺添加 +export const setDrivingCommitmentEdit = (params) => + post("/drivingcommitment/edit", params); // 行车承诺修改 diff --git a/src/request/traffic_driving_type.js b/src/request/traffic_driving_type.js index 6e5cb74..6e6f584 100644 --- a/src/request/traffic_driving_type.js +++ b/src/request/traffic_driving_type.js @@ -6,7 +6,7 @@ export const setDrivingTypeDelete = (params) => post("/drivingtype/delete", params); // 行车日志删除 export const getSafetyDrivingTypeView = (params) => - post("/drivingtype/goEdit", params); // 安全例会详情 + post("/drivingtype/goEdit", params); // 行车排查项类型详情 -export const setDrivingTypeAdd = (params) => post("/drivingtype/add", params); // 风险点单元添加 -export const setDrivingTypeEdit = (params) => post("/drivingtype/edit", params); // 风险点单元修改 \ No newline at end of file +export const setDrivingTypeAdd = (params) => post("/drivingtype/add", params); // 行车排查项类型添加 +export const setDrivingTypeEdit = (params) => post("/drivingtype/edit", params); // 行车排查项类型修改 diff --git a/src/request/user_practitioner.js b/src/request/user_practitioner.js index 809c630..6fbfc06 100644 --- a/src/request/user_practitioner.js +++ b/src/request/user_practitioner.js @@ -12,7 +12,8 @@ export const setPractitionerReview = (params) => export const getPractitionerInfo = (params) => post("/user/getPractitionerInfo", params); -export const getPractitionerForEdit = (params) => post("/user/getPractitionerForEdit", params); // 用户管理查看 +export const getPractitionerForEdit = (params) => + post("/user/getPractitionerForEdit", params); // 用户管理查看 // 从业人员添加(需从业人员确认) export const setPractitionerAdd = (params) => diff --git a/src/views/driving_inspections/driving_commitment/components/add.vue b/src/views/driving_inspections/driving_commitment/components/add.vue index 2d13049..89f8086 100644 --- a/src/views/driving_inspections/driving_commitment/components/add.vue +++ b/src/views/driving_inspections/driving_commitment/components/add.vue @@ -7,9 +7,9 @@ @@ -26,7 +26,10 @@ import { useVModels } from "@vueuse/core"; import { debounce } from "throttle-debounce"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; -import {setDrivingCommitmentAdd, setDrivingCommitmentEdit} from "@/request/traffic_driving_commitment.js"; +import { + setDrivingCommitmentAdd, + setDrivingCommitmentEdit, +} from "@/request/traffic_driving_commitment.js"; const props = defineProps({ visible: { diff --git a/src/views/driving_inspections/driving_type/components/add.vue b/src/views/driving_inspections/driving_type/components/add.vue index 4eb6cd4..ae119d4 100644 --- a/src/views/driving_inspections/driving_type/components/add.vue +++ b/src/views/driving_inspections/driving_type/components/add.vue @@ -8,21 +8,21 @@ - + @@ -39,8 +39,11 @@ import { useVModels } from "@vueuse/core"; import { debounce } from "throttle-debounce"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; -import {setDrivingTypeAdd, setDrivingTypeEdit} from "@/request/traffic_driving_type.js"; -import {layoutFnGetDrivingType} from "@/assets/js/data_dictionary.js"; +import { + setDrivingTypeAdd, + setDrivingTypeEdit, +} from "@/request/traffic_driving_type.js"; +import { layoutFnGetDrivingType } from "@/assets/js/data_dictionary.js"; const props = defineProps({ visible: { @@ -68,9 +71,7 @@ const rules = { CHECKITEMNAME: [ { required: true, message: "排查项名称不能为空", trigger: "blur" }, ], - REMARKS: [ - { required: true, message: "排查项说明不能为空", trigger: "blur" }, - ], + REMARKS: [{ required: true, message: "排查项说明不能为空", trigger: "blur" }], }; const formRef = ref(null); const fnClose = () => { diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue index 6721b13..a06223a 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue @@ -449,15 +449,14 @@ const rules = { { required: true, message: "请输入发动机号", trigger: "blur" }, { min: 7, max: 8, message: "请输入7-8位发动机号", trigger: "blur" }, { - pattern: - /^[A-Z0-9a-z\d]{7,8}$/, + pattern: /^[A-Z0-9a-z\d]{7,8}$/, message: "请输入正确的发动机号", }, ], VOUCH_NUMBERLOAD: [ { required: true, message: "请输入核定载人数", trigger: "blur" }, { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, - ] + ], }; const formRef = ref(null); const form = ref({ diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue index d3b1e65..aec1834 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue @@ -5,10 +5,7 @@ - + @@ -328,7 +325,8 @@ import { import { findByIdOperatingVehicleInfo, editOperatingVehicleInfo, - addOperatingVehicleInfo, findByPlateNumber + addOperatingVehicleInfo, + findByPlateNumber, } from "@/request/operation_vehicle.js"; import useFormValidate from "@/assets/js/useFormValidate.js"; @@ -343,17 +341,17 @@ import LayoutDepartment from "@/components/department/index.vue"; const route = useRoute(); const router = useRouter(); const { OPERATING_ID } = route.query; -let plateNumber = '' +let plateNumber = ""; const isPlateNumberRepetition = async (rule, vehicleNumber, callback) => { if (vehicleNumber) { const vehicleCount = await findByPlateNumber({ vehicleNumber }); - if(vehicleCount.pd) { - if(vehicleCount.pd.PLATE_NUMBER === plateNumber){ + if (vehicleCount.pd) { + if (vehicleCount.pd.PLATE_NUMBER === plateNumber) { callback(); - }else{ - callback(new Error("车辆已存在")) + } else { + callback(new Error("车辆已存在")); } - }else callback(); + } else callback(); } }; const isVehicleNumber = (rule, vehicleNumber, callback) => { @@ -495,7 +493,7 @@ const fnGetData = async () => { form.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile( resData.operatingcertificatephoto ); - plateNumber = form.value.PLATE_NUMBER + plateNumber = form.value.PLATE_NUMBER; }; fnGetData(); const fnSubmit = debounce( diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue index 7554f6d..0391c28 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue @@ -57,7 +57,7 @@ - @@ -29,7 +29,7 @@ {{ data.busInfo.INITIAL_REGISTRATION_DATE }} - + {{ data.busInfo.COMPANY_AREA }} diff --git a/src/views/mechanical_files/operations/add.vue b/src/views/mechanical_files/operations/add.vue index 79db9aa..201b31a 100644 --- a/src/views/mechanical_files/operations/add.vue +++ b/src/views/mechanical_files/operations/add.vue @@ -159,7 +159,7 @@ :value="item.NUM" /> - - - {{ data.FIRSTSHOW_DATE }} - - - {{ data.BRAND }} - - - {{ data.VEHICLE_MODEL }} - - - - 报废数据 - - - {{ data.RECORD_NUMBER }} - - - {{ data.SCRAP_DATE }} - - - {{ data.REGISTRANT }} - - - - - {{ data.SCRAP_MATERIAL }} - - - - - {{ data.REMARK }} - - + + 报废数据 + + + {{ data.RECORD_NUMBER }} + + + {{ data.SCRAP_DATE }} + + + {{ data.REGISTRANT }} + + + + + {{ data.SCRAP_MATERIAL }} + + + + + {{ data.REMARK }} + +
打印 diff --git a/src/views/mechanical_files/taxation_manage/add.vue b/src/views/mechanical_files/taxation_manage/add.vue index 0663734..18ad55c 100644 --- a/src/views/mechanical_files/taxation_manage/add.vue +++ b/src/views/mechanical_files/taxation_manage/add.vue @@ -69,11 +69,7 @@ - + @@ -174,7 +170,7 @@ :value="item.NUM" /> -