wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
鲁洪霞 2024-03-22 16:47:40 +08:00
parent 7b110927c4 55677507ac
commit 7ed209f82a
6 changed files with 199 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/request/traffic_driving_log.js
View File

@ -1,9 +1,9 @@
import { post } from "@/request/axios.js"; import { post } from "@/request/axios.js";
export const getSafetyDrivingLogList = (params) => export const getSafetyDrivingLogList = (params) =>
post("/drivinglog/listForSafetyDrivingLog", params); // 行车日志列表 post("/waybillregistration/listForSecurityWaybillre", params); // 行车日志列表
export const setDrivingLogDelete = (params) => export const setDrivingLogDelete = (params) =>
post("/drivinglog/delete", params); // 行车日志删除 post("/waybillregistration/delete", params); // 行车日志删除
export const getSafetyDrivingLogView = (params) => export const getSafetyDrivingLogView = (params) =>
post("/drivinglog/goEdit", params); // 安全例会详情 post("/waybillregistration/getDetail", params); // 安全例会详情

2
src/views/driving_inspections/driving_commitment/index.vue
View File

@ -41,8 +41,6 @@
width="330" width="330"
/> />
<el-table-column prop="INQUIRYCONCLUSION" label="问询结果" width="230" /> <el-table-column prop="INQUIRYCONCLUSION" label="问询结果" width="230" />
<el-table-column prop="CORP_NAME" label="经营企业" width="230" />
<el-table-column prop="TRANSPORTVEHICLE" label="经营类型" width="230" />
<el-table-column prop="CREATTIME" label="创建时间" width="130" /> <el-table-column prop="CREATTIME" label="创建时间" width="130" />
<el-table-column prop="OPERATTIME" label="修改时间" width="130" /> <el-table-column prop="OPERATTIME" label="修改时间" width="130" />
<el-table-column label="操作" > <el-table-column label="操作" >

229
src/views/driving_inspections/driving_log/add.vue
View File

