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

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

@@ -2054,13 +2054,13 @@ export default {
         portloadid: $details.portloadid || 'CNTAO',
         portdischarge: $details.portdischarge,
         portdischargeid: $details.portdischargeid,
-        marks: $details.marks,
+        description: '',
-        description: $details.description,
         cargoid: $details.cargoid,
         tempset: $details.tempset,
         tempid: $details.tempid,
         reeferf: $details.reeferf,
         dclass: $details.dclass,
+        marks: '',
         dunno: $details.dunno,
         dattn: $details.linkman || '',
         dtel: $details.dtel || '',
@@ -2112,6 +2112,8 @@ export default {
             $data.shippercountry = item.shippercountry
             $data.shippercountryName = item.shippercountryName
             $data.shippertel = item.shippertel
+            $data.marks = item.marks
+            $data.description = item.description
             $data.consigneename = item.consigneename
             $data.consigneeaddR1 = item.consigneeaddR1
             $data.consigneecountry = item.consigneecountry
@@ -2151,17 +2153,17 @@ export default {
           }
         })
       }
-      if ($details.shipper) {
+      if ($details.shipper && !isHBL) {
         const newArr = $details.shipper.split('\n')
         $data.shippername = newArr[0]
         $data.shipperaddR1 = newArr[1]
       }
-      if ($details.consignee) {
+      if ($details.consignee && !isHBL) {
         const newArr = $details.consignee.split('\n')
         $data.consigneename = newArr[0]
         $data.consigneeaddR1 = newArr[1]
       }
-      if ($details.notifyparty) {
+      if ($details.notifyparty && !isHBL) {
         const newArr = $details.notifyparty.split('\n')
         $data.notifypartyname = newArr[0]
         $data.notifypartyaddR1 = newArr[1]