|
|
@@ -41,46 +41,46 @@
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="userName"
|
|
|
+ prop="voyageName"
|
|
|
label="航次名称"
|
|
|
min-width="120"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="contactName"
|
|
|
+ prop="loadDiscPort"
|
|
|
label="装货港-卸货港"
|
|
|
- min-width="120"
|
|
|
+ min-width="260"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="开始时间-结束时间"
|
|
|
- label="联系人手机号"
|
|
|
- min-width="160"
|
|
|
+ prop="startEndTime"
|
|
|
+ label="开始时间-结束时间"
|
|
|
+ min-width="200"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="createTime"
|
|
|
+ prop="cargo"
|
|
|
label="货种"
|
|
|
- min-width="200"
|
|
|
+ min-width="100"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="createTime"
|
|
|
+ prop="tons"
|
|
|
label="吨位(吨)"
|
|
|
- min-width="200"
|
|
|
+ min-width="60"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="createTime"
|
|
|
+ prop="transStatus"
|
|
|
label="船舶状态"
|
|
|
- min-width="200"
|
|
|
+ min-width="100"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="createTime"
|
|
|
+ prop="remark"
|
|
|
label="备注"
|
|
|
min-width="200"
|
|
|
align="center"
|
|
|
@@ -88,7 +88,7 @@
|
|
|
<el-table-column label="操作" min-width="80" align="center">
|
|
|
<template v-slot="scope">
|
|
|
<el-button
|
|
|
- @click="voyageDetail(scope.row, tableData)"
|
|
|
+ @click="voyageDetail(scope.row.id, tableData)"
|
|
|
type="text"
|
|
|
size="small"
|
|
|
>
|
|
|
@@ -134,6 +134,10 @@ export default {
|
|
|
size: 10,
|
|
|
});
|
|
|
|
|
|
+ if (res.data.status == 0) {
|
|
|
+ tableData.value = res.data.result;
|
|
|
+ }
|
|
|
+
|
|
|
console.log(res);
|
|
|
}
|
|
|
function changeVoyageType(s) {
|
|
|
@@ -142,8 +146,9 @@ export default {
|
|
|
getVoyageList();
|
|
|
}
|
|
|
async function voyageDetail(id) {
|
|
|
+ console.log(id);
|
|
|
router.push({
|
|
|
- path: "/voyageManage/voyageDetail",
|
|
|
+ path: "/voyage/voyageDetail",
|
|
|
query: {
|
|
|
id,
|
|
|
},
|
|
|
@@ -159,6 +164,7 @@ export default {
|
|
|
path: "/voyage/voyageAdd",
|
|
|
});
|
|
|
}
|
|
|
+ getVoyageList();
|
|
|
onMounted(() => {});
|
|
|
return {
|
|
|
currentPage,
|