代码格式化

dev
wangpeng 2024-05-15 09:51:40 +08:00
parent 861cef7aa5
commit 274b58f12f
12 changed files with 1049 additions and 986 deletions

View File

@ -55,15 +55,26 @@ 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 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); // 罐检项检查删除
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); // 罐检项检查删除

View File

@ -298,13 +298,13 @@ import {
setInsureEdit,
getTrailerList,
getTrailerList2,
getInsureList
getInsureList,
} from "@/request/mechanical_files.js";
import {
INSURANCE_TYPE,
INSURANCEMENU,
OPERATING_VEHICLE_TYPE_LIST,
REMIND_DAYS
REMIND_DAYS,
} from "@/assets/js/constant.js";
import { setUploadImg } from "@/request/api.js";
import { ElMessage } from "element-plus";
@ -352,7 +352,7 @@ const data = reactive({
INITIAL_REGISTRATION_DATE: "",
COMPANY_AREA: "",
},
info: {}
info: {},
});
const insureType = async (rule, insureType, callback) => {
@ -371,7 +371,7 @@ const insureType = async (rule, insureType, callback) => {
}
} else {
if (insureType) {
const resData = await getInsureView({ INSURE_ID })
const resData = await getInsureView({ INSURE_ID });
if (insureType === resData.pd.INSURANCE_COVERAGE) {
callback();
} else {

View File

@ -139,7 +139,11 @@
<el-table-column prop="PLATE_NUMBER" label="车牌号" />
<el-table-column prop="CAR_OWNERS" label="车主业户" />
<el-table-column prop="TELEPHONE" label="联系电话" width="100" />
<el-table-column prop="PROCESSING_DATE_YEAR" label="保险年份" width="80" />
<el-table-column
prop="PROCESSING_DATE_YEAR"
label="保险年份"
width="80"
/>
<el-table-column prop="INSURANCE_COVERAGE" label="保险项目" width="160">
<template #default="{ row }">
{{ row.INSURANCE_COVERAGE === "0" ? "承运人责任险" : "" }}

View File

@ -22,7 +22,6 @@
style="width: 300px"
></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="fnClose"></el-button>
@ -70,8 +69,8 @@ const props = defineProps({
const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits);
const rules = {
INSPECTION_SITE: [{ required: true, message: "请输入", trigger: "blur" },],
REGULATORY_STATUS: [{ required: true, message: "请输入", trigger: "blur" },],
INSPECTION_SITE: [{ required: true, message: "请输入", trigger: "blur" }],
REGULATORY_STATUS: [{ required: true, message: "请输入", trigger: "blur" }],
};
const formRef = ref(null);
@ -90,7 +89,6 @@ const fnSubmit = async () => {
Object.keys(rawFormValue).forEach((key) => {
formData.append(key, rawFormValue[key]);
});
console.log(rawFormValue,formData)
//
if (props.type === "add") {
await setTankTruckInspectionAdd(rawFormValue);

View File

@ -17,7 +17,6 @@
<script setup>
import { useVModel } from "@vueuse/core";
const props = defineProps({
visible: {
type: Boolean,

View File

@ -134,11 +134,11 @@
const resData = await getTankTruckInspectionView({
TANKTRUCKINSPECTION_ID,
});
data.addOrEditDialog.form = resData.pd
data.addOrEditDialog.form = resData.pd;
} else {
data.addOrEditDialog.form = {
INSPECTION_SITE:'',
REGULATORY_STATUS:'',
INSPECTION_SITE: "",
REGULATORY_STATUS: "",
}; //
}
await nextTick();

View File

@ -7,10 +7,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="罐检车辆" prop="VEHICLE">
<el-select
v-model="form.VEHICLE"
@change="getBusInfo"
>
<el-select v-model="form.VEHICLE" @change="getBusInfo">
<el-option
v-for="item in data.vehicleList"
:key="item.ID"
@ -239,17 +236,17 @@
const TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
VEHICLE: '',
INSPECTION_DATE: '',
VEHICLE: "",
INSPECTION_DATE: "",
INSPECTIONTOR: [],
DUE_DATE: '',
INSPECTION_CYCLE: '',
REMINDER_DAYS: '',
REMINDER_DATE: '',
REMINDER_STATUS: '',
DUE_DATE: "",
INSPECTION_CYCLE: "",
REMINDER_DAYS: "",
REMINDER_DATE: "",
REMINDER_STATUS: "",
INSPECTION_ATTACHMENT: [],
INSPECTION_IMG: [],
NOTES: ''
NOTES: "",
});
const data = reactive({
vehicleList: [],
@ -264,7 +261,7 @@
COMPANY_AREA: "",
},
userList: [],
childList: []
childList: [],
});
const rules = {
VEHICLE: [{ required: true, message: "请输入", trigger: "blur" }],
@ -275,7 +272,9 @@
REMINDER_DAYS: [{ required: true, message: "请输入", trigger: "blur" }],
REMINDER_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
REMINDER_STATUS: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_ATTACHMENT: [{required: true, message: "请添加附件", trigger: "blur"}],
INSPECTION_ATTACHMENT: [
{ required: true, message: "请添加附件", trigger: "blur" },
],
INSPECTION_IMG: [{ required: true, message: "请添加图片", trigger: "blur" }],
};
const getDueDate = () => {
@ -322,7 +321,7 @@
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
@ -367,29 +366,32 @@
};
const fnGetData = async () => {
if (!TANKTRUCKINSPECTIONRECORD_ID) {
const tableData = await getTankTruckInspectionListAll()
const childList = []
tableData.list.forEach(item => {
const tableData = await getTankTruckInspectionListAll();
const childList = [];
tableData.list.forEach((item) => {
const _obj = {
INSPECTION_SITE: item.INSPECTION_SITE,
REGULATORY_STATUS: item.REGULATORY_STATUS,
INSPECTION_STATUS: '1'
}
childList.push(_obj)
})
data.childList = childList
INSPECTION_STATUS: "1",
};
childList.push(_obj);
});
data.childList = childList;
return;
}
const resData = await getTankTruckInspectionRecordView({TANKTRUCKINSPECTIONRECORD_ID});
resData.pd.INSPECTIONTOR = resData.pd.INSPECTIONTOR.split(",")
const resData = await getTankTruckInspectionRecordView({
TANKTRUCKINSPECTIONRECORD_ID,
});
resData.pd.INSPECTIONTOR = resData.pd.INSPECTIONTOR.split(",");
form.value = resData.pd;
data.childList = resData.detail
data.childList = resData.detail;
form.value.INSPECTION_ATTACHMENT = [];
form.value.INSPECTION_IMG = [];
fnBusChange(form.value.VEHICLE);
form.value.INSPECTION_ATTACHMENT = addingPrefixToFile(resData.inspectionAttachmentImgs);
form.value.INSPECTION_ATTACHMENT = addingPrefixToFile(
resData.inspectionAttachmentImgs
);
form.value.INSPECTION_IMG = addingPrefixToFile(resData.inspectionImgs);
};
fnGetData();
@ -407,29 +409,40 @@
await useFormValidate(formRef);
const formData = {};
Object.keys(form.value).forEach((key) => {
if(key!=='INSPECTIONTOR'&&key!=='INSPECTION_ATTACHMENT'&&key!=='INSPECTION_IMG'){
formData[key] = form.value[key]
if (
key !== "INSPECTIONTOR" &&
key !== "INSPECTION_ATTACHMENT" &&
key !== "INSPECTION_IMG"
) {
formData[key] = form.value[key];
}
});
formData.INSPECTIONTOR = form.value.INSPECTIONTOR.join(',')
const DETAILS =[]
data.childList.forEach(item=>{
formData.INSPECTIONTOR = form.value.INSPECTIONTOR.join(",");
const DETAILS = [];
data.childList.forEach((item) => {
DETAILS.push({
INSPECTION_SITE: item.INSPECTION_SITE,
REGULATORY_STATUS: item.REGULATORY_STATUS,
INSPECTION_STATUS: item.INSPECTION_STATUS
})
})
formData.DETAILS = JSON.stringify(DETAILS)
INSPECTION_STATUS: item.INSPECTION_STATUS,
});
});
formData.DETAILS = JSON.stringify(DETAILS);
const resData = !TANKTRUCKINSPECTIONRECORD_ID
? await setTankTruckInspectionRecordAdd({ ...formData })
: await setTankTruckInspectionRecordEdit({...formData, TANKTRUCKINSPECTIONRECORD_ID});
: await setTankTruckInspectionRecordEdit({
...formData,
TANKTRUCKINSPECTIONRECORD_ID,
});
const currentId = resData.pd.TANKTRUCKINSPECTIONRECORD_ID;
//
for (let i = 0; i < form.value.INSPECTION_ATTACHMENT.length; i++) {
if (form.value.INSPECTION_ATTACHMENT[i].raw) {
await fnUploadImage(currentId, form.value.INSPECTION_ATTACHMENT[i].raw, "130"); //
await fnUploadImage(
currentId,
form.value.INSPECTION_ATTACHMENT[i].raw,
"130"
); //
}
}

View File

@ -7,10 +7,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="罐检车辆" prop="VEHICLE">
<el-select
v-model="form.VEHICLE"
@change="getBusInfo"
>
<el-select v-model="form.VEHICLE" @change="getBusInfo">
<el-option
v-for="item in data.vehicleList"
:key="item.ID"
@ -239,17 +236,17 @@
const TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
VEHICLE: '',
INSPECTION_DATE: '',
VEHICLE: "",
INSPECTION_DATE: "",
INSPECTIONTOR: [],
DUE_DATE: '',
INSPECTION_CYCLE: '',
REMINDER_DAYS: '',
REMINDER_DATE: '',
REMINDER_STATUS: '',
DUE_DATE: "",
INSPECTION_CYCLE: "",
REMINDER_DAYS: "",
REMINDER_DATE: "",
REMINDER_STATUS: "",
INSPECTION_ATTACHMENT: [],
INSPECTION_IMG: [],
NOTES: ''
NOTES: "",
});
const data = reactive({
vehicleList: [],
@ -264,7 +261,7 @@
COMPANY_AREA: "",
},
userList: [],
childList: []
childList: [],
});
const rules = {
VEHICLE: [{ required: true, message: "请输入", trigger: "blur" }],
@ -275,7 +272,9 @@
REMINDER_DAYS: [{ required: true, message: "请输入", trigger: "blur" }],
REMINDER_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
REMINDER_STATUS: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_ATTACHMENT: [{required: true, message: "请添加附件", trigger: "blur"}],
INSPECTION_ATTACHMENT: [
{ required: true, message: "请添加附件", trigger: "blur" },
],
INSPECTION_IMG: [{ required: true, message: "请添加图片", trigger: "blur" }],
};
const getDueDate = () => {
@ -322,7 +321,7 @@
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
@ -367,27 +366,30 @@
};
const fnGetData = async () => {
if (!TANKTRUCKINSPECTIONRECORD_ID) {
const tableData = await getTankTruckInspectionListAll()
const childList = []
tableData.list.forEach(item => {
const tableData = await getTankTruckInspectionListAll();
const childList = [];
tableData.list.forEach((item) => {
const _obj = {
INSPECTION_SITE: item.INSPECTION_SITE,
REGULATORY_STATUS: item.REGULATORY_STATUS,
INSPECTION_STATUS: 1
}
childList.push(_obj)
})
data.childList = childList
INSPECTION_STATUS: 1,
};
childList.push(_obj);
});
data.childList = childList;
return;
}
const resData = await getTankTruckInspectionRecordView({TANKTRUCKINSPECTIONRECORD_ID});
const resData = await getTankTruckInspectionRecordView({
TANKTRUCKINSPECTIONRECORD_ID,
});
form.value = resData.pd;
form.value.INSPECTION_ATTACHMENT = [];
form.value.INSPECTION_IMG = [];
fnBusChange(form.value.VEHICLE);
form.value.INSPECTION_ATTACHMENT = addingPrefixToFile(resData.inspectionAttachmentImgs);
form.value.INSPECTION_ATTACHMENT = addingPrefixToFile(
resData.inspectionAttachmentImgs
);
form.value.INSPECTION_IMG = addingPrefixToFile(resData.inspectionImgs);
};
fnGetData();
@ -405,29 +407,40 @@
await useFormValidate(formRef);
const formData = {};
Object.keys(form.value).forEach((key) => {
if(key!=='INSPECTIONTOR'&&key!=='INSPECTION_ATTACHMENT'&&key!=='INSPECTION_IMG'){
formData[key] = form.value[key]
if (
key !== "INSPECTIONTOR" &&
key !== "INSPECTION_ATTACHMENT" &&
key !== "INSPECTION_IMG"
) {
formData[key] = form.value[key];
}
});
formData.INSPECTIONTOR = form.value.INSPECTIONTOR.join(',')
const DETAILS =[]
data.childList.forEach(item=>{
formData.INSPECTIONTOR = form.value.INSPECTIONTOR.join(",");
const DETAILS = [];
data.childList.forEach((item) => {
DETAILS.push({
INSPECTION_SITE: item.INSPECTION_SITE,
REGULATORY_STATUS: item.REGULATORY_STATUS,
INSPECTION_STATUS: item.INSPECTION_STATUS
})
})
formData.DETAILS = JSON.stringify(DETAILS)
INSPECTION_STATUS: item.INSPECTION_STATUS,
});
});
formData.DETAILS = JSON.stringify(DETAILS);
const resData = !TANKTRUCKINSPECTIONRECORD_ID
? await setTankTruckInspectionRecordAdd({ ...formData })
: await setTankTruckInspectionRecordEdit({...formData, TANKTRUCKINSPECTIONRECORD_ID});
: await setTankTruckInspectionRecordEdit({
...formData,
TANKTRUCKINSPECTIONRECORD_ID,
});
const currentId = resData.pd.TANKTRUCKINSPECTIONRECORD_ID;
//
for (let i = 0; i < form.value.INSPECTION_ATTACHMENT.length; i++) {
if (form.value.INSPECTION_ATTACHMENT[i].raw) {
await fnUploadImage(currentId, form.value.INSPECTION_ATTACHMENT[i].raw, "130"); //
await fnUploadImage(
currentId,
form.value.INSPECTION_ATTACHMENT[i].raw,
"130"
); //
}
}

