From a0173318448eefacdbcfb579464990c7090af118 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Tue, 13 Jun 2023 08:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/modules/basicInfo.vue              |  4 +--
 .../list/modules/importBcMore.vue             | 35 ++++++++++++-------
 src/views/main/ContractnoList/index.vue       |  2 +-
 .../main/ContractnoList/modules/addFrom.vue   |  8 +++--
 .../main/ContractnoList/modules/initData.js   |  2 +-
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index c84dded..e62437d 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -164,7 +164,7 @@
                         :defaultVal="details.contractno"
                         :dropdownStyle="{ width: '300px' }"
                         searchApi="getContractno"
-                        :searchQuery="{ queryItem: '', top: 50, lanecname: this.details.lineName,carrier: this.details.carrierid,pod: this.details.destinationid }"
+                        :searchQuery="{ queryItem: '', top: 50, laneCName: this.details.lineName,carrier: this.details.carrierid,pod: this.details.destinationid }"
                         :showLabel="['contractNo']"
                         @select="getAutoViewRes"
                       ></autoView>
@@ -215,7 +215,7 @@
                         :defaultVal="details.contractno"
                         :dropdownStyle="{ width: '300px' }"
                         searchApi="getContractno"
-                        :searchQuery="{ queryItem: '', top: 50, lanecname: this.details.lineName,carrier: this.details.carrierid,pod: this.details.destinationid }"
+                        :searchQuery="{ queryItem: '', top: 50, laneCName: this.details.lineName,carrier: this.details.carrierid,pod: this.details.destinationid }"
                         :showLabel="['contractNo']"
                         @select="getAutoViewRes"
                       ></autoView>
diff --git a/src/views/main/BookingLedger/list/modules/importBcMore.vue b/src/views/main/BookingLedger/list/modules/importBcMore.vue
index 15d13ce..89da997 100644
--- a/src/views/main/BookingLedger/list/modules/importBcMore.vue
+++ b/src/views/main/BookingLedger/list/modules/importBcMore.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     title="BC引入编辑"
-    :width="1500"
+    :width="1700"
     :visible="visible"
     :confirmLoading="confirmLoading"
     :maskClosable="false"
@@ -11,7 +11,7 @@
       <a-spin :spinning="formLoading">
         <a-button type="primary" @click="handleSubimt">确认引入</a-button>
         <a-button style="margin-left: 20px;" type="primary" @click="handleCan(1)">取消</a-button>
-        <a-button style="margin-left: 570px;" type="primary" @click="handleCan(2)">取消</a-button>
+        <a-button style="margin-left: 670px;" type="primary" @click="handleCan(2)">取消</a-button>
         <a-button style="margin-left: 20px;" type="primary" @click="visible2 = true">引入</a-button>
         <div class="box">
           <div class="left">
@@ -25,8 +25,11 @@
                 <div v-if="row">{{ row }} <a-icon style="color: red;" type="close" @click="handleClose(index, 1)" /></div>
                 <a v-else @click="handleZD(1, index)">指定</a>
               </span>
+              <span slot="cutSingleTime" slot-scope="row,record">
+                {{ record.cutSingleTime?record.cutSingleTime.slice(0,13):'' }}
+              </span>
               <span slot="vessel" slot-scope="row,record">
-                {{ record.vessel }} / {{ record.voyNo }}
+                {{ record.vessel }}/{{ record.voyNo }}
               </span>
             </a-table>
           </div>
@@ -41,8 +44,11 @@
                 <div v-if="row">{{ row }}<a-icon style="color: red;" type="close" @click="handleClose(index, 2)" /></div>
                 <a v-else @click="handleZD(2, index)">指定</a>
               </span>
+              <span slot="cutSingleTime" slot-scope="row,record">
+                {{ record.cutSingleTime?record.cutSingleTime.slice(0,13):'' }}
+              </span>
               <span slot="vessel" slot-scope="row,record">
-                {{ record.vessel }} / {{ record.voyno }}
+                {{ record.vessel }}/{{ record.voyno }}
               </span>
             </a-table>
           </div>
@@ -60,7 +66,10 @@
             <a v-if="!record.bcIndx" @click="handleSelectRow(record)">选择</a>
           </span>
           <span slot="vessel" slot-scope="row,record">
-            {{ record.vessel }} / {{ record.voyNo }}
+            {{ record.vessel }}/{{ record.voyNo }}
+          </span>
+          <span slot="cutSingleTime" slot-scope="row,record">
+            {{ record.cutSingleTime?record.cutSingleTime.slice(0,13):'' }}
           </span>
           <span slot="operat" slot-scope="row">
             <div v-if="row">{{ row }} </div>
