更新 航次列表样式

src/views/voyage/voyageList.vue

@@ -534,7 +534,8 @@
         align="center"
       >
         <template v-slot="scope">
-          {{ scope.row.voyageName }}
+          {{ scope.row.voyageName
+          }}{{ `${scope.row.contractNum ? " - 已合并" : ""}` }}
         </template>
       </el-table-column>
       <el-table-column
@@ -1285,7 +1286,22 @@ function clearMergeForm() {
 }
 
 function showMergeModal() {
-  mergeVisable.value = true;
+  let arr = [];
+  for (let i of cacheList.value) {
+    if (!i.contractNum) {
+      arr.push(i);
+    }
+  }
+
+  if (arr.length > 1) {
+    cacheList.value = arr;
+    mergeVisable.value = true;
+  } else {
+    ElNotification({
+      title: "列表包含已合并航次",
+      type: "info",
+    });
+  }
 }
 
 onMounted(() => {