Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/BookingLedger/detail/modules/preOrder.vue

@@ -2020,7 +2020,7 @@ export default {
     },
     getNoDataInit(isHBL = false, type) {
       console.log(this.details, 'this.details')
-      let $details = JSON.parse(JSON.stringify(this.details))
+      const $details = JSON.parse(JSON.stringify(this.details))
       const $data = {
         bookingId: $details.id,
         id: 0,
@@ -2030,7 +2030,6 @@ export default {
         etd: $details.etd,
         forwarder: $details.shipagency || '',
         vessel: $details.vessel,
-        voyno: $details.voyno,
         // 要改
         carrier: $details.carrier || '',
         carrierid: $details.carrierid || '',
@@ -2048,6 +2047,7 @@ export default {
         notifypartyname: '',
         notifypartyaddR1: '',
         notifypartycountry: '',
+        voyno: '',
         notifypartycountryName: '',
         notifypartytel: '',
         portload: $details.portload || 'QINGDAO,CHINA',
@@ -2088,7 +2088,7 @@ export default {
         ]
       }
       console.log(type, 'type')
-      if (isHBL || type == 'enter') {
+      if (isHBL || type === 'enter') {
         $details.ctnInputs.forEach((item) => {
           $data.ediCtn.push({
             ctnall: item.ctnall,
@@ -2113,6 +2113,7 @@ export default {
             $data.shippercountryName = item.shippercountryName
             $data.shippertel = item.shippertel
             $data.marks = item.marks
+            $data.voyno = item.voyno
             $data.description = item.description
             $data.consigneename = item.consigneename
             $data.consigneeaddR1 = item.consigneeaddR1
@@ -2145,7 +2146,7 @@ export default {
       //     $data.notifypartycountryName = res.data[0].country
       //   })
       // }
-      if ($data.portdischargeid) {
+      if ($data.portdischargeid && !isHBL) {
         GetPortlist({ KeyWord: $data.portdischargeid }).then((res) => {
           if (res.data) {
             $data.consigneecountry = res.data[0].countryCode