From e202a6cc9f29b08230ce681aa07e958a911aa361 Mon Sep 17 00:00:00 2001
From: liuxiaoxue <1126966868@qq.com>
Date: Wed, 4 Jan 2023 10:03:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E5=AF=B9=E9=BD=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/detail/modules/basicInfo.vue   | 5 ++++-
 src/views/main/BookingLedger/detail/modules/mailingInfo.vue | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 17955dc..20171d2 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -1431,7 +1431,7 @@ export default {
 
 .customer-box {
   display: flex;
-
+  margin-top: 2px;
   .customer-input {
     flex: 1;
   }
@@ -1461,6 +1461,9 @@ export default {
 /deep/ .date-box {
   padding-top: 7px !important;
 }
+.ant-input[type="text"]{
+  height: 28px !important;
+}
 
 // .ant-calendar-picker-input{
 //   padding: 0 4px;
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index 5e00a43..6ed0b5f 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -1832,6 +1832,7 @@ export default {
 }
 .sender-label{
   position: relative;
+  margin-bottom: 0px !important;
   /deep/ .ant-form-item-children-icon{
     position: absolute;
     top: calc(100% + 15px);
@@ -1844,9 +1845,10 @@ export default {
 }
 .yard-box {
   position: relative;
+  margin-top: 5px;
   i {
     color: @primary-color;
-    margin-top: -3px !important;
+    margin-top: -5px !important;
     cursor: pointer;
   }
 }
@@ -1881,6 +1883,7 @@ export default {
 
 .line-box {
   display: flex;
+  margin-top: 6px;
   span.unit {
     font-size: 12px;
     color: #999;

From cee8dd4b611c5004f08f139b1244d78b18807eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 4 Jan 2023 11:11:49 +0800
Subject: [PATCH 2/2] 1/4

---
 src/api/modular/main/TenantConfig.js     |  36 +++++---
 src/api/modular/main/vesselinfo.js       |  12 +++
 src/views/main/EDI/addForm.vue           |   6 +-
 src/views/main/TenantConfig/addForm.vue  |   4 +-
 src/views/main/TenantConfig/editForm.vue |  45 +--------
 src/views/main/TenantConfig/index.vue    |  11 +--
 src/views/main/vesselinfo/addForm.vue    | 113 +++++++++++++----------
 src/views/main/vesselinfo/editForm.vue   | 110 ++++++++++++----------
 src/views/main/vesselinfo/index.vue      |  10 +-
 9 files changed, 177 insertions(+), 170 deletions(-)

diff --git a/src/api/modular/main/TenantConfig.js b/src/api/modular/main/TenantConfig.js
index 08fe1ce..5e74f24 100644
--- a/src/api/modular/main/TenantConfig.js
+++ b/src/api/modular/main/TenantConfig.js
@@ -11,15 +11,35 @@ export function DjyTenantConfigPage(parameter) {
   })
 }
 /**
- * 新增编辑
+ * 新增
  */
-export function DjyVesselInfoServiceAddOrUpdate(parameter) {
+export function DjyTenantConfigAdd(parameter) {
   return axios({
-    url: '/DjyVesselInfoService/AddOrUpdate',
+    url: '/DjyTenantConfig/add',
     method: 'post',
     data: parameter
   })
 }
+/**
+ * 编辑
+ */
+export function DjyTenantConfigEdit(parameter) {
+  return axios({
+    url: '/DjyTenantConfig/edit',
+    method: 'post',
+    data: parameter
+  })
+}
+/**
+ * 删除
+ */
+export function DjyTenantConfigDelete(parameter) {
+  return axios({
+    url: '/DjyTenantConfig/delete',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 分页查询租户
  */
@@ -95,13 +115,3 @@ export function BookingPrintTemplateGetPrintTemplateList(parameter) {
     params: { PageNo: 1, PageSize: 999 }
   })
 }
-/**
- * 删除打印模板权限
- */
-export function BookingPrintTemplateDeletePrinttemplateRight(parameter) {
-  return axios({
-    url: '/BookingPrintTemplate/DeletePrinttemplateRight',
-    method: 'get',
-    params: parameter
-  })
-}
diff --git a/src/api/modular/main/vesselinfo.js b/src/api/modular/main/vesselinfo.js
index 869568a..1908b62 100644
--- a/src/api/modular/main/vesselinfo.js
+++ b/src/api/modular/main/vesselinfo.js
@@ -65,6 +65,18 @@ export function GetCarrierlist(parameter) {
     params: parameter
   })
 }
+/**
+ * 获取船名
+ * @params CnName
+ */
+export function GetVessellist(parameter) {
+  return axios({
+    url: '/commondb/vessellist',
+    method: 'get',
+    params: parameter
+  })
+}
+
 /**
  * 分页查询用户
  */
diff --git a/src/views/main/EDI/addForm.vue b/src/views/main/EDI/addForm.vue
index 8be95ef..c0f9b5a 100644
--- a/src/views/main/EDI/addForm.vue
+++ b/src/views/main/EDI/addForm.vue
@@ -16,9 +16,9 @@
                 placeholder="请选择EDI类型"
                 v-decorator="['edicode', { rules: [{ required: true, message: '请输入EDI类型！' }] }]"
               >
-                <a-select-option v-for="item in EdiNameData" :key="item.id" :value="item.code">{{
-                  item.name
-                }}</a-select-option>
+                <a-select-option v-for="item in EdiNameData" :key="item.id" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
diff --git a/src/views/main/TenantConfig/addForm.vue b/src/views/main/TenantConfig/addForm.vue
index 1f44701..f92d148 100644
--- a/src/views/main/TenantConfig/addForm.vue
+++ b/src/views/main/TenantConfig/addForm.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { DjyVesselInfoServiceAddOrUpdate } from '@/api/modular/main/TenantConfig'
+import { DjyTenantConfigAdd } from '@/api/modular/main/TenantConfig'
 import Data from './Data.json'
 export default {
   data() {
@@ -101,7 +101,7 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
-          DjyVesselInfoServiceAddOrUpdate(values)
+          DjyTenantConfigAdd(values)
             .then(res => {
               if (res.success) {
                 this.$message.success('新增成功')
diff --git a/src/views/main/TenantConfig/editForm.vue b/src/views/main/TenantConfig/editForm.vue
index 16991ba..168e24c 100644
--- a/src/views/main/TenantConfig/editForm.vue
+++ b/src/views/main/TenantConfig/editForm.vue
@@ -16,8 +16,6 @@
                 placeholder="请选择租户"
                 v-decorator="['tenantId', { rules: [{ required: true, message: '请选择租户！' }] }]"
                 show-search
-                @focus="tenantSearch"
-                @search="tenantSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
@@ -51,8 +49,6 @@
                 placeholder="请选择装货港"
                 v-decorator="['portLoadingId', { rules: [{ required: true, message: '请选择装货港！' }] }]"
                 show-search
-                @focus="portLoadingSearch"
-                @search="portLoadingSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
@@ -70,8 +66,6 @@
                 placeholder="请选择中转港"
                 v-decorator="['portTransitId', { rules: [{ required: true, message: '请选择中转港！' }] }]"
                 show-search
-                @focus="portTransitSearch"
-                @search="portTransitSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
@@ -89,8 +83,6 @@
                 placeholder="请选择卸货港"
                 v-decorator="['portDischargeId', { rules: [{ required: true, message: '请选择卸货港！' }] }]"
                 show-search
-                @focus="portDischargeSearch"
-                @search="portDischargeSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
@@ -160,8 +152,6 @@
                 placeholder="请选择船公司"
                 v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
                 show-search
-                @focus="carrierSearch"
-                @search="carrierSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
@@ -188,13 +178,7 @@
 </template>
 
 <script>
-import {
-  DjyVesselInfoServiceAddOrUpdate,
-  SysTenantPage,
-  GetPortloadlist,
-  GetPortlist,
-  GetCarrierlist
-} from '@/api/modular/main/TenantConfig'
+import { DjyTenantConfigEdit } from '@/api/modular/main/TenantConfig'
 export default {
   data() {
     return {
@@ -251,31 +235,6 @@ export default {
         console.log(this.form.getFieldsValue())
       }, 100)
     },
-    tenantSearch(data) {
-      SysTenantPage({ Name: data }).then(res => {
-        this.tenantData = res.data.rows
-      })
-    },
-    portLoadingSearch(data) {
-      GetPortloadlist({ KeyWord: data }).then(res => {
-        this.portLoadingData = res.data
-      })
-    },
-    portTransitSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
-        this.portTransitData = res.data
-      })
-    },
-    portDischargeSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
-        this.portDischargeData = res.data
-      })
-    },
-    carrierSearch(data) {
-      GetCarrierlist({ KeyWord: data }).then(res => {
-        this.carrierData = res.data
-      })
-    },
     handleSubmit() {
       const {
         form: { validateFields }
@@ -293,7 +252,7 @@ export default {
           console.log(this.form, values.gid)
           values.id = this.data.id
           console.log(values)
-          DjyVesselInfoServiceAddOrUpdate(values)
+          DjyTenantConfigEdit(values)
             .then(res => {
               if (res.success) {
                 this.$message.success('编辑成功')
diff --git a/src/views/main/TenantConfig/index.vue b/src/views/main/TenantConfig/index.vue
index b9dfff6..6dac919 100644
--- a/src/views/main/TenantConfig/index.vue
+++ b/src/views/main/TenantConfig/index.vue
@@ -62,11 +62,7 @@
   </div>
 </template>
 <script>
-import {
-  DjyTenantConfigPage,
-  BookingPrintTemplateDeletePrinttemplateRight,
-  SysUserPage
-} from '@/api/modular/main/TenantConfig'
+import { DjyTenantConfigPage, DjyTenantConfigDelete } from '@/api/modular/main/TenantConfig'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -119,7 +115,7 @@ export default {
       this.FnDel(e)
     },
     FnDel(data) {
-      BookingPrintTemplateDeletePrinttemplateRight({ Ids: data.id }).then(res => {
+      DjyTenantConfigDelete({ Ids: data.id }).then(res => {
         this.$message.success('删除成功')
         this.FnGetData()
       })
@@ -131,9 +127,6 @@ export default {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()
-      SysUserPage().then(res => {
-        this.UserList = res.data.rows
-      })
     },
     FnGetData() {
       this.loading = true
diff --git a/src/views/main/vesselinfo/addForm.vue b/src/views/main/vesselinfo/addForm.vue
index 07510e0..3bf6fd0 100644
--- a/src/views/main/vesselinfo/addForm.vue
+++ b/src/views/main/vesselinfo/addForm.vue
@@ -10,7 +10,7 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="租户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-select
                 placeholder="请选择租户"
@@ -28,12 +28,50 @@
                 </a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="船名" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-select
+                placeholder="请选择船名"
+                v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]"
+                show-search
+                @focus="vesselSearch"
+                @search="vesselSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in vesselData" :key="item.name" :value="item.name">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-select
+                placeholder="请选择船公司"
+                v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
+                show-search
+                @focus="carrierSearch"
+                @search="carrierSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in carrierData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input
-                placeholder="请输入船名"
-                v-decorator="['vessel', { rules: [{ required: true, message: '请输入船名！' }] }]"
+                placeholder="请输入内部航次"
+                v-decorator="['voynoInside', { rules: [{ required: true, message: '请输入内部航次！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -105,21 +143,20 @@
           <a-col :span="12">
             <a-form-item label="开船日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
-                show-time
                 :style="{ width: '100%' }"
                 placeholder="请选择开船日期"
                 v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
+                valueFormat="YYYY-MM-DD"
               />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="截港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="截港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择截港日期"
-                v-decorator="['closingDate', { rules: [{ required: true, message: '请选择截港日期！' }] }]"
+                placeholder="请选择截港时间"
+                v-decorator="['closingDate', { rules: [{ required: true, message: '请选择截港时间！' }] }]"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />
             </a-form-item>
@@ -127,7 +164,6 @@
           <a-col :span="12">
             <a-form-item label="预抵日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
-                show-time
                 :style="{ width: '100%' }"
                 placeholder="请选择预抵日期"
                 v-decorator="['eta', { rules: [{ required: true, message: '请选择预抵日期！' }] }]"
@@ -144,43 +180,16 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港日期"
-                v-decorator="['atd', { rules: [{ required: true, message: '请选择实际离港日期！' }] }]"
+                placeholder="请选择实际离港时间"
+                v-decorator="['atd', { rules: [{ required: true, message: '请选择实际离港时间！' }] }]"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择船公司"
-                v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
-                show-search
-                @focus="carrierSearch"
-                @search="carrierSearch"
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in carrierData" :key="item.code" :value="item.code">
-                  {{ item.cnName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入内部航次"
-                v-decorator="['voynoInside', { rules: [{ required: true, message: '请输入内部航次！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
         </a-row>
       </a-form>
     </a-spin>
@@ -193,7 +202,8 @@ import {
   SysTenantPage,
   GetPortloadlist,
   GetPortlist,
-  GetCarrierlist
+  GetCarrierlist,
+  GetVessellist
 } from '@/api/modular/main/vesselinfo'
 export default {
   data() {
@@ -218,11 +228,12 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
-      tenantData: [],
+      // tenantData: [],
       portLoadingData: [],
       portTransitData: [],
       portDischargeData: [],
-      carrierData: []
+      carrierData: [],
+      vesselData: []
     }
   },
   mounted() {},
@@ -231,11 +242,11 @@ export default {
     add(record) {
       this.visible = true
     },
-    tenantSearch(data) {
-      SysTenantPage({ Name: data }).then(res => {
-        this.tenantData = res.data.rows
-      })
-    },
+    // tenantSearch(data) {
+    //   SysTenantPage({ Name: data }).then(res => {
+    //     this.tenantData = res.data.rows
+    //   })
+    // },
     portLoadingSearch(data) {
       GetPortloadlist({ KeyWord: data }).then(res => {
         this.portLoadingData = res.data
@@ -256,6 +267,12 @@ export default {
         this.carrierData = res.data
       })
     },
+    vesselSearch(data) {
+      GetVessellist({ KeyWord: data }).then(res => {
+        this.vesselData = res.data
+      })
+    },
+
     /**
      * 提交表单
      */
diff --git a/src/views/main/vesselinfo/editForm.vue b/src/views/main/vesselinfo/editForm.vue
index 7a13143..6ea99bf 100644
--- a/src/views/main/vesselinfo/editForm.vue
+++ b/src/views/main/vesselinfo/editForm.vue
@@ -10,7 +10,7 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="租户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-select
                 placeholder="请选择租户"
@@ -28,12 +28,50 @@
                 </a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="船名" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-select
+                placeholder="请选择船名"
+                v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]"
+                show-search
+                @focus="vesselSearch"
+                @search="vesselSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in vesselData" :key="item.name" :value="item.name">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-select
+                placeholder="请选择船公司"
+                v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
+                show-search
+                @focus="carrierSearch"
+                @search="carrierSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in carrierData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input
-                placeholder="请输入船名"
-                v-decorator="['vessel', { rules: [{ required: true, message: '请输入船名！' }] }]"
+                placeholder="请输入内部航次"
+                v-decorator="['voynoInside', { rules: [{ required: true, message: '请输入内部航次！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -105,7 +143,6 @@
           <a-col :span="12">
             <a-form-item label="开船日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
-                show-time
                 :style="{ width: '100%' }"
                 placeholder="请选择开船日期"
                 v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
@@ -114,12 +151,12 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="截港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="截港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择截港日期"
-                v-decorator="['closingDate', { rules: [{ required: true, message: '请选择截港日期！' }] }]"
+                placeholder="请选择截港时间"
+                v-decorator="['closingDate', { rules: [{ required: true, message: '请选择截港时间！' }] }]"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />
             </a-form-item>
@@ -127,7 +164,6 @@
           <a-col :span="12">
             <a-form-item label="预抵日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
-                show-time
                 :style="{ width: '100%' }"
                 placeholder="请选择预抵日期"
                 v-decorator="['eta', { rules: [{ required: true, message: '请选择预抵日期！' }] }]"
@@ -144,43 +180,16 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港日期"
-                v-decorator="['atd', { rules: [{ required: true, message: '请选择实际离港日期！' }] }]"
+                placeholder="请选择实际离港时间"
+                v-decorator="['atd', { rules: [{ required: true, message: '请选择实际离港时间！' }] }]"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择船公司"
-                v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
-                show-search
-                @focus="carrierSearch"
-                @search="carrierSearch"
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in carrierData" :key="item.code" :value="item.code">
-                  {{ item.cnName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入内部航次"
-                v-decorator="['voynoInside', { rules: [{ required: true, message: '请输入内部航次！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
         </a-row>
       </a-form>
     </a-spin>
@@ -193,7 +202,8 @@ import {
   SysTenantPage,
   GetPortloadlist,
   GetPortlist,
-  GetCarrierlist
+  GetCarrierlist,
+  GetVessellist
 } from '@/api/modular/main/vesselinfo'
 export default {
   data() {
@@ -218,11 +228,12 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
-      tenantData: [],
+      // tenantData: [],
       portLoadingData: [],
       portTransitData: [],
       portDischargeData: [],
-      carrierData: []
+      carrierData: [],
+      vesselData: []
     }
   },
   mounted() {},
@@ -254,11 +265,11 @@ export default {
         console.log(this.form.getFieldsValue())
       }, 100)
     },
-    tenantSearch(data) {
-      SysTenantPage({ Name: data }).then(res => {
-        this.tenantData = res.data.rows
-      })
-    },
+    // tenantSearch(data) {
+    //   SysTenantPage({ Name: data }).then(res => {
+    //     this.tenantData = res.data.rows
+    //   })
+    // },
     portLoadingSearch(data) {
       GetPortloadlist({ KeyWord: data }).then(res => {
         this.portLoadingData = res.data
@@ -279,6 +290,11 @@ export default {
         this.carrierData = res.data
       })
     },
+    vesselSearch(data) {
+      GetVessellist({ KeyWord: data }).then(res => {
+        this.vesselData = res.data
+      })
+    },
     handleSubmit() {
       const {
         form: { validateFields }
diff --git a/src/views/main/vesselinfo/index.vue b/src/views/main/vesselinfo/index.vue
index 352b20b..bdef55e 100644
--- a/src/views/main/vesselinfo/index.vue
+++ b/src/views/main/vesselinfo/index.vue
@@ -85,11 +85,11 @@ export default {
       },
       ColumnsQuery: [],
       columns: [
-        {
-          title: '租户Id',
-          align: 'center',
-          dataIndex: 'tenantId'
-        },
+        // {
+        //   title: '租户Id',
+        //   align: 'center',
+        //   dataIndex: 'tenantId'
+        // },
         {
           title: '船名',
           align: 'center',