From 40a5fd24966e366884233d617487dedea5e3ee9b Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 27 Mar 2024 10:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=86=92=E5=A4=A9=E6=95=B0=20?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/constant.js | 7 +++++++ src/views/mechanical_files/beidou/add.vue | 13 +++++++++++-- src/views/mechanical_files/beidou/edit.vue | 19 +++++++++++++++++-- .../mechanical_files/inspect_annually/add.vue | 15 ++++++++++++--- .../inspect_annually/edit.vue | 14 +++++++++++--- src/views/mechanical_files/insure/add.vue | 14 +++++++++++--- src/views/mechanical_files/insure/edit.vue | 14 +++++++++++--- .../mechanical_files/maintenance/add.vue | 14 +++++++++++--- .../mechanical_files/maintenance/edit.vue | 14 +++++++++++--- src/views/mechanical_files/operations/add.vue | 14 +++++++++++--- .../mechanical_files/operations/edit.vue | 14 +++++++++++--- .../mechanical_files/taxation_manage/add.vue | 17 +++++++++++------ .../mechanical_files/taxation_manage/edit.vue | 14 +++++++++++--- .../taxation_manage/index.vue | 1 - 14 files changed, 146 insertions(+), 38 deletions(-) diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index b406422..29ac496 100644 --- a/src/assets/js/constant.js +++ b/src/assets/js/constant.js @@ -139,6 +139,13 @@ export const REMINDER_STATUS = [ { ID: "1", NAME: "关闭" }, ]; +export const REMIND_DAYS = [ + // 提醒天数 + { ID: "0", NAME: "30天", NUM: "30" }, + { ID: "1", NAME: "45天", NUM: "45" }, + { ID: "2", NAME: "90天", NUM: "90" } +]; + // export const MAINTENANCE_LEVEL_LIST = [ // //维保等级 // {ID:'1',NAME:'一级维保'}, diff --git a/src/views/mechanical_files/beidou/add.vue b/src/views/mechanical_files/beidou/add.vue index e9514a8..fbd9aeb 100644 --- a/src/views/mechanical_files/beidou/add.vue +++ b/src/views/mechanical_files/beidou/add.vue @@ -153,12 +153,20 @@ - + + + @@ -240,6 +248,7 @@ import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { addingPrefixToFile, subtractDaysFromDate } from "@/assets/js/utils.js"; +import { REMIND_DAYS } from "@/assets/js/constant.js"; const route = useRoute(); const router = useRouter(); const BEIDOU_ID = route.query.BEIDOU_ID; diff --git a/src/views/mechanical_files/beidou/edit.vue b/src/views/mechanical_files/beidou/edit.vue index 110eb14..f6cb323 100644 --- a/src/views/mechanical_files/beidou/edit.vue +++ b/src/views/mechanical_files/beidou/edit.vue @@ -153,12 +153,20 @@ - + + + @@ -229,6 +237,7 @@ import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { addingPrefixToFile, subtractDaysFromDate } from "@/assets/js/utils.js"; +import { REMIND_DAYS } from "@/assets/js/constant.js"; const route = useRoute(); const router = useRouter(); const BEIDOU_ID = route.query.BEIDOU_ID; @@ -351,6 +360,12 @@ const fnSubmit = debounce( if (form.value.BEIDOUINFO[i].raw) await fnUploadImage(currentId, form.value.BEIDOUINFO[i].raw, 128); } + + for (let i = 0; i < form.value.CONTRACT.length; i++) { + if (form.value.CONTRACT[i].raw) { + await fnUploadImage(currentId, form.value.CONTRACT[i].raw, "130"); // 合同图片 + } + } ElMessage.success("保存成功"); router.back(); }, diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue index b2954cd..7392b05 100644 --- a/src/views/mechanical_files/inspect_annually/add.vue +++ b/src/views/mechanical_files/inspect_annually/add.vue @@ -179,12 +179,20 @@ - + + + @@ -250,7 +258,7 @@ import { setInspectAnnuallyEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { OPERATING_VEHICLE_TYPE_LIST } from "@/assets/js/constant.js"; +import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { layoutFnGetAnnualInspectionCycle } from "@/assets/js/data_dictionary.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; @@ -343,6 +351,7 @@ const getDueDate = () => { }; const getRemiderDate = (val) => { if (val) { + console.log("REMINDER_DAYS",form.value.REMINDER_DAYS); if (form.value.DUE_DATE) { form.value.REMINDER_DATE = subtractDaysFromDate(form.value.DUE_DATE, val); } diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue index 7a50d10..1f65567 100644 --- a/src/views/mechanical_files/inspect_annually/edit.vue +++ b/src/views/mechanical_files/inspect_annually/edit.vue @@ -177,12 +177,20 @@ - + + + @@ -248,7 +256,7 @@ import { setInspectAnnuallyEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { OPERATING_VEHICLE_TYPE_LIST } from "@/assets/js/constant.js"; +import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { layoutFnGetAnnualInspectionCycle } from "@/assets/js/data_dictionary.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/mechanical_files/insure/add.vue b/src/views/mechanical_files/insure/add.vue index 60c170a..fb5bee7 100644 --- a/src/views/mechanical_files/insure/add.vue +++ b/src/views/mechanical_files/insure/add.vue @@ -194,12 +194,20 @@ - + + + @@ -278,7 +286,7 @@ import { } from "@/request/mechanical_files.js"; import { INSURANCEMENU, - OPERATING_VEHICLE_TYPE_LIST, + OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/mechanical_files/insure/edit.vue b/src/views/mechanical_files/insure/edit.vue index 5fe15fa..e58012c 100644 --- a/src/views/mechanical_files/insure/edit.vue +++ b/src/views/mechanical_files/insure/edit.vue @@ -184,12 +184,20 @@ - + + + @@ -266,7 +274,7 @@ import { setInsureEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { OPERATING_VEHICLE_TYPE_LIST } from "@/assets/js/constant.js"; +import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { layoutFnGetInsuranceCompany } from "@/assets/js/data_dictionary.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/mechanical_files/maintenance/add.vue b/src/views/mechanical_files/maintenance/add.vue index 01fb4f2..c544466 100644 --- a/src/views/mechanical_files/maintenance/add.vue +++ b/src/views/mechanical_files/maintenance/add.vue @@ -177,12 +177,20 @@ - + + + @@ -248,7 +256,7 @@ import { setMaintenanceEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { MAINTENANCE_LEVEL_LIST } from "@/assets/js/constant.js"; +import { MAINTENANCE_LEVEL_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; diff --git a/src/views/mechanical_files/maintenance/edit.vue b/src/views/mechanical_files/maintenance/edit.vue index 01fb4f2..c544466 100644 --- a/src/views/mechanical_files/maintenance/edit.vue +++ b/src/views/mechanical_files/maintenance/edit.vue @@ -177,12 +177,20 @@ - + + + @@ -248,7 +256,7 @@ import { setMaintenanceEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { MAINTENANCE_LEVEL_LIST } from "@/assets/js/constant.js"; +import { MAINTENANCE_LEVEL_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; diff --git a/src/views/mechanical_files/operations/add.vue b/src/views/mechanical_files/operations/add.vue index b6a6722..bb8efcb 100644 --- a/src/views/mechanical_files/operations/add.vue +++ b/src/views/mechanical_files/operations/add.vue @@ -151,12 +151,20 @@ - + + + @@ -222,7 +230,7 @@ import { setOperationsEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { OPERATING_VEHICLE_TYPE_LIST } from "@/assets/js/constant.js"; +import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { layoutFnGetAnnualInspectionCycle } from "@/assets/js/data_dictionary.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/mechanical_files/operations/edit.vue b/src/views/mechanical_files/operations/edit.vue index b6a6722..bb8efcb 100644 --- a/src/views/mechanical_files/operations/edit.vue +++ b/src/views/mechanical_files/operations/edit.vue @@ -151,12 +151,20 @@ - + + + @@ -222,7 +230,7 @@ import { setOperationsEdit, getTrailerList, } from "@/request/mechanical_files.js"; -import { OPERATING_VEHICLE_TYPE_LIST } from "@/assets/js/constant.js"; +import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js"; import { layoutFnGetAnnualInspectionCycle } from "@/assets/js/data_dictionary.js"; import { setUploadImg } from "@/request/api.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/mechanical_files/taxation_manage/add.vue b/src/views/mechanical_files/taxation_manage/add.vue index 7bea645..e2e3850 100644 --- a/src/views/mechanical_files/taxation_manage/add.vue +++ b/src/views/mechanical_files/taxation_manage/add.vue @@ -166,11 +166,19 @@ - + + + @@ -235,7 +243,7 @@ import { getFreightTrailerView, getChoiceTrailerList } from "@/request/enterpris import { ElMessage } from "element-plus"; import { useRouter } from "vue-router"; import { addingPrefixToFile } from "@/assets/js/utils.js"; -import { TAXES_PERIOD } from "@/assets/js/constant.js"; +import { REMIND_DAYS, TAXES_PERIOD } from "@/assets/js/constant.js"; const router = useRouter(); const choiceTrailerList = await getChoiceTrailerList(); const rules = { @@ -271,9 +279,6 @@ const rules = { REMINDER_DATA: [ { required: true, message: "提醒日期不能为空", trigger: "change" }, ], - DRIVINGLICENSE_PHOTO: [ - { required: true, message: "行驶证照片不能为空", trigger: "change" }, - ], FREIGHTTRAILER_ID: [ { required: true, message: "挂车车辆不能为空", trigger: "change" }, ] diff --git a/src/views/mechanical_files/taxation_manage/edit.vue b/src/views/mechanical_files/taxation_manage/edit.vue index 00fe7dd..8a69244 100644 --- a/src/views/mechanical_files/taxation_manage/edit.vue +++ b/src/views/mechanical_files/taxation_manage/edit.vue @@ -156,11 +156,19 @@ - + + + @@ -228,7 +236,7 @@ import { ElMessage } from "element-plus"; import { useRoute, useRouter } from "vue-router"; import LayoutUpload from "@/components/upload/index.vue"; import { addingPrefixToFile } from "@/assets/js/utils.js"; -import { TAXES_PERIOD } from "@/assets/js/constant.js"; +import { REMIND_DAYS, TAXES_PERIOD } from "@/assets/js/constant.js"; const route = useRoute(); const router = useRouter(); diff --git a/src/views/mechanical_files/taxation_manage/index.vue b/src/views/mechanical_files/taxation_manage/index.vue index 6bc7cfb..4ebd7d1 100644 --- a/src/views/mechanical_files/taxation_manage/index.vue +++ b/src/views/mechanical_files/taxation_manage/index.vue @@ -200,7 +200,6 @@ import { EXPIRE_STATUS, REMINDER_STATUS } from "@/assets/js/constant.js"; const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getTaxationManageList, {}); -console.log("-=-=--=-==--==-=--==-",getTaxationManageList()); const fnGetDataTransfer = () => { fnGetData({ DEPTIDS: searchForm.value.DEPTIDS?.join(","),