diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index b6cf6f6..85dd58e 100644 --- a/src/assets/js/constant.js +++ b/src/assets/js/constant.js @@ -82,6 +82,12 @@ export const REMINDER_STATUS_LIST = [ {ID:'0',NAME:'关闭'}, ] +export const DISPOSE_STATUS_LIST = [ + // 处理状态 + {ID:'1',NAME:'处理中'}, + {ID:'0',NAME:'处理完成'}, +] + // export const MAINTENANCE_LEVEL_LIST = [ // //维保等级 diff --git a/src/request/enterprise_safety_production.js b/src/request/enterprise_safety_production.js new file mode 100644 index 0000000..6dd6855 --- /dev/null +++ b/src/request/enterprise_safety_production.js @@ -0,0 +1,14 @@ +import { post, upload } from "@/request/axios.js"; + +export const getEnterpriseSafetyProductionList = (params) => + post("/enterprisesafetyproduction/list", params); // 企业安全生产值班记录列表 + +export const setEnterpriseSafetyProductEdit = (params) => + upload("/enterprisesafetyproduction/goEdit", params); // 修改企业安全生产值班记录 + +export const setEnterpriseSafetyProductAdd = (params) => + upload("/enterprisesafetyproduction/add", params); // 新增企业安全生产值班记录 + +export const setEnterpriseSafetyProductDelete = (params) => + upload("/enterprisesafetyproduction/delete", params); // 新增企业安全生产值班记录 + diff --git a/src/request/entrench_thing_grant.js b/src/request/entrench_thing_grant.js new file mode 100644 index 0000000..16ea8fc --- /dev/null +++ b/src/request/entrench_thing_grant.js @@ -0,0 +1,17 @@ +import { post, upload } from "@/request/axios.js"; + +export const getEntrenchThingGrantList = (params) => + post("/labourentrenchthing/list", params); // 企业安全生产值班记录列表 + +export const setEntrenchThingGrantEdit = (params) => + upload("/labourentrenchthing/goEdit", params); // 修改企业安全生产值班记录 + +export const setEntrenchThingGrantAdd = (params) => + upload("/labourentrenchthing/add", params); // 新增企业安全生产值班记录 + +export const setEntrenchThingGrantDelete = (params) => + upload("/labourentrenchthing/delete", params); // 新增企业安全生产值班记录 + +export const getEntrenchThingGrantEdit = (params) => + upload("/labourentrenchthing/edit", params); // 修改企业安全生产值班记录 + diff --git a/src/request/firefighting_equipment_facility.js b/src/request/firefighting_equipment_facility.js new file mode 100644 index 0000000..ef463e3 --- /dev/null +++ b/src/request/firefighting_equipment_facility.js @@ -0,0 +1,40 @@ +import { post, upload } from "@/request/axios.js"; + +export const getFirefightingEquipmentFacilityList = (params) => + post("/firefightingequipmentfacility/list", params); // 生产设备设施台账列表 + +export const setFirefightingEquipmentFacilityDelete = (params) => + upload("/firefightingequipmentfacility/delete", params); // 生产设备设施台账列表删除 + +export const setFirefightingEquipmentFacilityEdit = (params) => + upload("/firefightingequipmentfacility/goEdit", params); // 修改企业安全生产值班记录 + +export const setFirefightingEquipmentFacilityAdd = (params) => + upload("/firefightingequipmentfacility/add", params); // 新增企业安全生产值班记录 + +export const getFirefightingEquipmentFacilityView = (params) => + post("/firefightingequipmentfacility/goEdit", params); // 设备设施查看 + +export const getMaintainFindFirefightingId = (params) => + post("/firefightingmaintain/findByFirefightingId", params); // 设备设施查看 + +export const getFirefightingEquipmentFacilityEdit = (params) => + upload("/firefightingequipmentfacility/edit", params); // 新增企业安全生产值班记录 + +export const setMaintainAdd = (params) => + upload("/firefightingmaintain/add", params); // 新增保养 + +export const setMaintainEdit = (params) => + upload("/firefightingmaintain/goEdit", params); // 修改保养 + +export const getMaintainView = (params) => + post("/firefightingmaintain/goEdit", params); // 获取保养信息 + +export const getMaintainEdit = (params) => + upload("/firefightingmaintain/edit", params); // 新增企业安全生产值班记录 + +export const setFirefightingMaintainDelete = (params) => + upload("/firefightingmaintain/delete", params); // 保养删除 + + + diff --git a/src/request/operation_vehicle.js b/src/request/operation_vehicle.js index 7b239ca..bf7062f 100644 --- a/src/request/operation_vehicle.js +++ b/src/request/operation_vehicle.js @@ -90,5 +90,13 @@ export const getOperationVehicleInfo = (params) => post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息 +const getCorpList = (params) => + post("/operatingvehicles/corpList", params) + +export const getOperationVehicleCorpList1 = async () => { + const resData = await getCorpList() + return resData.list; +};// 货运挂车 企业列表 + diff --git a/src/request/production_equipment_facility.js b/src/request/production_equipment_facility.js new file mode 100644 index 0000000..6b11194 --- /dev/null +++ b/src/request/production_equipment_facility.js @@ -0,0 +1,40 @@ +import { post, upload } from "@/request/axios.js"; + +export const getProductionEquipmentFacilityList = (params) => + post("/equipmentfacilitycontroller/list", params); // 生产设备设施台账列表 + +export const setProductionEquipmentFacilityDelete = (params) => + upload("/equipmentfacilitycontroller/delete", params); // 生产设备设施台账列表删除 + +export const setProductionEquipmentFacilityEdit = (params) => + upload("/equipmentfacilitycontroller/goEdit", params); // 修改企业安全生产值班记录 + +export const setProductionEquipmentFacilityAdd = (params) => + upload("/equipmentfacilitycontroller/add", params); // 新增企业安全生产值班记录 + +export const getProductionEquipmentFacilityView = (params) => + post("/equipmentfacilitycontroller/goEdit", params); // 设备设施查看 + +export const getMaintainFindProductionEquipmentFacilityId = (params) => + post("/maintain/findByProductionEquipmentFacilityId", params); // 设备设施查看 + +export const getProductionEquipmentFacilityEdit = (params) => + upload("/equipmentfacilitycontroller/edit", params); // 新增企业安全生产值班记录 + +export const setMaintainAdd = (params) => + upload("/maintain/add", params); // 新增保养 + +export const setMaintainEdit = (params) => + upload("/maintain/goEdit", params); // 修改保养 + +export const getMaintainView = (params) => + post("/maintain/goEdit", params); // 获取保养信息 + +export const getMaintainEdit = (params) => + upload("/maintain/edit", params); // 新增企业安全生产值班记录 + +export const setMaintainDelete = (params) => + upload("/maintain/delete", params); // 保养删除 + + + diff --git a/src/request/reported_incident_dispose.js b/src/request/reported_incident_dispose.js new file mode 100644 index 0000000..98d4c49 --- /dev/null +++ b/src/request/reported_incident_dispose.js @@ -0,0 +1,20 @@ +import { post, upload } from "@/request/axios.js"; + +export const getReportedIncidentDisposeList = (params) => + post("/reportedincident/list", params); // 上报事件处理记录列表 + +export const setReportedIncidentDisposeEdit = (params) => + upload("/reportedincident/goEdit", params); // 修改上报事件处理记录 + +export const setReportedIncidentDisposeAdd = (params) => + upload("/reportedincident/add", params); // 新增上报事件处理记录 + +export const setReportedIncidentDisposeDelete = (params) => + upload("/reportedincident/delete", params); // 删除上报事件处理记录 + +export const findByIdReportedIncidentDisposeInfo = (params) => + upload("/reportedincident/goEdit", params); // 删除上报事件处理记录 + +export const setReportedIncidentDispose = (params) => + upload("/reportedincident/edit", params); // 修改上报事件处理记录 + diff --git a/src/request/taxation_manage.js b/src/request/taxation_manage.js index a86150c..c8ef6a2 100644 --- a/src/request/taxation_manage.js +++ b/src/request/taxation_manage.js @@ -49,7 +49,7 @@ export const editTaxationManageInfo = (params) => upload("/taxationmanage/edit", params); // 修改车船税管理 export const getTrailerList = (params) => - upload("/freightTrailer/vehicleList", params); // 获取所有挂车 + upload("/freightTrailer/trailerList", params); // 获取所有挂车 export const getTaxationList = (params) => upload("/taxationmanage/taxationList", params); // 获取所有车船税 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 02b418b..ed9b7b0 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 @@ -58,14 +58,9 @@ - - - + @@ -279,7 +274,6 @@ import { ref } from "vue"; import { layoutFnGetVehicleColor, layoutFnGetTransportCategory, - layoutFnGetBelongingDepartment, layoutFnGetFuelType, layoutFnGetEmissionStandard, layoutFnGetVehicleType, @@ -297,21 +291,53 @@ import { debounce } from "throttle-debounce"; import { useRoute, useRouter } from "vue-router"; import { setUploadImg } from "@/request/api.js"; import { addingPrefixToFile } from "@/assets/js/utils.js"; +import LayoutDepartment from "@/components/department/index.vue"; const router = useRouter(); const route = useRoute(); const OPERATING_ID = route.query.OPERATING_ID +const isVehicleNumber = (rule, vehicleNumber, callback)=>{ + if(vehicleNumber){ + var xreg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/; + var creg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/; + if(vehicleNumber.length === 7){ + if(creg.test(vehicleNumber)===false){callback(new Error("格式错误"))}else callback(); + } else if(vehicleNumber.length === 8){ + if(xreg.test(vehicleNumber)===false){callback(new Error("格式错误"))}else callback(); + } else{ + callback(new Error("格式错误")) + } + }else callback(); +} const rules = { - PLATE_NUMBER: [{ required: true, message: "车牌号不能为空", trigger: "blur" }], + PLATE_NUMBER: [ + { required: true, message: "请输入车牌号", trigger: "blur" }, + { validator: isVehicleNumber, trigger: "blur" }, + ], VEHICLE_COLOR: [{required: true, message: "车辆颜色不能为空", trigger: "change"}], FRAMES_NUMBER: [{required: true, message: "车架号不能为空", trigger: "change"}], OPERATING_CERTIFICATE: [{required: true, message: "营运证号不能为空", trigger: "blur"}], TRANSPORT_TYPE: [{ required: true, message: "运输类别不能为空", trigger: "change" }], VEHICLE_TYPE: [{ required: true, message: "车辆类型不能为空", trigger: "blur" }], VEHICLEOWNER: [{ required: true, message: "车主/业主不能为空", trigger: "blur" }], - VEHICLEOWNER_NUMBER: [{required: true, message: "车主电话不能为空", trigger: "blur"}], + VEHICLEOWNER_NUMBER: [ + { required: true, message: "请输入", trigger: "blur" }, + { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" }, + { + pattern: + /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/, + message: "请输入正确的手机号码", + }, + ], CONTACT: [{required: true, message: "联系人不能为空", trigger: "blur"}], - CONTACT_NUMBER: [{required: true, message: "联系电话不能为空", trigger: "blur"}], + CONTACT_NUMBER: [ + { required: true, message: "请输入", trigger: "blur" }, + { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" }, + { + pattern: + /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/, + message: "请输入正确的手机号码", + },], FIRSTSHOW_DATE: [{required: true, message: "初登日期不能为空", trigger: "blur"}], VEHICLE_EQUIPMENT: [{required: true, message: "车载设备不能为空", trigger: "change"}], HEADSTOCK_PHOTO: [{required: true, message: "车头照片不能为空", trigger: "blur"}], @@ -367,7 +393,6 @@ const form = ref({ }); const getVehicleColorList = await layoutFnGetVehicleColor(); const getTransportCategoryList = await layoutFnGetTransportCategory(); -const getBelongingDepartment = await layoutFnGetBelongingDepartment(); const getFuelTypeList = await layoutFnGetFuelType(); const getEmissionStandardList = await layoutFnGetEmissionStandard(); const getVehicleTypeList = await layoutFnGetVehicleType(); @@ -392,23 +417,23 @@ const fnSubmit = debounce( 1000, async () => { await useFormValidate(formRef); - const resData = ! OPERATING_ID + const resData = !OPERATING_ID ? await addOperatingVehicleInfo({...form.value} ) : await editOperatingVehicleInfo({...form.value, OPERATING_ID:OPERATING_ID}); const currentOperatingVehicleId = resData.pd.OPERATING_ID for (let i = 0; i < form.value.HEADSTOCK_PHOTO.length; i++){ if(form.value.HEADSTOCK_PHOTO[i].raw) { - await fnUploadImage(currentOperatingVehicleId, form.value.HEADSTOCK_PHOTO[i].raw, 120) + await fnUploadImage(currentOperatingVehicleId, form.value.HEADSTOCK_PHOTO[i].raw, 130) } } for (let i = 0; i < form.value.DRIVINGLICENSE_PHOTO.length; i++){ if(form.value.DRIVINGLICENSE_PHOTO[i].raw) { - await fnUploadImage(currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, 121) + await fnUploadImage(currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, 131) } } for (let i = 0; i < form.value.OPERATING_CERTIFICATE_PHOTO.length; i++){ if(form.value.OPERATING_CERTIFICATE_PHOTO[i].raw) { - await fnUploadImage(currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, 122) + await fnUploadImage(currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, 132) } } ElMessage.success("提交成功"); 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 b50193d..dc5cf92 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 @@ -3,24 +3,24 @@ 基本信息 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 检查内容 - + - + - + - + - + - + - + - + @@ -270,7 +273,7 @@ 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 132bf09..cc918bd 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 @@ -45,15 +45,6 @@ - - - - - - @@ -88,7 +79,7 @@ - + 导出 @@ -117,7 +108,7 @@ - +