wzh 3 лет назад
Родитель
Сommit
7d685404af
1 измененных файлов с 8 добавлено и 5 удалено
  1. 8 5
      src/views/voyage/voyageList.vue

+ 8 - 5
src/views/voyage/voyageList.vue

@@ -240,7 +240,11 @@
         sortable
         sortable
         min-width="100"
         min-width="100"
         align="center"
         align="center"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{ scope.row.arrived ? "已到港" : scope.row.expectedArrivalTime }}
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         prop="abnormalStatus"
         prop="abnormalStatus"
         label="航次状态"
         label="航次状态"
@@ -270,21 +274,20 @@
         min-width="70"
         min-width="70"
         align="center"
         align="center"
       ></el-table-column>
       ></el-table-column>
-
       <el-table-column
       <el-table-column
-        prop="tons"
+        prop="actualLoadTons"
         label="装载吨位"
         label="装载吨位"
         min-width="80"
         min-width="80"
         align="center"
         align="center"
       ></el-table-column>
       ></el-table-column>
       <el-table-column
       <el-table-column
-        prop="tons"
+        prop="unloadedtons"
         label="已卸货吨位"
         label="已卸货吨位"
         min-width="80"
         min-width="80"
         align="center"
         align="center"
       ></el-table-column>
       ></el-table-column>
       <el-table-column
       <el-table-column
-        prop="tons"
+        prop="remainTons"
         label="剩余吨位"
         label="剩余吨位"
         min-width="80"
         min-width="80"
         align="center"
         align="center"