xuqiuyun/cattleTransportation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

基本完成，修复细节

Browse Source
This commit is contained in:
xuqiuyun
2025-10-29 17:33:32 +08:00
parent 6c86963418
commit d1d0b62184
37 changed files with 5133 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
pc-cattle-transportation/src/views/entry/details.vue
View File

@@ -20,9 +20,9 @@
<div class="title">基础信息</div>
<el-descriptions :column="4">
<el-descriptions-item label="运单号:">{{ data.baseInfo.deliveryNumber || '-' }}</el-descriptions-item>
<el-descriptions-item label="订单标题:">{{ data.baseInfo.deliveryTitle || '-' }}</el-descriptions-item>
<el-descriptions-item label="资金方:">{{ data.baseInfo.fundName || '-' }}</el-descriptions-item>
<el-descriptions-item label="采购商:">{{ data.baseInfo.buyerName || '-' }}</el-descriptions-item>
<el-descriptions-item label="卖方:">{{ data.baseInfo.supplierName || '-' }}</el-descriptions-item>
<el-descriptions-item label="买方:">{{ data.baseInfo.buyerName || '-' }}</el-descriptions-item>
<el-descriptions-item label="车牌号:">{{ data.baseInfo.licensePlate || '-' }}</el-descriptions-item>
<el-descriptions-item label="司机姓名:">{{ data.baseInfo.driverName || '-' }}</el-descriptions-item>
<el-descriptions-item label="起始地:">{{ data.baseInfo.startLocation || '-' }}</el-descriptions-item>
@@ -166,6 +166,32 @@
</span>
</el-descriptions-item>
<!-- 到地相关照片 -->
<el-descriptions-item label="到地纸质磅单:">
<span style="vertical-align: top">
<el-image
v-if="data.baseInfo.destinationPoundListImg"
style="width: 50px; height: 50px; margin-right: 10px"
:src="data.baseInfo.destinationPoundListImg ? data.baseInfo.destinationPoundListImg : ''"
fit="cover"
:preview-src-list="[data.baseInfo.destinationPoundListImg] ? [data.baseInfo.destinationPoundListImg] : []"
preview-teleported
/>
</span>
</el-descriptions-item>
<el-descriptions-item label="到地车辆过重磅车头照片:">
<span style="vertical-align: top">
<el-image
v-if="data.baseInfo.destinationVehicleFrontPhoto"
style="width: 50px; height: 50px; margin-right: 10px"
:src="data.baseInfo.destinationVehicleFrontPhoto ? data.baseInfo.destinationVehicleFrontPhoto : ''"
fit="cover"
:preview-src-list="[data.baseInfo.destinationVehicleFrontPhoto] ? [data.baseInfo.destinationVehicleFrontPhoto] : []"
preview-teleported
/>
</span>
</el-descriptions-item>
<!-- 视频上传区域 -->
<el-descriptions-item label="空车过磅视频（含车牌、地磅数）:">
<span style="vertical-align: top" v-if="data.baseInfo.emptyWeightVideo">
@@ -212,6 +238,24 @@
/>
</span>
</el-descriptions-item>
<el-descriptions-item label="卸牛视频:">
<span style="vertical-align: top" v-if="data.baseInfo.unloadCattleVideo">
<video
style="height: 250px; width: auto; border-radius: 5px; margin-left: 60px"
controls
:src="data.baseInfo.unloadCattleVideo"
/>
</span>
</el-descriptions-item>
<el-descriptions-item label="到地过磅视频:">
<span style="vertical-align: top" v-if="data.baseInfo.destinationWeightVideo">
<video
style="height: 250px; width: auto; border-radius: 5px; margin-left: 60px"
controls
:src="data.baseInfo.destinationWeightVideo"
/>
</span>
</el-descriptions-item>
</el-descriptions>
</div>
<div class="ear-box">
@@ -494,6 +538,7 @@ import { ref, reactive, onMounted, computed } from 'vue';
import { useRoute } from 'vue-router';
import { ElMessage } from 'element-plus';
import { earList, hostLocation, hostTrack, waybillDetail, collarList, collarLogList, earLogList, testDeliveryDevices, pageDeviceList, getEarTagLogs, getCollarLogs, getHostLogs, getEarTagTrajectory, getCollarTrajectory, getHostTrajectory } from '@/api/abroad.js';
import { vehicleList } from '@/api/userManage.js';
import startIcon from '../../assets/images/qi.png';
import endIcon from '../../assets/images/zhong.png';
import TrackDialog from '../hardware/trackDialog.vue';
@@ -525,6 +570,12 @@ const data = reactive({
quarStatusDesc: '入场状态', // 根据status反显
status: '订单状态 1境外预检 2 已入境待隔离（检疫成功） 3 已入隔离场 4 隔离场出场 ',
deliverTime: '启运时间',
// 新增照片字段
destinationPoundListImg: '',
destinationVehicleFrontPhoto: '',
// 新增视频字段
unloadCattleVideo: '',
destinationWeightVideo: '',
},
warnInfo: [],
serverIds: '',
@@ -609,6 +660,11 @@ const getDetail = () => {
driverId: data.baseInfo.driverId
});
// 查询车辆照片
if (data.baseInfo.licensePlate) {
loadVehiclePhotos();
}
// 使用新的统一API获取智能主机信息
getHostDeviceInfo();
} else {
@@ -618,6 +674,16 @@ const getDetail = () => {
.catch(() => {});
};
// 查询车辆照片（从司机信息获取）
const loadVehiclePhotos = () => {
// 后端已经从delivery/driver信息中获取了车身照片，无需额外前端查询
// carFrontPhoto和carBehindPhoto应该已经由后端的DeliveryServiceImpl填充
console.log('车身照片信息:', {
carFrontPhoto: data.baseInfo.carFrontPhoto,
carBehindPhoto: data.baseInfo.carBehindPhoto
});
};
// 智能主机列表查询
const getHostList = () => {
if (!route.query.id) {
@@ -1107,13 +1173,9 @@ const totalRegisteredDevices = computed(() => {
const getStatusText = (status) => {
const statusMap = {
1: '待装车',
2: '已装车/预付款已支付',
3: '已装车/尾款待支付',
4: '已核验/待买家付款',
5: '尾款已付款',
6: '发票待开/进项票',
7: '发票待开/销项'
1: '准备中',
2: '运输中',
3: '已结束'
};
return statusMap[status] || '未知状态';
};
@@ -1121,13 +1183,9 @@ const getStatusText = (status) => {
// 根据状态返回标签类型（颜色）
const getStatusType = (status) => {
const typeMap = {
1: 'info', // 待装车 - 灰色
2: 'success', // 已装车/预付款已支付 - 绿色
3: 'warning', // 已装车/尾款待支付 - 橙色
4: 'warning', // 已核验/待买家付款 - 橙色
5: 'success', // 尾款已付款 - 绿色
6: 'primary', // 发票待开/进项票 - 蓝色
7: 'primary' // 发票待开/销项 - 蓝色
1: 'info', // 准备中 - 灰色
2: 'warning', // 运输中 - 橙色
3: 'success' // 已结束 - 绿色
};
return typeMap[status] || 'info';
};