From 5289a02eab282455bacb7b8a37179279a95ae5ce Mon Sep 17 00:00:00 2001
From: lilu <lilu@myshipping.net>
Date: Tue, 28 Mar 2023 09:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=90=8D=EF=BC=8Ced?=
 =?UTF-8?q?i=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E6=94=BE=E8=88=B1?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/components/selectView.vue          | 19 ++++++-
 src/views/main/BookingLedger/detail/index.vue | 12 ++--
 .../detail/modules/cargoInfo.vue              |  3 +-
 .../BookingLedger/detail/modules/ediMore.vue  | 57 ++++++++++++++-----
 .../detail/modules/operationArea.vue          |  4 +-
 5 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue
index 471b230..de1f761 100644
--- a/src/views/main/BookingLedger/detail/components/selectView.vue
+++ b/src/views/main/BookingLedger/detail/components/selectView.vue
@@ -295,6 +295,23 @@ export default {
               code: 'TEN'
             }
           ]
+        case 'masterBolIndicator':
+          return [
+            { ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' },
+            { ID: '2', NAME: 'Self filing HBL | 自己发' },
+            { ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' }
+          ]
+        case 'salerCode':
+          return [
+            { ID: 'CN087', NAME: 'CN087 | GRACE SUN' },
+            { ID: 'CN096', NAME: 'CN096 | LEON LIANG' },
+            { ID: 'CN097', NAME: 'CN097 | CHARLES GAO' },
+            { ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' },
+            { ID: 'CN106', NAME: 'CN106 | HOKI YU' },
+            { ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' },
+            { ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' },
+            { ID: 'CN100', NAME: 'CN100 | LEOREN' }
+          ]
         case 'yard':
           return this.yardList
         case 'kindpkgs':
@@ -360,7 +377,7 @@ export default {
         this.$refs.selectView.$refs.vcSelect.focus()
       }
       this.open = true
-      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'lineName'].includes(this.type)) {
+      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'lineName', 'masterBolIndicator', 'salerCode'].includes(this.type)) {
         this.selectList = this.emnuData(this.type)
         this.inLoading = false
         return false
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 0cb59b6..01a9256 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -311,9 +311,11 @@ const initDetail = {
     consigneeEdiCode: '',
     shipperEdiCode: '',
     notifyCdoe: '',
-    salerCode: '',
+    salerCode: 'CN087',
+    salerCodeName: 'GRACE SUN',
     emanifestHbl: '',
-    masterBolIndicator: '',
+    masterBolIndicator: '3',
+    masterBolIndicatorName: 'Not Applicable/Straight bl | 无HBL',
     s0CC0C: '',
     ckhi: '',
     cncm: '',
@@ -352,9 +354,11 @@ const bookingEDIExt = {
     consigneeEdiCode: '',
     shipperEdiCode: '',
     notifyCdoe: '',
-    salerCode: '',
+    salerCode: 'CN087',
+    salerCodeName: 'GRACE SUN',
     emanifestHbl: '',
-    masterBolIndicator: '',
+    masterBolIndicator: '3',
+    masterBolIndicatorName: 'Not Applicable/Straight bl | 无HBL',
     s0CC0C: '',
     ckhi: '',
     cncm: '',
diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
index dc9fd06..d8db7a2 100644
--- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
@@ -44,12 +44,13 @@
                   <div class="title" :class="{'required':rules['description'] && rules['description'][0].required}" >Description of Goods (包装种类与货名)</div>
                   <a-form-model-item has-feedback prop="goodsname" label="" :class="{'goods-name-box':rules['goodsname'] && rules['goodsname'][0].required}">
                     <i class="icon required goods-required" v-if="rules['goodsname'] && rules['goodsname'][0].required"></i>
+                    <!-- :showLabel="['goodsNameEN', 'goodsCode']" -->
                     <selectView
                       type="goodsname"
                       :defaultVal="details.goodsname"
                       searchApi="getGoodsname"
                       :searchQuery="{ queryItem: '', top: 50 }"
-                      :showLabel="['goodsNameEN']"
+                      :showLabel="['goodsCode', 'goodsNameEN']"
                       :openSearch="true"
                       @change="getSelectViewRes"
                       style="width: 75%;max-width:210px;"
diff --git a/src/views/main/BookingLedger/detail/modules/ediMore.vue b/src/views/main/BookingLedger/detail/modules/ediMore.vue
index 73d37b9..f215e48 100644
--- a/src/views/main/BookingLedger/detail/modules/ediMore.vue
+++ b/src/views/main/BookingLedger/detail/modules/ediMore.vue
@@ -325,11 +325,20 @@
                 has-feedback
                 prop="bookingEDIExt.salerCode"
               >
-                <a-select size="small" default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.salerCode" @change="handleSaleChange">
+                <selectView
+                  type="salerCode"
+                  :defaultVal="details.bookingEDIExt.salerCode"
+                  searchApi="salerCode"
+                  :searchQuery="{ NAME: '' }"
+                  :showLabel="['NAME']"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                ></selectView>
+                <!-- <a-select size="small" default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.salerCode" @change="handleSaleChange">
                   <a-select-option v-for="(sales, sindex) in StoreSalesRepCode" :value="sales.NAME" :key="sindex">
                     {{ sales.NAME }}
                   </a-select-option>
-                </a-select>
+                </a-select> -->
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -352,11 +361,20 @@
                 has-feedback
                 prop="bookingEDIExt.masterBolIndicator"
               >
-                <a-select size="small" v-model="details.bookingEDIExt.masterBolIndicator" @change="handleMasterBolChange">
+                <selectView
+                  type="masterBolIndicator"
+                  :defaultVal="details.bookingEDIExt.masterBolIndicatorName"
+                  searchApi="StoreMasterBOLIndicator"
+                  :searchQuery="{ NAME: '' }"
+                  :showLabel="['NAME']"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                ></selectView>
+                <!-- <a-select size="small" v-model="details.bookingEDIExt.masterBolIndicator" @change="handleMasterBolChange" optionLabelProp="label">
                   <a-select-option v-for="(master, mindex) in StoreMasterBOLIndicator" :value="mindex" :key="mindex">
                     {{ master.NAME }}
                   </a-select-option>
-                </a-select>
+                </a-select> -->
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -430,10 +448,12 @@
 </template>
 <script>
 import inputView from '../components/inputView'
+import selectView from '../components/selectView'
 let timer;
 export default {
   components: {
-    inputView
+    inputView,
+    selectView
   },
   props: {
     details: {
@@ -521,24 +541,31 @@ export default {
         }
       });
     },
-    handleMasterBolChange (val) {
-      this.details.bookingEDIExt.masterBolIndicator = this.StoreMasterBOLIndicator[val].ID
-      this.details.bookingEDIExt.masterBolIndicatorName = this.StoreMasterBOLIndicator[val].NAME
-    },
-    handleSaleChange (val) {
-      this.details.bookingEDIExt.salerCode = val.split('|')[0]
-      this.details.bookingEDIExt.salerCodeName = val.split('|')[1]
-    },
+    // handleMasterBolChange (val) {
+    //   this.details.bookingEDIExt.masterBolIndicator = this.StoreMasterBOLIndicator[val].ID
+    //   this.details.bookingEDIExt.masterBolIndicatorName = this.StoreMasterBOLIndicator[val].NAME
+    // },
+    // handleSaleChange (val) {
+    //   this.details.bookingEDIExt.salerCode = val.split('|')[0]
+    //   this.details.bookingEDIExt.salerCodeName = val.split('|')[1]
+    // },
     inputChange ({ type, value }) {
       const bookingEDIExtArr = ['sendCode', 'receiveCode', 'ediAttn', 'ediAttnTel', 'ediAttnMail', 'amsConsignee', 'amsNotifyParty', 'opEName', 'opTel', 'opEmail', 'goodsName', 'orderRemark', 'consigneeEdiCode', 'shipperEdiCode', 'notifyCdoe', 'emanifestHbl', 'acihbl', 'kingTareweight']
       if (bookingEDIExtArr.includes(type)) {
         this.details.bookingEDIExt[type] = value
-        // console.log(this.details.bookingEDIExt[type])
       } else {
         this.details[type] = value
-        // console.log(this.details[type])
       }
       this.$forceUpdate()
+    },
+    getSelectViewRes ({ type, res }) {
+      if (type === 'masterBolIndicator') {
+        this.details.bookingEDIExt.masterBolIndicator = res.ID || ''
+        this.details.bookingEDIExt.masterBolIndicatorName = res.NAME || ''
+      } else if (type === 'salerCode') {
+        this.details.bookingEDIExt.salerCode = res.ID || ''
+        this.details.bookingEDIExt.salerCodeName = res.NAME.split('|')[1].trimStart()
+      }
     }
   }
 }
diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index 95bdffc..845e532 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -388,7 +388,7 @@
                   </a-form-item>
                 </a-col>
               </div>
-              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:85px;">
+              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:166px;">
                 <a-col :span="24">
                   <a-form-item
                     label="备注"
@@ -401,7 +401,7 @@
                         class="remark-input"
                         style="width:1000px !important; text-align: left;"
                         :allowClear="true"
-                        :auto-size="{ minRows: 3, maxRows: 3 }"
+                        :auto-size="{ minRows: 7, maxRows: 7 }"
                         v-model="initCabinFrom.remark"
                       />
                     </div>