代码格式化

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

@ -53,7 +53,7 @@
{{ data.info.ORIGIN_NAME }}
</el-descriptions-item>
<el-descriptions-item label="起运地址">
{{ data.info.SHIPPING_ADDR}}
{{ data.info.SHIPPING_ADDR }}
</el-descriptions-item>
<el-descriptions-item label="行政区域">
{{ data.info.DEPARTURE_ADDR }}

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,16 +352,16 @@ const data = reactive({
INITIAL_REGISTRATION_DATE: "",
COMPANY_AREA: "",
},
info: {}
info: {},
});
const insureType = async (rule, insureType, callback) => {
if(!INSURE_ID) {
if (!INSURE_ID) {
if (insureType) {
data.info = await getInsureList();
data.info.varList.forEach((item) => {
if(item.VEHICLE === data.busInfo.ID) {
if(insureType === item.INSURANCE_COVERAGE) {
if (item.VEHICLE === data.busInfo.ID) {
if (insureType === item.INSURANCE_COVERAGE) {
callback(new Error("该保险已被此车辆重复选择"));
}
}
@ -369,16 +369,16 @@ const insureType = async (rule, insureType, callback) => {
} else {
callback();
}
}else{
} else {
if (insureType) {
const resData = await getInsureView({ INSURE_ID })
if(insureType === resData.pd.INSURANCE_COVERAGE) {
const resData = await getInsureView({ INSURE_ID });
if (insureType === resData.pd.INSURANCE_COVERAGE) {
callback();
}else{
} else {
data.info = await getInsureList();
data.info.varList.forEach((item) => {
if(item.VEHICLE === data.busInfo.ID) {
if(insureType === item.INSURANCE_COVERAGE) {
if (item.VEHICLE === data.busInfo.ID) {
if (insureType === item.INSURANCE_COVERAGE) {
callback(new Error("该保险已被此车辆重复选择"));
}
}

View File

@ -139,8 +139,12 @@
<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="INSURANCE_COVERAGE" label="保险项目" width="160" >
<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" ? "承运人责任险" : "" }}
{{ row.INSURANCE_COVERAGE === "1" ? "强制险" : "" }}

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

@ -47,8 +47,8 @@
{{ serialNumber(pagination, $index) }}
</template>
</el-table-column>
<el-table-column prop="INSPECTION_SITE" label="检查部位"/>
<el-table-column prop="REGULATORY_STATUS" label="规定状态"/>
<el-table-column prop="INSPECTION_SITE" label="检查部位" />
<el-table-column prop="REGULATORY_STATUS" label="规定状态" />
<el-table-column label="操作" width="180">
<template #default="{ row }">
<el-button
@ -101,21 +101,21 @@
</template>
<script setup>
import {serialNumber} from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js";
import Add from "./components/add.vue";
import {nextTick, reactive} from "vue";
import ViewInfo from "./components/view.vue";
import {
import { serialNumber } from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js";
import Add from "./components/add.vue";
import { nextTick, reactive } from "vue";
import ViewInfo from "./components/view.vue";
import {
setTankTruckInspectionDelete,
getTankTruckInspectionList,
getTankTruckInspectionView,
} from "@/request/mechanical_files.js";
import {ElMessage, ElMessageBox} from "element-plus";
} from "@/request/mechanical_files.js";
import { ElMessage, ElMessageBox } from "element-plus";
const {list, pagination, searchForm, fnGetData, fnResetPagination} =
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getTankTruckInspectionList);
const data = reactive({
const data = reactive({
addOrEditDialog: {
visible: false,
type: "",
@ -125,41 +125,41 @@
visible: false,
info: {},
},
});
});
const fnAddOrEdit = async (TANKTRUCKINSPECTION_ID = "", type = "add") => {
const fnAddOrEdit = async (TANKTRUCKINSPECTION_ID = "", type = "add") => {
data.addOrEditDialog.visible = true;
data.addOrEditDialog.type = type;
if (type === "edit" && TANKTRUCKINSPECTION_ID) {
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();
};
};
//
const deleteItem = async (value) => {
//
const deleteItem = async (value) => {
await ElMessageBox.confirm(`确定要删除吗?`, {
type: "warning",
});
await setTankTruckInspectionDelete({TANKTRUCKINSPECTION_ID: value});
await setTankTruckInspectionDelete({ TANKTRUCKINSPECTION_ID: value });
ElMessage.success("删除成功");
fnGetData();
};
const fnView = async (TANKTRUCKINSPECTION_ID) => {
};
const fnView = async (TANKTRUCKINSPECTION_ID) => {
const resData = await getTankTruckInspectionView({
TANKTRUCKINSPECTION_ID,
});
data.viewDialog.info = resData.pd;
data.viewDialog.visible = true;
};
};
</script>
<style scoped></style>

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"
@ -36,27 +33,27 @@
</el-col>
<el-col :span="12">
<el-form-item label="车牌号" prop="PLATE_NUMBER">
<el-input v-model="data.busInfo.PLATE_NUMBER" disabled/>
<el-input v-model="data.busInfo.PLATE_NUMBER" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车架号" prop="VIN">
<el-input v-model="data.busInfo.VIN" disabled/>
<el-input v-model="data.busInfo.VIN" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车辆类型" prop="TRAILER_TYPE">
<el-input v-model="data.busInfo.TRAILER_TYPE" disabled/>
<el-input v-model="data.busInfo.TRAILER_TYPE" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车主/业户" prop="CAR_OWNERS ">
<el-input v-model="data.busInfo.CAR_OWNERS" disabled/>
<el-input v-model="data.busInfo.CAR_OWNERS" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车主电话" prop="CAR_OWNERS_TEL">
<el-input v-model="data.busInfo.CAR_OWNERS_TEL" disabled/>
<el-input v-model="data.busInfo.CAR_OWNERS_TEL" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
@ -72,7 +69,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属区域" prop="COMPANY_AREA">
<el-input v-model="data.busInfo.COMPANY_AREA" disabled/>
<el-input v-model="data.busInfo.COMPANY_AREA" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
@ -80,9 +77,9 @@
</el-col>
<el-col :span="24">
<layout-table :data="data.childList" :show-pagination="false">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column prop="INSPECTION_SITE" label="检查部位"/>
<el-table-column prop="REGULATORY_STATUS" label="规定状态"/>
<el-table-column type="index" label="序号" width="50" />
<el-table-column prop="INSPECTION_SITE" label="检查部位" />
<el-table-column prop="REGULATORY_STATUS" label="规定状态" />
<el-table-column label="操作" width="300">
<template #default="{ row }">
<el-radio-group v-model="row.INSPECTION_STATUS">
@ -216,42 +213,42 @@
</template>
<script setup>
import {getUserListAll} from "@/request/data_dictionary.js";
import LayoutUpload from "@/components/upload/index.vue";
import {ref, reactive} from "vue";
import {debounce} from "throttle-debounce";
import {
import { getUserListAll } from "@/request/data_dictionary.js";
import LayoutUpload from "@/components/upload/index.vue";
import { ref, reactive } from "vue";
import { debounce } from "throttle-debounce";
import {
getTankTruckInspectionRecordView,
setTankTruckInspectionRecordAdd,
setTankTruckInspectionRecordEdit,
getTankTruckInspectionListAll,
getTrailerList,
} from "@/request/mechanical_files.js";
import {setUploadImg} from "@/request/api.js";
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";
} from "@/request/mechanical_files.js";
import { setUploadImg } from "@/request/api.js";
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 TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
VEHICLE: '',
INSPECTION_DATE: '',
const route = useRoute();
const router = useRouter();
const TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
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: ''
});
const data = reactive({
NOTES: "",
});
const data = reactive({
vehicleList: [],
busInfo: {
DRIVING_LICENSE_IMG: [],
@ -264,21 +261,23 @@
COMPANY_AREA: "",
},
userList: [],
childList: []
});
const rules = {
VEHICLE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTION_DATE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTIONTOR: [{required: true, message: "请输入", trigger: "blur"}],
DUE_DATE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTION_CYCLE: [{required: true, message: "请输入", trigger: "blur"}],
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_IMG: [{required: true, message: "请添加图片", trigger: "blur"}],
};
const getDueDate = () => {
childList: [],
});
const rules = {
VEHICLE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTIONTOR: [{ required: true, message: "请输入", trigger: "blur" }],
DUE_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_CYCLE: [{ required: true, message: "请输入", trigger: "blur" }],
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_IMG: [{ required: true, message: "请添加图片", trigger: "blur" }],
};
const getDueDate = () => {
if (form.value.INSPECTION_DATE && form.value.INSPECTION_CYCLE) {
form.value.DUE_DATE = subtractDaysFromDate(
form.value.INSPECTION_DATE,
@ -295,8 +294,8 @@
form.value.DUE_DATE = "";
form.value.REMINDER_DATE = "";
}
};
const getRemiderDate = (val) => {
};
const getRemiderDate = (val) => {
if (val) {
if (form.value.DUE_DATE) {
//
@ -317,14 +316,14 @@
} else {
form.value.REMINDER_DATE = "";
}
};
const getUserList = async () => {
};
const getUserList = async () => {
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
const getVehicle = async (event) => {
const resData = await getTrailerList({TRAFFIC_TYPE: event});
};
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@ -335,10 +334,10 @@
data.busInfo.CAR_OWNERS_TEL = "";
data.busInfo.INITIAL_REGISTRATION_DATE = "";
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
};
getVehicle("2");
const fnBusChange = async (event) => {
const resData = await getTrailerList({ID: event});
};
getVehicle("2");
const fnBusChange = async (event) => {
const resData = await getTrailerList({ ID: event });
data.busInfo = resData.list[0];
if (form.value.TELEPHONE === "") {
form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL;
@ -349,8 +348,8 @@
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
);
};
const getBusInfo = (val) => {
};
const getBusInfo = (val) => {
if (val) {
fnBusChange(val);
} else {
@ -364,72 +363,86 @@
data.busInfo.COMPANY_AREA = "";
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
}
};
const fnGetData = async () => {
};
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();
};
fnGetData();
const fnUploadImage = async (currentId, FFILE, TYPE) => {
const fnUploadImage = async (currentId, FFILE, TYPE) => {
const formData = new FormData();
formData.append("FOREIGN_KEY", currentId);
formData.append("TYPE", TYPE); // TYPE
formData.append("FFILE", FFILE);
await setUploadImg(formData);
};
};
const fnSubmit = debounce(
const fnSubmit = debounce(
1000,
async () => {
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 setTankTruckInspectionRecordAdd({ ...formData })
: 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"
); //
}
}
@ -443,8 +456,8 @@
ElMessage.success("保存成功");
router.back();
},
{atBegin: true}
);
{ atBegin: true }
);
</script>
<style scoped lang="scss"></style>

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"
@ -36,27 +33,27 @@
</el-col>
<el-col :span="12">
<el-form-item label="车牌号" prop="PLATE_NUMBER">
<el-input v-model="data.busInfo.PLATE_NUMBER" disabled/>
<el-input v-model="data.busInfo.PLATE_NUMBER" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车架号" prop="VIN">
<el-input v-model="data.busInfo.VIN" disabled/>
<el-input v-model="data.busInfo.VIN" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车辆类型" prop="TRAILER_TYPE">
<el-input v-model="data.busInfo.TRAILER_TYPE" disabled/>
<el-input v-model="data.busInfo.TRAILER_TYPE" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车主/业户" prop="CAR_OWNERS ">
<el-input v-model="data.busInfo.CAR_OWNERS" disabled/>
<el-input v-model="data.busInfo.CAR_OWNERS" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车主电话" prop="CAR_OWNERS_TEL">
<el-input v-model="data.busInfo.CAR_OWNERS_TEL" disabled/>
<el-input v-model="data.busInfo.CAR_OWNERS_TEL" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
@ -72,7 +69,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属区域" prop="COMPANY_AREA">
<el-input v-model="data.busInfo.COMPANY_AREA" disabled/>
<el-input v-model="data.busInfo.COMPANY_AREA" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
@ -80,9 +77,9 @@
</el-col>
<el-col :span="24">
<layout-table :data="data.childList" :show-pagination="false">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column prop="INSPECTION_SITE" label="检查部位"/>
<el-table-column prop="REGULATORY_STATUS" label="规定状态"/>
<el-table-column type="index" label="序号" width="50" />
<el-table-column prop="INSPECTION_SITE" label="检查部位" />
<el-table-column prop="REGULATORY_STATUS" label="规定状态" />
<el-table-column label="操作" width="300">
<template #default="{ row }">
<el-radio-group v-model="row.INSPECTION_STATUS">
@ -216,42 +213,42 @@
</template>
<script setup>
import {getUserListAll} from "@/request/data_dictionary.js";
import LayoutUpload from "@/components/upload/index.vue";
import {ref, reactive} from "vue";
import {debounce} from "throttle-debounce";
import {
import { getUserListAll } from "@/request/data_dictionary.js";
import LayoutUpload from "@/components/upload/index.vue";
import { ref, reactive } from "vue";
import { debounce } from "throttle-debounce";
import {
getTankTruckInspectionRecordView,
setTankTruckInspectionRecordAdd,
setTankTruckInspectionRecordEdit,
getTankTruckInspectionListAll,
getTrailerList,
} from "@/request/mechanical_files.js";
import {setUploadImg} from "@/request/api.js";
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";
} from "@/request/mechanical_files.js";
import { setUploadImg } from "@/request/api.js";
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 TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
VEHICLE: '',
INSPECTION_DATE: '',
const route = useRoute();
const router = useRouter();
const TANKTRUCKINSPECTIONRECORD_ID = route.query.TANKTRUCKINSPECTIONRECORD_ID;
const formRef = ref(null);
const form = ref({
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: ''
});
const data = reactive({
NOTES: "",
});
const data = reactive({
vehicleList: [],
busInfo: {
DRIVING_LICENSE_IMG: [],
@ -264,21 +261,23 @@
COMPANY_AREA: "",
},
userList: [],
childList: []
});
const rules = {
VEHICLE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTION_DATE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTIONTOR: [{required: true, message: "请输入", trigger: "blur"}],
DUE_DATE: [{required: true, message: "请输入", trigger: "blur"}],
INSPECTION_CYCLE: [{required: true, message: "请输入", trigger: "blur"}],
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_IMG: [{required: true, message: "请添加图片", trigger: "blur"}],
};
const getDueDate = () => {
childList: [],
});
const rules = {
VEHICLE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTIONTOR: [{ required: true, message: "请输入", trigger: "blur" }],
DUE_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
INSPECTION_CYCLE: [{ required: true, message: "请输入", trigger: "blur" }],
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_IMG: [{ required: true, message: "请添加图片", trigger: "blur" }],
};
const getDueDate = () => {
if (form.value.INSPECTION_DATE && form.value.INSPECTION_CYCLE) {
form.value.DUE_DATE = subtractDaysFromDate(
form.value.INSPECTION_DATE,
@ -295,8 +294,8 @@
form.value.DUE_DATE = "";
form.value.REMINDER_DATE = "";
}
};
const getRemiderDate = (val) => {
};
const getRemiderDate = (val) => {
if (val) {
if (form.value.DUE_DATE) {
//
@ -317,14 +316,14 @@
} else {
form.value.REMINDER_DATE = "";
}
};
const getUserList = async () => {
};
const getUserList = async () => {
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
const getVehicle = async (event) => {
const resData = await getTrailerList({TRAFFIC_TYPE: event});
};
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@ -335,10 +334,10 @@
data.busInfo.CAR_OWNERS_TEL = "";
data.busInfo.INITIAL_REGISTRATION_DATE = "";
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
};
getVehicle("2");
const fnBusChange = async (event) => {
const resData = await getTrailerList({ID: event});
};
getVehicle("2");
const fnBusChange = async (event) => {
const resData = await getTrailerList({ ID: event });
data.busInfo = resData.list[0];
if (form.value.TELEPHONE === "") {
form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL;
@ -349,8 +348,8 @@
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
);
};
const getBusInfo = (val) => {
};
const getBusInfo = (val) => {
if (val) {
fnBusChange(val);
} else {
@ -364,70 +363,84 @@
data.busInfo.COMPANY_AREA = "";
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
}
};
const fnGetData = async () => {
};
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();
};
fnGetData();
const fnUploadImage = async (currentId, FFILE, TYPE) => {
const fnUploadImage = async (currentId, FFILE, TYPE) => {
const formData = new FormData();
formData.append("FOREIGN_KEY", currentId);
formData.append("TYPE", TYPE); // TYPE
formData.append("FFILE", FFILE);
await setUploadImg(formData);
};
};
const fnSubmit = debounce(
const fnSubmit = debounce(
1000,
async () => {
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 setTankTruckInspectionRecordAdd({ ...formData })
: 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"
); //
}
}
@ -441,8 +454,8 @@
ElMessage.success("保存成功");
router.back();
},
{atBegin: true}
);
{ atBegin: true }
);
</script>
<style scoped lang="scss"></style>

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>
@ -123,8 +138,8 @@
</template>
<script setup>
import { reactive} from "vue";
import {getUserListAll} from "@/request/data_dictionary.js";
import { reactive } from "vue";
import { getUserListAll } from "@/request/data_dictionary.js";
import { useRouter } from "vue-router";
import { serialNumber } from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js";
@ -144,9 +159,9 @@ const getUserList = async () => {
const resData = await getUserListAll();
data.userList = resData.userList;
};
getUserList()
getUserList();
const getVehicle = async (event) => {
const resData = await getTrailerList({TRAFFIC_TYPE: event});
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
};
getVehicle("2");
@ -160,7 +175,6 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
console.log()
fnResetPagination({
VEHICLE: searchForm.value.VEHICLE,
INSPECTION_DATE: searchForm.value.INSPECTION_DATE,

View File

@ -29,14 +29,14 @@
</el-descriptions>
<el-divider content-position="left">罐检信息</el-divider>
<layout-table :data="data.childList" :show-pagination="false">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column prop="INSPECTION_SITE" label="检查部位"/>
<el-table-column prop="REGULATORY_STATUS" label="规定状态"/>
<el-table-column type="index" label="序号" width="50" />
<el-table-column prop="INSPECTION_SITE" label="检查部位" />
<el-table-column prop="REGULATORY_STATUS" label="规定状态" />
<el-table-column label="操作" width="300">
<template #default="{ row }">
<span v-if="row.INSPECTION_STATUS==='1'"></span>
<span v-if="row.INSPECTION_STATUS==='2'"></span>
<span v-if="row.INSPECTION_STATUS==='3'"></span>
<span v-if="row.INSPECTION_STATUS === '1'"></span>
<span v-if="row.INSPECTION_STATUS === '2'"></span>
<span v-if="row.INSPECTION_STATUS === '3'"></span>
</template>
</el-table-column>
</layout-table>
@ -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,19 +74,16 @@
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
@click="useDownloadFile(item.FILEPATH)"
>
{{item.name}} 下载
{{ 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();