消除代码编译的警告、错误

dev
wangpeng 2024-04-01 10:04:41 +08:00
parent f2d72723ef
commit 8619753b0a
40 changed files with 494 additions and 445 deletions

View File

@ -143,7 +143,7 @@ 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 = [

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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); // 风险点单元修改
export const setDrivingCommitmentAdd = (params) =>
post("/drivingcommitment/add", params); // 行车承诺添加
export const setDrivingCommitmentEdit = (params) =>
post("/drivingcommitment/edit", params); // 行车承诺修改

View File

@ -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); // 风险点单元修改
export const setDrivingTypeAdd = (params) => post("/drivingtype/add", params); // 行车排查项类型添加
export const setDrivingTypeEdit = (params) => post("/drivingtype/edit", params); // 行车排查项类型修改

View File

@ -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) =>

View File

@ -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: {

View File

@ -39,7 +39,10 @@ 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 {
setDrivingTypeAdd,
setDrivingTypeEdit,
} from "@/request/traffic_driving_type.js";
import { layoutFnGetDrivingType } from "@/assets/js/data_dictionary.js";
const props = defineProps({
@ -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 = () => {

View File

@ -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({

View File

@ -5,10 +5,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="编号" prop="GOODSSELFNUMBER">
<el-input
v-model="form.GOODSSELFNUMBER"
placeholder="请填写编号"
/>
<el-input v-model="form.GOODSSELFNUMBER" placeholder="请填写编号" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -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,7 +341,7 @@ 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 });
@ -351,7 +349,7 @@ const isPlateNumberRepetition = async (rule, vehicleNumber, callback) => {
if (vehicleCount.pd.PLATE_NUMBER === plateNumber) {
callback();
} else {
callback(new Error("车辆已存在"))
callback(new Error("车辆已存在"));
}
} else 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(

View File

@ -72,7 +72,9 @@
<el-col :span="10">
<el-form-item label-width="10px">
<el-button type="primary" native-type="submit">搜索</el-button>
<el-button native-type="reset" @click="fnResetPaginationTransfer"></el-button>
<el-button native-type="reset" @click="fnResetPaginationTransfer"
>重置</el-button
>
</el-form-item>
</el-col>
<el-col :span="30">
@ -174,9 +176,7 @@
<script setup>
import { serialNumber } from "@/assets/js/utils.js";
import useListData from "@/assets/js/useListData.js";
import {
layoutFnGetVehicleColor,
} from "@/assets/js/operation_vehicle.js";
import { layoutFnGetVehicleColor } from "@/assets/js/operation_vehicle.js";
import {
getOperationVehicleList,
setOperationVehicleDelete,
@ -220,9 +220,7 @@ const fnExport = async () => {
return;
}
await ElMessageBox.confirm("确定要导出到excel吗", { type: "warning" });
const DATA_IDS = selectionData
.map((item) => item.OPERATING_ID)
.join(",");
const DATA_IDS = selectionData.map((item) => item.OPERATING_ID).join(",");
window.location.href =
import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
"/operatingvehicles/excel?" +

View File

@ -451,7 +451,6 @@ import { reactive, ref } from "vue";
import LayoutTerritory from "@/components/territory/index.vue";
import LayoutIndustry from "@/components/industry/index.vue";
import LayoutEconomicType from "@/components/economic_type/index.vue";
import LayoutLearningTrainType from "@/components/learning_train_type/index.vue";
import LayoutUpload from "@/components/upload/index.vue";
import {
layoutFnGetEnterpriseScale,

View File

@ -53,7 +53,6 @@
}}
</el-divider>
<el-descriptions :column="2" border>
<template>
<el-descriptions-item
:label="
item.CERTIFICATE_CATEGORY === '1'
@ -84,7 +83,6 @@
class="ml-10"
/>
</el-descriptions-item>
</template>
<el-descriptions-item
v-if="item.CERTIFICATE_CATEGORY === '1'"
label="住址"

View File

@ -40,10 +40,7 @@
<el-col :span="8">
<el-form-item label="手机号" prop="PHONE">
<el-input
v-model="data.form.PHONE"
placeholder="请输入"
/>
<el-input v-model="data.form.PHONE" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -486,7 +483,9 @@
prop="QUALIFICATION_CERTIFICATE"
>
<layout-upload
v-model:file-list="data.fileForm.QUALIFICATION_CERTIFICATE"
v-model:file-list="
data.fileForm.QUALIFICATION_CERTIFICATE
"
accept=".jpg,.jpeg,.png"
list-type="picture-card"
>
@ -937,7 +936,10 @@ const fnGetData = async () => {
form.DRIVER_LICENSE_NO = item.ID_NO;
form.DRIVING_NATIONALITY = item.ID_NATIONALITY;
form.DRIVER_LICENSE_ISSUE_DATE = item.ID_ISSUE_DATE;
form.DRIVER_LICENSE_VALIDITY = [item.ID_VALIDITY_START, item.ID_VALIDITY_END];
form.DRIVER_LICENSE_VALIDITY = [
item.ID_VALIDITY_START,
item.ID_VALIDITY_END,
];
form.DRIVER_LICENSE_VALIDITY_START = item.ID_VALIDITY_START;
form.DRIVER_LICENSE_VALIDITY_END = item.ID_VALIDITY_END;
form.DRIVER_LICENSE_ORGAN = item.ID_ORGAN;
@ -945,12 +947,17 @@ const fnGetData = async () => {
? item.ALLOW_QUALIFICATION.split(",")
: [];
} else if (item.CERTIFICATE_CATEGORY === "3") {
data.fileForm.QUALIFICATION_CERTIFICATE = addingPrefixFile(item.ID_PHOTO_FRONT);
data.fileForm.QUALIFICATION_CERTIFICATE = addingPrefixFile(
item.ID_PHOTO_FRONT
);
form.QUALIFICATION_CERTIFICATE = item.ID_PHOTO_FRONT;
form.QUALIFICATION_CERTIFICATE_NO = item.ID_NO;
form.QUALIFICATION_CERTIFICATE_NATIONALITY = item.ID_NATIONALITY;
form.QUALIFICATION_CERTIFICATE_ISSUE_DATE = item.ID_ISSUE_DATE;
form.QUALIFICATION_CERTIFICATE_VALIDITY = [item.ID_VALIDITY_START, item.ID_VALIDITY_END];
form.QUALIFICATION_CERTIFICATE_VALIDITY = [
item.ID_VALIDITY_START,
item.ID_VALIDITY_END,
];
form.QUALIFICATION_CERTIFICATE_VALIDITY_START = item.ID_VALIDITY_START;
form.QUALIFICATION_CERTIFICATE_VALIDITY_END = item.ID_VALIDITY_END;
form.QUALIFICATION_CERTIFICATE_ORGAN = item.ID_ORGAN;
@ -1156,9 +1163,15 @@ const fnSubmit = debounce(
data.fileForm.ID_CARD_BACK?.[0]?.raw &&
formData.append("idCardBackFiles", data.fileForm.ID_CARD_BACK[0].raw);
data.fileForm.DRIVER_LICENSE?.[0]?.raw &&
formData.append("driverLicenseFiles", data.fileForm.DRIVER_LICENSE[0].raw);
formData.append(
"driverLicenseFiles",
data.fileForm.DRIVER_LICENSE[0].raw
);
data.fileForm.QUALIFICATION_CERTIFICATE?.[0]?.raw &&
formData.append("qualificationCertificateFiles", data.fileForm.QUALIFICATION_CERTIFICATE[0].raw);
formData.append(
"qualificationCertificateFiles",
data.fileForm.QUALIFICATION_CERTIFICATE[0].raw
);
if (!USER_ID) {
// if (data.allUser > data.USERS_NUM) {
// ElMessage.error("");

View File

@ -273,12 +273,8 @@ import {
layoutFnGetAssignedWay,
layoutFnGetAssignedVehicleModel,
} from "@/assets/js/assigned_manage.js";
import {
getFreightTrailerView,
} from "@/request/enterprise_management.js";
import {
findByIdOperatingVehicleInfo
} from "@/request/operation_vehicle.js";
import { getFreightTrailerView } from "@/request/enterprise_management.js";
import { findByIdOperatingVehicleInfo } from "@/request/operation_vehicle.js";
import LayoutUpload from "@/components/upload/index.vue";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
@ -288,7 +284,7 @@ import {
setAssignedManageEdit,
layoutFnGetScrapVehicleType,
getAssignedOperationVehicleList,
getAssignedFreightTrailerList
getAssignedFreightTrailerList,
} from "@/request/assigned_manage.js";
import { setUploadImg } from "@/request/api.js";
import { ElMessage } from "element-plus";

View File

@ -258,7 +258,10 @@ import {
setInspectAnnuallyEdit,
getTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } 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";

View File

@ -256,7 +256,10 @@ import {
setInspectAnnuallyEdit,
getTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } 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";

View File

@ -48,10 +48,16 @@
<el-descriptions-item label-class-name="width_200" label="年检周期">
{{ info.ANNUAL_INSPECTION_CYCLE_NAME }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="年检费用(元)">
<el-descriptions-item
label-class-name="width_200"
label="年检费用(元)"
>
{{ info.INSPECTFEES }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="实收费用(元)">
<el-descriptions-item
label-class-name="width_200"
label="实收费用(元)"
>
{{ info.ACTUAL_COLLECTION }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="到期日期">

View File

@ -194,7 +194,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="提醒天数" prop="REMINDER_DAYS">
<el-select v-model="form.REMINDER_DAYS" @change="getRemiderDate">
<el-select
v-model="form.REMINDER_DAYS"
@change="getRemiderDate"
>
<el-option
v-for="item in REMIND_DAYS"
:key="item.NAME"
@ -287,7 +290,8 @@ import {
} from "@/request/mechanical_files.js";
import {
INSURANCEMENU,
OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS
OPERATING_VEHICLE_TYPE_LIST,
REMIND_DAYS,
} from "@/assets/js/constant.js";
import { setUploadImg } from "@/request/api.js";
import { ElMessage } from "element-plus";
@ -359,7 +363,7 @@ const rules = {
REMINDER_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
};
const getVehicle = async (event) => {
const model = "insure"
const model = "insure";
const resData = await getTrailerList2({ TRAFFIC_TYPE: event, model });
data.vehicleList = resData.list;
form.value.VEHICLE = "";

View File

@ -274,7 +274,10 @@ import {
setInsureEdit,
getTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } 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";

View File

@ -72,10 +72,16 @@
<el-descriptions-item label-class-name="width_200" label="到期日期">
{{ info.DUE_DATE }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="保险全费(元)">
<el-descriptions-item
label-class-name="width_200"
label="保险全费(元)"
>
{{ info.ALL_FEES }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="净费实收(元)">
<el-descriptions-item
label-class-name="width_200"
label="净费实收(元)"
>
{{ info.ACTUAL_COLLECTION }}
</el-descriptions-item>
<el-descriptions-item

View File

@ -231,7 +231,10 @@ import {
getTrailerList,
getOperationTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } 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";

View File

@ -230,7 +230,10 @@ import {
setOperationsEdit,
getTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } 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";

View File

@ -237,7 +237,6 @@ import {
REMINDER_STATUS_LIST,
} from "@/assets/js/constant.js";
const router = useRouter();
const data = reactive({
exportExcelDialog: {

View File

@ -194,12 +194,10 @@ import {
getScrapOperationVehicleList,
getScrapFreightTrailerList,
} from "@/request/scrap_manage.js";
import {
getFreightTrailerView,
} from "@/request/enterprise_management.js";
import { getFreightTrailerView } from "@/request/enterprise_management.js";
import {
getOperationVehicleInfo,
setOperationsScrapStatus
setOperationsScrapStatus,
} from "@/request/operation_vehicle.js";
import LayoutUpload from "@/components/upload/index.vue";
import { debounce } from "throttle-debounce";
@ -288,7 +286,6 @@ const fnEditVehicleModel = async () => {
} else if (form.value.SCRAP_VEHICLEMODEL === "货运挂车") {
form.value.ALLVEHICLE = getAllFrailerList.varList;
form.value.FREIGHTVEHICLELIST = form.value.ALLVEHICLE;
console.log();
}
};
const info = ref({});
@ -300,7 +297,7 @@ const fnGetVehicleInfo = async () => {
form.value.SCRAP_VEHICLE
) {
const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID;
await setOperationsScrapStatus({OPERATING_ID})
await setOperationsScrapStatus({ OPERATING_ID });
const resData = await getOperationVehicleInfo({ OPERATING_ID });
info.value = resData.pd;
form.value.VEHICLE.VEHICLEOWNER = info.value.VEHICLEOWNER;
@ -337,7 +334,7 @@ const fnGetVehicleInfo = async () => {
form.value.SCRAP_VEHICLE
) {
form.value.FREIGHTTRAILER_ID =
form.value.FREIGHTVEHICLELIST[i].FREIGHTTRAILER_ID
form.value.FREIGHTVEHICLELIST[i].FREIGHTTRAILER_ID;
form.value.VEHICLE.VEHICLEOWNER =
form.value.FREIGHTVEHICLELIST[i].CAR_OWNERS;
form.value.VEHICLE.VEHICLEOWNER_NUMBER =
@ -393,7 +390,6 @@ const fnSubmit = debounce(
1000,
async () => {
await useFormValidate(formRef);
console.log("form.value",form.value);
await setScrapManageAdd({ ...form.value });
ElMessage.success("提交成功");
router.back();

View File

@ -69,11 +69,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="所属省份" prop="PROVINCE">
<el-input
v-model="form.PROVINCE"
placeholder="--"
disabled
/>
<el-input v-model="form.PROVINCE" placeholder="--" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
@ -239,7 +235,10 @@ import LayoutUpload from "@/components/upload/index.vue";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { setTaxationManageAdd } from "@/request/taxation_manage.js";
import { getFreightTrailerView, getChoiceTrailerList } from "@/request/enterprise_management.js";
import {
getFreightTrailerView,
getChoiceTrailerList,
} from "@/request/enterprise_management.js";
import { ElMessage } from "element-plus";
import { useRouter } from "vue-router";
import { addingPrefixToFile } from "@/assets/js/utils.js";
@ -281,7 +280,7 @@ const rules = {
],
FREIGHTTRAILER_ID: [
{ required: true, message: "挂车车辆不能为空", trigger: "change" },
]
],
};
const formRef = ref(null);
const form = ref({
@ -322,11 +321,19 @@ const form = ref({
DRIVING_LICENSE_IMG: [],
ALLTRAILERINFO: [],
TAXATIONLISTTRAILER: [],
TRAILER: []
TRAILER: [],
});
const fnGetExpireDate = async () => {
if(form.value.TRANSACTION_DATA !== '' && form.value.TAXESDUES_PERIOD !== ''){
const TAXESDUES_PERIOD = Number(form.value.TAXESDUES_PERIOD.substring(0,form.value.TAXESDUES_PERIOD.indexOf("个")));
if (
form.value.TRANSACTION_DATA !== "" &&
form.value.TAXESDUES_PERIOD !== ""
) {
const TAXESDUES_PERIOD = Number(
form.value.TAXESDUES_PERIOD.substring(
0,
form.value.TAXESDUES_PERIOD.indexOf("个")
)
);
const date = new Date(form.value.TRANSACTION_DATA);
date.setMonth(date.getMonth() + TAXESDUES_PERIOD);
const year = date.getFullYear();
@ -336,13 +343,17 @@ const fnGetExpireDate = async () => {
day = day < 10 ? "0" + day : day;
form.value.EXPIRE_DATE = year + "-" + month + "-" + day;
if (form.value.TRANSACTION_DATA === null) {
form.value.EXPIRE_DATE = null
form.value.EXPIRE_DATE = null;
}
}
fnGetReminderData()
fnGetReminderData();
};
const fnGetReminderData = async () => {
if(form.value.TRANSACTION_DATA !== '' && form.value.TAXESDUES_PERIOD !== '' && form.value.REMINDER_DAY !== '') {
if (
form.value.TRANSACTION_DATA !== "" &&
form.value.TAXESDUES_PERIOD !== "" &&
form.value.REMINDER_DAY !== ""
) {
const REMINDER_DAY = Number(form.value.REMINDER_DAY);
const date = new Date(form.value.EXPIRE_DATE);
date.setDate(date.getDate() - REMINDER_DAY);
@ -353,7 +364,7 @@ const fnGetReminderData = async () => {
day = day < 10 ? "0" + day : day;
form.value.REMINDER_DATA = year + "-" + month + "-" + day;
if (form.value.TRANSACTION_DATA === null) {
form.value.REMINDER_DATA = null
form.value.REMINDER_DATA = null;
}
}
};
@ -361,9 +372,9 @@ const fnGetTrailerInfo = async () => {
const FREIGHTTRAILER_ID = form.value.FREIGHTTRAILER_ID;
form.value.FREIGHTTRAILER_ID = FREIGHTTRAILER_ID;
const resData = await getFreightTrailerView({ FREIGHTTRAILER_ID });
form.value.PROVINCE = resData.pd.PROVINCE
form.value.CITY = resData.pd.CITY
form.value.COUNTY = resData.pd.COUNTY
form.value.PROVINCE = resData.pd.PROVINCE;
form.value.CITY = resData.pd.CITY;
form.value.COUNTY = resData.pd.COUNTY;
form.value.PLATE_NUMBER = resData.pd.PLATE_NUMBER;
form.value.FRAMES_NUMBER = resData.pd.VIN;
form.value.VEHICLE_TYPE = resData.pd.TRAILER_TYPE;

View File

@ -129,7 +129,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="税费周期" prop="TAXESDUES_PERIOD">
<el-select v-model="form.TAXESDUES_PERIOD"
<el-select
v-model="form.TAXESDUES_PERIOD"
@change="fnGetExpireDate"
>
<el-option
@ -308,8 +309,16 @@ const form = ref({
});
const fnGetExpireDate = async () => {
if(form.value.TRANSACTION_DATA !== '' && form.value.TAXESDUES_PERIOD !== ''){
const TAXESDUES_PERIOD = Number(form.value.TAXESDUES_PERIOD.substring(0,form.value.TAXESDUES_PERIOD.indexOf("个")));
if (
form.value.TRANSACTION_DATA !== "" &&
form.value.TAXESDUES_PERIOD !== ""
) {
const TAXESDUES_PERIOD = Number(
form.value.TAXESDUES_PERIOD.substring(
0,
form.value.TAXESDUES_PERIOD.indexOf("个")
)
);
const date = new Date(form.value.TRANSACTION_DATA);
date.setMonth(date.getMonth() + TAXESDUES_PERIOD);
const year = date.getFullYear();
@ -319,10 +328,10 @@ const fnGetExpireDate = async () => {
day = day < 10 ? "0" + day : day;
form.value.EXPIRE_DATE = year + "-" + month + "-" + day;
}
fnGetReminderData()
fnGetReminderData();
};
const fnGetReminderData = async () => {
if(form.value.REMINDER_DAY !== '') {
if (form.value.REMINDER_DAY !== "") {
const REMINDER_DAY = Number(form.value.REMINDER_DAY);
const date = new Date(form.value.EXPIRE_DATE);
date.setDate(date.getDate() - REMINDER_DAY);
@ -333,7 +342,6 @@ const fnGetReminderData = async () => {
day = day < 10 ? "0" + day : day;
form.value.REMINDER_DATA = year + "-" + month + "-" + day;
}
};
fnGetReminderData();

View File

@ -30,6 +30,7 @@
<el-input
v-model="form.WATCH_TELEPHONE"
placeholder="请输入值班座机"
maxlength="20"
/>
</el-form-item>
</el-col>
@ -92,13 +93,13 @@ const rules = {
],
WATCHLEAD: [{ required: true, message: "值班领导不能为空", trigger: "blur" }],
WATCH_TELEPHONE: [
{ required: true, message: "请输入", trigger: "blur" },
{ min: 11, max: 11, message: "请输入11位座机号码", trigger: "blur" },
{ required: true, message: "值班座机不能为空", trigger: "blur" },
/* { required: true, message: "", trigger: "blur" },
{ min: 11, max: 11, message: "请输入座机号码", trigger: "blur" },
{
pattern:
/^(\d{3,4}-)?\d{7,8}$/,
pattern: /^(\d{3,4}-)?\d{7,8}$/,
message: "请输入正确的座机号码",
},
}, */
],
WATCH_PHONE: [
{ required: true, message: "请输入", trigger: "blur" },

View File

@ -68,7 +68,7 @@
import { ref } from "vue";
import {
setEnterpriseSafetyProductEdit,
getEnterpriseSafetyProductEdit
getEnterpriseSafetyProductEdit,
} from "@/request/enterprise_safety_production.js";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
@ -90,8 +90,7 @@ const rules = {
{ required: true, message: "请输入", trigger: "blur" },
{ min: 11, max: 11, message: "请输入11位座机号码", trigger: "blur" },
{
pattern:
/^(\d{3,4}-)?\d{7,8}$/,
pattern: /^(\d{3,4}-)?\d{7,8}$/,
message: "请输入正确的座机号码",
},
],

View File

@ -74,9 +74,7 @@ const getData = async () => {
PRODUCTIONFACILITY_ID,
});
info.value = resData.pd;
info.value.EQUIPMENT_FACILITY = addingPrefixToFile(
resData.equipmentFacility
);
info.value.EQUIPMENT_FACILITY = addingPrefixToFile(resData.equipmentFacility);
};
getData();
const { list } = useListData(getMaintainFindProductionEquipmentFacilityId, {

View File

@ -117,7 +117,6 @@ import { useRouter, useRoute } from "vue-router";
import {
addViolationRegistrationView,
editViolationRegistration,
infoViolationRegistration,
} from "@/request/violation_registration.js";
const formRef = ref(null);
@ -149,9 +148,9 @@ const registrationId = ref("");
onMounted(async () => {
isEditMode.value = route.query.mode === "edit";
registrationId.value = route.query.REGISTRATION_ID || "";
const resData = await infoViolationRegistration({
/* const resData = await infoViolationRegistration({
REGISTRATION_ID: registrationId.value,
});
}); */
});
const router = useRouter();

View File

@ -114,7 +114,7 @@ import useFormValidate from "@/assets/js/useFormValidate.js";
import { useRoute, useRouter } from "vue-router";
import {
editViolationRegistration,
infoViolationRegistration
infoViolationRegistration,
} from "@/request/violation_registration.js";
import { ElMessage } from "element-plus";
@ -171,9 +171,9 @@ const data = reactive({
const fnGetData = async () => {
if (!REGISTRATION_ID) return;
const resData = await infoViolationRegistration({ REGISTRATION_ID });
data.form = resData.pd
data.form = resData.pd;
};
fnGetData()
fnGetData();
const fnSubmit = async () => {
await useFormValidate(formRef);
@ -183,7 +183,7 @@ const fnSubmit = async () => {
const value = rawForm[key];
formData.append(key, value);
});
await editViolationRegistration(data.form)
await editViolationRegistration(data.form);
ElMessage.success("编辑成功");
router.back();
};