Merge branch 'ljj_dev' into dev

src/views/operation/seaexport/columns.tsx

@@ -1181,21 +1181,6 @@ export const columns: BasicColumn[] = [
       return RData
     },
   },
-  {
-    dataIndex: 'vessel2N',
-    title: '船名',
-    sorter: true,
-    width: 150,
-    customRender: ({ record }) => {
-      let RData = ''
-      // ListData.vessel.forEach((item) => {
-      //   if (item.value == record.vessel2N) {
-      //     RData = item.label
-      //   }
-      // })
-      return RData
-    },
-  },
   {
     title: '二程航次',
     dataIndex: 'voyno2N',

src/views/operation/seaexport/detail/index.vue

@@ -329,6 +329,7 @@
         if (!res.data.ctnPriceInfo.length) {
           res.data.ctnPriceInfo = [{}]
         }
+        bookingDetails.value = res.data
         appStore.settopDown(false)
         inPageLoading.value = false
         // 解决 业务来源 联动问题