@@ -71,7 +80,7 @@
             <a v-if="!record.bkOrderIndx" @click="handleSelectRow(record)">选择</a>
           </span>
           <span slot="vessel" slot-scope="row,record">
-            {{ record.vessel }} / {{ record.voyNo }}
+            {{ record.vessel }}/{{ record.voyNo }}
           </span>
           <span slot="operat" slot-scope="row">
             <div v-if="row">{{ row }} </div>
@@ -184,18 +193,19 @@ export default {
           title: '船名航次',
           dataIndex: 'vessel',
           scopedSlots: { customRender: 'vessel' },
-          width: 150
+          width: 200
         },
         {
           title: '截单时间',
           dataIndex: 'cutSingleTime',
-          width: 130
+          scopedSlots: { customRender: 'cutSingleTime' },
+          width: 100
         },
         {
           title: '关联订舱',
           dataIndex: 'bkOrderIndx',
           scopedSlots: { customRender: 'operat' },
-          width: 80,
+          width: 70,
           align: 'center'
         }
       ],
@@ -214,18 +224,19 @@ export default {
           title: '船名航次',
           dataIndex: 'vessel',
           scopedSlots: { customRender: 'vessel' },
-          width: 150
+          width: 200
         },
         {
           title: '截单时间',
           dataIndex: 'cutSingleTime',
-          width: 130
+          scopedSlots: { customRender: 'cutSingleTime' },
+          width: 100
         },
         {
           title: '关联BC',
           dataIndex: 'bcIndx',
           scopedSlots: { customRender: 'operat' },
-          width: 80,
+          width: 70,
           align: 'center'
         }
       ],
diff --git a/src/views/main/ContractnoList/index.vue b/src/views/main/ContractnoList/index.vue
index ffaa38e..b3ae4c6 100644
--- a/src/views/main/ContractnoList/index.vue
+++ b/src/views/main/ContractnoList/index.vue
@@ -266,7 +266,7 @@ export default {
             contractNote: values.contractNote,
             carrierCode: values.carrierCode,
             podCode: values.podCode,
-            laneCode: values.laneCode
+            laneCName: values.laneCName
           }).then(res => {
             this.$refs.addForm.$data.confirmLoading = false
             if (res.success) {
diff --git a/src/views/main/ContractnoList/modules/addFrom.vue b/src/views/main/ContractnoList/modules/addFrom.vue
index 452559d..5775a4f 100644
--- a/src/views/main/ContractnoList/modules/addFrom.vue
+++ b/src/views/main/ContractnoList/modules/addFrom.vue
@@ -31,7 +31,7 @@
               <a-select
                 show-search
                 placeholder="请选择船公司"
-                v-decorator="['carrierCode']"
+                v-decorator="['carrierCode',{ rules: [{ required: true, message: '请选择船公司！' }] }]"
                 @search="CarrierHandleSearch"
                 :default-active-first-option="false"
                 :show-arrow="false"
@@ -53,6 +53,7 @@
                 :default-active-first-option="false"
                 :show-arrow="false"
                 :filter-option="false"
+                allowClear
                 :not-found-content="null">
                 <a-select-option v-for="item in CodeData" :key="item.code" :value="item.code">
                   {{ item.cnName }}
@@ -65,12 +66,13 @@
               <a-select
                 show-search
                 placeholder="请选择航线"
-                v-decorator="['laneCode']"
+                v-decorator="['laneCName']"
                 :default-active-first-option="false"
                 :show-arrow="false"
+                allowClear
                 :filter-option="filterOption"
                 :not-found-content="null">
-                <a-select-option v-for="(item,index) in lineList" :key="index" :value="item.code">
+                <a-select-option v-for="(item,index) in lineList" :key="index" :value="item.cnName">
                   {{ item.cnName }}
                 </a-select-option>
               </a-select>
diff --git a/src/views/main/ContractnoList/modules/initData.js b/src/views/main/ContractnoList/modules/initData.js
index 8c203ef..1a220a6 100644
--- a/src/views/main/ContractnoList/modules/initData.js
+++ b/src/views/main/ContractnoList/modules/initData.js
@@ -6,7 +6,7 @@ export default {
     { field: 'contractNote', title: '合约号备注', showHeaderOverflow: true, sortable: true },
     { field: 'carrierCode', title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'podCode', title: '目的港', showHeaderOverflow: true, sortable: true },
-    { field: 'laneCode', title: '航线', showHeaderOverflow: true, sortable: true },
+    { field: 'laneCName', title: '航线', showHeaderOverflow: true, sortable: true },
     { field: 'createUserName', title: '创建者名称', showHeaderOverflow: true, sortable: true },
     { field: 'createTime', title: '创建时间', showHeaderOverflow: true, sortable: true },
     { field: 'updateTime', title: '更新时间', showHeaderOverflow: true, sortable: true },