View File

@ -85,7 +85,10 @@
@click="
router.push({
path: '/mechanical_files/tank_truck_record/tank_truck_inspection_record/view',
query: { TANKTRUCKINSPECTIONRECORD_ID: row.TANKTRUCKINSPECTIONRECORD_ID },
query: {
TANKTRUCKINSPECTIONRECORD_ID:
row.TANKTRUCKINSPECTIONRECORD_ID,
},
})
"
>
@ -98,13 +101,21 @@
@click="
router.push({
path: '/mechanical_files/tank_truck_record/tank_truck_inspection_record/edit',
query: { TANKTRUCKINSPECTIONRECORD_ID: row.TANKTRUCKINSPECTIONRECORD_ID },
query: {
TANKTRUCKINSPECTIONRECORD_ID:
row.TANKTRUCKINSPECTIONRECORD_ID,
},
})
"
>
编辑
</el-button>
<el-button type="danger" text link @click="fnDelete(row.TANKTRUCKINSPECTIONRECORD_ID)">
<el-button
type="danger"
text
link
@click="fnDelete(row.TANKTRUCKINSPECTIONRECORD_ID)"
>
删除
</el-button>
</template>
@ -112,7 +123,11 @@
<template #button>
<el-button
type="primary"
@click="router.push({ path: '/mechanical_files/tank_truck_record/tank_truck_inspection_record/add' })"
@click="
router.push({
path: '/mechanical_files/tank_truck_record/tank_truck_inspection_record/add',
})
"
>
新增
</el-button>
@ -144,7 +159,7 @@ const getUserList = async () => {
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
@ -160,7 +175,6 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
console.log()
fnResetPagination({
VEHICLE: searchForm.value.VEHICLE,
INSPECTION_DATE: searchForm.value.INSPECTION_DATE,

View File

@ -50,7 +50,10 @@
<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.INSPECTION_CYCLE }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="提醒天数">
@ -59,7 +62,11 @@
<el-descriptions-item label-class-name="width_200" label="提醒日期">
{{ info.REMINDER_DATE }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="提醒状态" span="2">
<el-descriptions-item
label-class-name="width_200"
label="提醒状态"
span="2"
>
{{ info.REMINDER_STATUS === "1" ? "开启" : "关闭" }}
</el-descriptions-item>
<el-descriptions-item
@ -67,10 +74,8 @@
label="检查附件"
span="2"
>
<div v-for="item in info.INSPECTION_ATTACHMENT"
:key="item.FILEPATH">
<div v-for="item in info.INSPECTION_ATTACHMENT" :key="item.FILEPATH">
<el-button
type="primary"
text
link
@ -79,7 +84,6 @@
{{ item.name }} 下载
</el-button>
</div>
</el-descriptions-item>
<el-descriptions-item
label-class-name="width_200"
@ -116,7 +120,10 @@
<script setup>
import useDownloadFile from "@/assets/js/useDownloadFile.js";
import { ref, reactive } from "vue";
import { getTankTruckInspectionRecordView, getTrailerList } from "@/request/mechanical_files.js";
import {
getTankTruckInspectionRecordView,
getTrailerList,
} from "@/request/mechanical_files.js";
import { useRoute } from "vue-router";
import { addingPrefixToFile } from "@/assets/js/utils.js";
const route = useRoute();
@ -134,7 +141,7 @@ const data = reactive({
CAR_OWNERS_TEL: "",
INITIAL_REGISTRATION_DATE: "",
},
childList:[]
childList: [],
});
const fnBusChange = async (event) => {
const resData = await getTrailerList({ ID: event });
@ -145,14 +152,18 @@ const fnBusChange = async (event) => {
};
const fnGetData = async () => {
if (!TANKTRUCKINSPECTIONRECORD_ID) return;
const resData = await getTankTruckInspectionRecordView({TANKTRUCKINSPECTIONRECORD_ID});
resData.pd.INSPECTIONTOR = resData.pd.INSPECTIONTOR.split(",")
const resData = await getTankTruckInspectionRecordView({
TANKTRUCKINSPECTIONRECORD_ID,
});
resData.pd.INSPECTIONTOR = resData.pd.INSPECTIONTOR.split(",");
info.value = resData.pd;
data.childList = resData.detail
data.childList = resData.detail;
info.value.INSPECTION_ATTACHMENT = [];
info.value.INSPECTION_IMG = [];
fnBusChange(info.value.VEHICLE);
info.value.INSPECTION_ATTACHMENT = addingPrefixToFile(resData.inspectionAttachmentImgs);
info.value.INSPECTION_ATTACHMENT = addingPrefixToFile(
resData.inspectionAttachmentImgs
);
info.value.INSPECTION_IMG = addingPrefixToFile(resData.inspectionImgs);
};
fnGetData();