@ -1,229 +0,0 @@
<template>
<layout-card>
<el-form
ref="formRef"
:model="data.form"
:rules="rules"
label-width="175px"
>
<el-divider content-position="left">添加</el-divider>
<el-row>
<el-col :span="8">
<el-form-item label="会议标题" prop="MEETING_TITLE">
<el-input
v-model="data.form.MEETING_TITLE"
placeholder="请输入会议标题"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="会议类型" prop="MEETING_TYPE">
<el-select
v-model="data.form.MEETING_TYPE"
placeholder="请选择会议类型"
@change="handleMeetingTypeChange"
>
<el-option
v-for="item in relatedClassificationList"
:key="item.BIANMA"
:label="item.NAME"
:value="item.BIANMA"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运输企业" prop="TRANSPORTATIONCOMPANY">
<el-input
v-model="data.form.TRANSPORTATIONCOMPANY"
placeholder="请输入运输企业"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议地点" prop="MEETING_ADDRESS">
<el-input
v-model="data.form.MEETING_ADDRESS"
placeholder="请输入会议地点"
/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item prop="MEETING_DATE" label="会议时间">
<el-date-picker
type="daterange"
v-model="data.form.MEETING_DATE"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
start-placeholder="开始时间"
end-placeholder="结束时间"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主持人" prop="HOST_PERSON">
<el-input
v-model="data.form.HOST_PERSON"
placeholder="请输入主持人"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="记录人" prop="RECORDER">
<el-input v-model="data.form.RECORDER" placeholder="请输入记录人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="从业身份" prop="PRACTITIONER_TYPE">
<el-checkbox-group
v-model="data.form.PRACTITIONER_TYPE"
@change="handleCheckedCitiesChange"
>
<el-checkbox v-for="city in cities" :key="city" :label="city">{{
city
}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="会议附件" prop="fileList">
<layout-upload
v-model:file-list="data.form.fileList"
accept=".pdf,.mp4"
delete-to-server
:limit="9"
/>
</el-form-item>
</el-col>
<el-col :span="50">
<el-form-item label="会议记要" prop="MEETING_CONTENT">
<layout-editor
v-model="data.form.MEETING_CONTENT"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tc mt-10">
<el-button type="primary" @click="fnSubmit"> 确定 </el-button>
</div>
</layout-card>
</template>
<script setup>
import {
layoutFnGetMEETINGTYPEClassification,
getUserListAll,
} from "@/request/safety_production_related.js";
import { addSafetyMeetingView } from "@/request/traffic_safety_meeting.js";
import { reactive, ref } from "vue";
import LayoutUpload from "@/components/upload/index.vue";
import LayoutEditor from "@/components/editor/index.vue";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
const formRef = ref(null);
const cities = [
"驾驶员",
"押运员",
"安全管理员",
"装卸员",
"安全负责人",
"其他",
"监控员",
];
const handleCheckedCitiesChange = () => {};
const rules = {
MEETING_TITLE: [
{ required: true, message: "请输入会议标题", trigger: "blur" },
],
MEETING_TYPE: [
{ required: true, message: "请选择会议类型", trigger: "change" },
],
TRANSPORTATIONCOMPANY: [
{ required: true, message: "请输入运输企业", trigger: "blur" },
],
MEETING_ADDRESS: [
{ required: true, message: "请输入会议地点", trigger: "blur" },
],
MEETING_DATE: [
{ required: true, message: "请选择会议时间", trigger: "change" },
],
HOST_PERSON: [{ required: true, message: "请输入主持人", trigger: "blur" }],
RECORDER: [{ required: true, message: "请输入记录人", trigger: "blur" }],
MEETING_CONTENT: [
{ required: true, message: "请输入会议记要", trigger: "blur" },
],
};
const fnGetUnitsList = async () => {
const resData = await getUserListAll({});
data.unitsList = resData.varList;
};
fnGetUnitsList();
const relatedClassificationTempList =
await layoutFnGetMEETINGTYPEClassification();
const relatedClassificationList = [];
JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
relatedClassificationList.push({ name: e.id, BIANMA: e.name });
});
const data = reactive({
form: {
MEETING_TITLE: "",
MEETING_TYPE: "",
TRANSPORTATIONCOMPANY: "",
MEETING_ADDRESS: "",
MEETING_DATE: "",
HOST_PERSON: "",
RECORDER: "",
fileList: [],
PRACTITIONER_TYPE: [],
NOTIFICATIONCONTENT: "",
},
});
const handleMeetingTypeChange = (value) => {
data.form.MEETING_TYPE = value;
};
const fnSubmit = async () => {
await useFormValidate(formRef);
const formData = new FormData();
Object.keys(data.form).forEach((key) => {
formData.append(key, data.form[key]);
});
formData.delete("fileList");
for (let i = 0; i < data.form.fileList.length; i++) {
if (data.form.fileList[i].raw)
formData.append("FFILE", data.form.fileList[i].raw);
}
try {
await addSafetyMeetingView(formData);
ElMessage.success("添加成功");
Object.keys(data.form).forEach((key) => {
if (Array.isArray(data.form[key])) {
data.form[key] = [];
} else {
data.form[key] = "";
}
});
} catch (error) {
ElMessage.error("添加失败");
}
};
</script>
<style scoped lang="scss">
.flexBox {
display: flex;
align-items: flex-end;
.addBtn {
margin-left: 12px;
}
}
</style>

458
src/views/driving_inspections/driving_log/drivingLog_info.vue
View File

