更新 模态框

src/views/voyage/voyageList.vue

@@ -79,7 +79,7 @@
         <el-button
           v-if="cacheList.length > 1"
           class="mr20"
-          @click="mergeVisable = true"
+          @click="showMergeModal()"
           size="medium"
           type="primary"
         >
@@ -532,7 +532,11 @@
         v-if="voyageNameVisable"
         min-width="140"
         align="center"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{ scope.row.voyageName }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="loadPort"
         label="装货港"
@@ -1280,6 +1284,10 @@ function clearMergeForm() {
   mergeForm.value = {};
 }
 
+function showMergeModal() {
+  mergeVisable.value = true;
+}
+
 onMounted(() => {
   getVoyageList(1);
   loginAccountId.value = localStorage.loginAccountId;