Forráskód Böngészése

更新 列表字段;样式

wzh 3 éve
szülő
commit
adfc1ef8fc
2 módosított fájl, 53 hozzáadás és 30 törlés
  1. 47 24
      src/views/shipManage/shipDetail.vue
  2. 6 6
      src/views/shipManage/shipList.vue

+ 47 - 24
src/views/shipManage/shipDetail.vue

@@ -258,69 +258,92 @@
       </template>
     </el-dialog>
     <el-table :data="tableData" stripe style="width: 100%; margin-top: 24px">
-      <el-table-column
-        type="index"
-        label="序号"
-        min-width="80"
-        align="center"
-      ></el-table-column>
       <el-table-column
         prop="voyageName"
         label="航次名称"
-        min-width="120"
+        min-width="140"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="loadPort"
         label="装货港"
-        min-width="100"
+        min-width="90"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="dischargePort"
         label="卸货港"
-        min-width="100"
+        min-width="80"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="setSailTime"
-        label="开航时间"
+        prop="expectedArrivalTime"
+        label="预计到港时间"
+        sortable
+        min-width="140"
+        align="center"
+      >
+        <template v-slot="scope">
+          {{ scope.row.arrived ? "已到港" : scope.row.expectedArrivalTime }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="abnormalStatus"
+        label="航次状态"
+        min-width="80"
+        align="center"
+      >
+        <template v-slot="scope">
+          {{ scope.row.abnormalStatus == 0 ? "正常" : "异常" }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="daysInPortStr"
+        label="在港天数"
+        sortable
         min-width="100"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="todayPhotoCount"
         label="今日照片"
-        min-width="80"
+        min-width="70"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="cargo"
         label="货种"
-        min-width="80"
+        min-width="70"
         align="center"
       ></el-table-column>
-
       <el-table-column
-        prop="tons"
-        label="吨位(吨)"
+        prop="actualLoadTons"
+        label="装载吨位"
         min-width="80"
         align="center"
       ></el-table-column>
-
       <el-table-column
-        prop="transStatus"
-        label="船舶状态"
-        min-width="100"
+        prop="unloadedtons"
+        label="已卸货吨位"
+        min-width="80"
         align="center"
       ></el-table-column>
-
       <el-table-column
-        prop="remark"
-        label="备注"
-        min-width="100"
+        prop="remainTons"
+        label="剩余吨位"
+        min-width="80"
         align="center"
       ></el-table-column>
+      <el-table-column
+        prop="hasInsurance"
+        label="保险状态"
+        min-width="70"
+        align="center"
+      >
+        <template v-slot="scope">
+          {{ scope.row.hasInsurance == 0 ? "未购买" : "已购买" }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" min-width="80" align="center">
         <template v-slot="scope">
           <el-button

+ 6 - 6
src/views/shipManage/shipList.vue

@@ -23,37 +23,37 @@
         <el-table-column
           prop="shipname"
           label="船舶名称"
-          min-width="120"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="mmsi"
           label="MMSI"
-          min-width="160"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="length"
           label="船长(米)"
-          min-width="120"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="breadth"
           label="船宽(米)"
-          min-width="160"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="draught"
           label="吃水(米)"
-          min-width="120"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="loadTons"
           label="载货吨位(吨)"
-          min-width="160"
+          min-width="100"
           align="center"
         ></el-table-column>
         <el-table-column