@ -1,341 +1,139 @@
<template> <template>
<div> <layout-card>
<layout-card> <div id="printContent">
<el-row :gutter="20"> <table class="archive_print_table">
<el-col :span="24"> <thead>
<el-descriptions :column="2" border> <tr>
<el-descriptions-item label="会议标题"> <td colspan="10" style="border: none">
{{ detailItems.WAYBILLNUMBER }} <el-divider content-position="left">
</el-descriptions-item> {{data.info.TRANSPORTVEHICLE}}车辆行车三检日志
<el-descriptions-item label="运输企业"> </el-divider>
{{ detailItems.TRANSPORTATIONCOMPANY }} </td>
</el-descriptions-item> </tr>
<el-descriptions-item label="运输任务"> </thead>
<el-row :gutter="20"> <tr>
<el-col :span="6"> <td class="title">运单编号</td>
<el-descriptions :column="1" border> <td colspan="5">{{ data.info.WAYBILLNUMBER }}</td>
<el-descriptions-item label="运输车辆"> <td class="title">运单状态</td>
{{ detailItems.TRANSPORTVEHICLE }} <td colspan="4">
</el-descriptions-item> <span v-if="data.info.WAYBILLSTATUS === '0'">未出发</span>
</el-descriptions> <span v-else-if="data.info.WAYBILLSTATUS === '1'">已出发</span>
</el-col> <span v-else-if="data.info.WAYBILLSTATUS === '2'">已完成</span>
<el-col :span="6"> </td>
<el-descriptions :column="1" border> </tr>
<el-descriptions-item label="运输性能"> <tr>
{{ detailItems.TRANSPORTNATURE }} <td :rowspan="4" class="title">运输任务</td>
</el-descriptions-item> <td class="title" rowspan="1">运输车辆</td>
</el-descriptions> <td colspan="4">{{ data.info.TRANSPORTVEHICLE }}</td>
</el-col> <td class="title" colspan="1">车架号</td>
<el-col :span="6"> <td colspan="5">{{ data.info.VIN }}</td>
<el-descriptions :column="1" border> </tr>
<el-descriptions-item label="发车时间"> <tr>
{{ detailItems.DEPARTURETIME }} <td class="title" rowspan="1">从业人员</td>
</el-descriptions-item> <td colspan="4">{{ data.info.NAME }}</td>
</el-descriptions> <td class="title" colspan="1">联系电话</td>
</el-col> <td colspan="5">{{ data.info.PHONE }}</td>
<el-col :span="6"> </tr>
<el-descriptions :column="1" border> <tr>
<el-descriptions-item label="发车地点"> <td class="title" rowspan="1">发车时间</td>
{{ detailItems.DEPARTUREPLACE }} <td colspan="4">{{ data.info.STARTTIME }}</td>
</el-descriptions-item> <td class="title" colspan="1">收车时间</td>
</el-descriptions> <td colspan="5">{{ data.info.STOPTIME }}</td>
</el-col> </tr>
<el-col :span="6"> <tr>
<el-descriptions :column="1" border> <td class="title" rowspan="1">发车地点</td>
<el-descriptions-item label="车架号"> <td colspan="4">{{ data.info.ORIGIN_NAME }}</td>
{{ detailItems.FRAMENUMBER }} <td class="title" colspan="1">收车地点</td>
</el-descriptions-item> <td colspan="5">{{ data.info.DESTINATION_NAME }}</td>
</el-descriptions> </tr>
</el-col> <tr>
<el-col :span="6"> <td :rowspan="4" class="title">行车安全问询</td>
<el-descriptions :column="1" border> </tr>
<el-descriptions-item label="从业人员"> <tr v-for="(item, index) in data.commitmentList" :key="index">
{{ detailItems.EMPLOYEES }} <td colspan="9">
</el-descriptions-item> <span>{{ item.INQUIRYCONTENT }}</span>
</el-descriptions> </td>
</el-col> </tr>
<el-col :span="6"> <tr v-for="(item, index) in data.info.varList" :key="index">
<el-descriptions :column="1" border> <td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
<el-descriptions-item label="收车时间"> <td colspan="8">
{{ detailItems.ARRIVALTIME }} <table class="archive_print_table" v-for="(item1,index1) in item.pd1Children" :key="index1">
</el-descriptions-item> <tr>
</el-descriptions> <td :rowspan="10" class="title">检查记录</td>
</el-col> </tr>
<el-col :span="6"> <tr v-for="(item2,index2) in item1.pd2Children" :key="index2">
<el-descriptions :column="1" border> <td class="title">检查项名称</td>
<el-descriptions-item label="收车地点"> <td>{{item2.CHECKITEMNAME}}</td>
{{ detailItems.ARRIVALPLACE }} <td class="title">检查项说明</td>
</el-descriptions-item> <td>{{item2.REMARKS}}</td>
</el-descriptions> </tr>
</el-col> <tr>
<el-col :span="6"> <td class="title">检查人</td>
<el-descriptions :column="1" border> <td>
<el-descriptions-item label="天气情况"> <img
{{ detailItems.WEATHERCONDITION }} v-viewer
</el-descriptions-item> :src="VITE_FILE_URL + item1.SIGN_PATH"
</el-descriptions> alt=""
</el-col> width="20"
<el-col :span="6"> height="20"
<el-descriptions :column="1" border> class="mr-10 mt-10"
<el-descriptions-item label="联系电话"> />
{{ detailItems.CONTACTPHONE }} </td>
</el-descriptions-item> <td class="title">检查时间</td>
</el-descriptions> <td>{{item1.SIGN_TIME}}</td>
</el-col> </tr>
<el-col :span="6"> <tr>
<el-descriptions :column="1" border> <td class="title">检查照片</td>
<el-descriptions-item label="额定载荷"> <td colspan="3">
{{ detailItems.RATEDLOAD }} <div>
</el-descriptions-item> <template
</el-descriptions> v-for="(item3, index3) in item1.IMG_PATH.split(',')"
</el-col> :key="index3"
<el-col :span="6"> >
<el-descriptions :column="1" border> <img
<el-descriptions-item label="实际载荷"> v-viewer
{{ detailItems.ACTUALLOAD }} :src="VITE_FILE_URL + item3"
</el-descriptions-item> alt=""
</el-descriptions> width="20"
</el-col> height="20"
</el-row> class="mr-10 mt-10"
</el-descriptions-item> />
</el-descriptions> </template>
<el-descriptions :column="1" border>
<el-descriptions-item label="行车安全问询"> </div>
{{ detailItems.DRIVINGSAFETYINQUIRY }} </td>
</el-descriptions-item> </tr>
</el-descriptions>
<el-descriptions :column="1" border> </table>
<el-descriptions-item label="出车前检查"> </td>
<el-row :gutter="20"> </tr>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查人">
{{ detailItems.PREDEPARTUREINSPECTOR }} </table>
</el-descriptions-item> </div>
</el-descriptions> </layout-card>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查时间">
{{ detailItems.PREDEPARTUREINSPECTIONTIME }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="故障处理">
{{ detailItems.PREDEPARTUREFAULTTREATMENT }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="出车结论">
{{ detailItems.DEPARTURECONCLUSION }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="出车前照片">
{{ detailItems.PREDEPARTUREPHOTO }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="出车前签字">
{{ detailItems.PREDEPARTURESIGNATURE }}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border>
<el-descriptions-item label="行车中检查">
<el-row :gutter="20">
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查人">
{{ detailItems.INDRIVINGINSPECTOR }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查时间">
{{ detailItems.INSPECTIONTIMEWHILEDRIVING }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="故障处理">
{{ detailItems.INDRIVINGFAULTTREATMENT }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="行车中照片">
{{ detailItems.PHOTOSWHILEDRIVING }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="行车中签字">
{{ detailItems.SIGNINGWHILEDRIVING }}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border>
<el-descriptions-item label="收车后检查">
<el-row :gutter="20">
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查人">
{{ detailItems.POSTARRIVALINSPECTOR }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="检查时间">
{{ detailItems.POSTARRIVALINSPECTIONTIME }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="故障处理">
{{ detailItems.POSTARRIVALFAULTTREATMENT }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="收车后照片">
{{ detailItems.CHECKPHOTOS }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="收车后签字">
{{ detailItems.CHECKSIGNATURE }}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border>
<el-descriptions-item label="交接班记录">
<el-row :gutter="20">
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="驾驶时长">
{{ detailItems.DRIVINGDURATION }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="时间区间">
{{ detailItems.TIMEINTERVAL }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="交接地点">
{{ detailItems.HANDOVERPLACE }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="交接班人">
{{ detailItems.HANDOVERPERSON }}
</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="6">
<el-descriptions :column="1" border>
<el-descriptions-item label="接班图片">
{{ detailItems.RELIEFPICTURE }}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border>
<el-descriptions-item label="安全负责人">
{{ detailItems.SAFETYOFFICER }}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
</layout-card>
</div>
</template> </template>
<script setup> <script setup>
import { ref } from "vue"; import { reactive } from "vue";
import { getSafetyDrivingLogView } from "@/request/traffic_driving_log.js";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
const route = useRoute(); import {getSafetyDrivingLogView} from "@/request/traffic_driving_log.js";
const { DRIVING_LOG_ID } = route.query;
const detailItems = ref({
WAYBILLNUMBER: "",
TRANSPORTATIONCOMPANY: "",
TRANSPORTVEHICLE: "",
TRANSPORTNATURE: "",
DEPARTURETIME: "",
DEPARTUREPLACE: "",
FRAMENUMBER: "",
EMPLOYEES: "",
ARRIVALTIME: "",
ARRIVALPLACE: "",
WEATHERCONDITION: "",
CONTACTPHONE: "",
ACTUALLOAD: "",
DRIVINGSAFETYINQUIRY: "",
DEPARTURECONCLUSION: "",
PREDEPARTUREINSPECTOR: "",
PREDEPARTUREINSPECTIONTIME: "",
PREDEPARTUREFAULTTREATMENT: "",
INDRIVINGINSPECTOR: "",
INSPECTIONTIMEWHILEDRIVING: "",
INDRIVINGFAULTTREATMENT: "",
POSTARRIVALINSPECTOR: "",
POSTARRIVALINSPECTIONTIME: "",
POSTARRIVALFAULTTREATMENT: "",
DRIVINGDURATION: "",
TIMEINTERVAL: "",
HANDOVERPLACE: "",
HANDOVERPERSON: "",
RELIEFPICTURE: "",
SAFETYOFFICER: "",
PREDEPARTUREPHOTO: "",
PREDEPARTURESIGNATURE: "",
PHOTOSWHILEDRIVING: "",
SIGNINGWHILEDRIVING: "",
CHECKPHOTOS: "",
CHECKSIGNATURE: "",
});
const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
const route = useRoute();
const { WAYBILLREGISTRATION_ID } = route.query;
const data = reactive({
info: {},
commitmentList: {},
});
const fnGetData = async () => { const fnGetData = async () => {
const response = await getSafetyDrivingLogView({ DRIVING_LOG_ID }); const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
detailItems.value = response.pd; data.info = resData.pd;
data.commitmentList = resData.commitmentList;
}; };
fnGetData(); fnGetData();
</script> </script>
<style scoped></style> <style scoped lang="scss"></style>

143
src/views/driving_inspections/driving_log/index.vue
View File

@ -2,25 +2,37 @@
<div> <div>
<el-card> <el-card>
<el-form <el-form
:model="searchForm" :model="searchForm"
label-width="100px" label-width="100px"
@submit.prevent="fnResetPagination" @submit.prevent="fnResetPaginationTransfer"
> >
<el-row> <el-row>
<el-col :span="6">
<el-form-item label="运输企业" prop="TRANSPORTCOMPANY">
<el-input v-model="searchForm.TRANSPORTCOMPANY" />
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="运输车辆" prop="TRANSPORTVEHICLE"> <el-form-item label="运输车辆" prop="TRANSPORTVEHICLE">
<el-input v-model="searchForm.TRANSPORTVEHICLE" /> <el-input
v-model="searchForm.TRANSPORTVEHICLE"
placeholder="请输入运输车辆"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="状态" prop="STEP_ID">
<el-select v-model="searchForm.STEP_ID">
<el-option
v-for="item in stepList"
:key="item.STEP_ID"
:label="item.STEP_NAME"
:value="item.STEP_ID"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="10px"> <el-form-item label-width="10px">
<el-button type="primary" native-type="submit">搜索</el-button> <el-button type="primary" native-type="submit">搜索</el-button>
<el-button native-type="reset" @click="fnResetPagination"> <el-button native-type="reset" @click="fnResetPaginationTransfer">
重置 重置
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -30,107 +42,78 @@
</el-card> </el-card>
<layout-card> <layout-card>
<layout-table <layout-table
v-model:pagination="pagination" v-model:pagination="pagination"
:data="list" :data="list"
@get-data="fnGetData" @get-data="fnGetData"
> >
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template #default="{ $index }"> <template #default="{ $index }">
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="WAYBILLNUMBER" label="运单编号" width="230"/>
prop="REGISTRATIONNUMBER" <el-table-column label="行车状态" width="130" >
label="登记编号" <template #default="{ row }">
width="130" <el-tag v-if="row.WAYBILLSTATUS === '0'">未出发</el-tag>
/> <el-tag v-else-if="row.WAYBILLSTATUS === '1'">已出发</el-tag>
<el-table-column prop="DEPARTURESTATUS" label="出车状态" width="130" /> <el-tag v-else-if="row.WAYBILLSTATUS === '2'">收车后</el-tag>
<el-table-column prop="DRIVINGCONDITION" label="行车状态" width="130" /> </template>
<el-table-column prop="TRANSPORTVEHICLE" label="运输车辆" width="130" /> </el-table-column>
<el-table-column prop="EMPLOYEES" label="从业人员" width="130" /> <el-table-column prop="TRANSPORTVEHICLE" label="运输车辆" width="230" />
<el-table-column prop="CONTACTPHONE" label="联系电话" width="130" /> <el-table-column prop="NAME" label="从业人员" width="130" />
<el-table-column prop="WEATHERCONDITION" label="天气预报" width="130" /> <el-table-column prop="PHONE" label="联系电话" width="130" />
<el-table-column prop="TRANSPORTNATURE" label="运输性质" width="130" /> <el-table-column prop="STARTTIME" label="发车时间" />
<el-table-column prop="DEPARTURETIME" label="发车时间" /> <el-table-column prop="STOPTIME" label="收车时间" />
<el-table-column prop="ARRIVALTIME" label="收车时间" />
<el-table-column prop="TRANSPORTCOMPANY" label="运输企业" />
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"
text text
link link
@click=" @click="
router.push({ router.push({
path: '/driving_inspections/driving_log/drivingLog_info', path: '/driving_inspections/driving_log/drivingLog_info',
query: { query: {
DRIVING_LOG_ID: row.DRIVING_LOG_ID, WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID
}, },
}) })
" "
> >
查看 查看
</el-button> </el-button>
<el-button <!-- <el-button-->
type="primary" <!-- type="danger"-->
text <!-- text-->
link <!-- link-->
@click=" <!-- @click="deleteItem(row.WAYBILLREGISTRATION_ID)"-->
router.push({ <!-- >-->
path: '/driving_inspections/safety_meeting/add', <!-- 删除-->
}) <!-- </el-button>-->
"
>
添加
</el-button>
<el-button
type="danger"
text
link
@click="deleteItem(row.DRIVING_LOG_ID)"
>
删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</layout-table> </layout-table>
</layout-card> </layout-card>
<edit
v-model:visible="data.analysisDialog.visible"
:info="data.analysisDialog.info"
@get-data="fnResetPagination"
/>
</div> </div>
</template> </template>
<script setup> <script setup>
import { serialNumber } from "@/assets/js/utils"; import { serialNumber } from "@/assets/js/utils.js";
import { useRouter } from "vue-router";
import useListData from "@/assets/js/useListData.js"; import useListData from "@/assets/js/useListData.js";
import { reactive } from "vue"; import { getSafetyDrivingLogList } from "@/request/traffic_driving_log.js";
import {
getSafetyDrivingLogList,
setDrivingLogDelete,
} from "@/request/traffic_driving_log.js";
import router from "@/router/index.js";
import { ElMessage, ElMessageBox } from "element-plus";
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } = const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getSafetyDrivingLogList); useListData(getSafetyDrivingLogList);
const data = reactive({
analysisDialog: { const fnResetPaginationTransfer = () => {
visible: false, fnResetPagination({
info: {}, TRANSPORTVEHICLE: searchForm.value.TRANSPORTVEHICLE,
}, CONFIRM_DEPARTMENT_ID: searchForm.value.CONFIRM_DEPARTMENT_ID,
}); WORK_START_DATE: searchForm.value.WORK_START_DATE,
// 删除事件
const deleteItem = async (value) => {
await ElMessageBox.confirm(`确定要删除吗？`, {
type: "warning",
}); });
await setDrivingLogDelete({ DRIVING_LOG_ID: value });
ElMessage.success("删除成功");
fnGetData();
}; };
</script> </script>
<style scoped></style> <style scoped></style>

10
src/views/driving_inspections/driving_type/index.vue
View File

@ -47,12 +47,10 @@
label="检查项名称" label="检查项名称"
width="330" width="330"
/> />
<el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="130" /> <el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="230" />
<el-table-column prop="REMARKS" label="检查项说明" width="230" /> <el-table-column prop="REMARKS" label="检查项说明" width="330" />
<el-table-column prop="CORP_NAME" label="经营企业" width="230" /> <el-table-column prop="CREATTIME" label="创建时间" width="230" />
<el-table-column prop="TRANSPORTVEHICLE" label="经营类型" width="230" /> <el-table-column prop="OPERATTIME" label="修改时间" width="230" />
<el-table-column prop="CREATTIME" label="创建时间" width="130" />
<el-table-column prop="OPERATTIME" label="修改时间" width="130" />
<el-table-column label="操作" > <el-table-column label="操作" >
<template #default="{ row }"> <template #default="{ row }">