Merge remote-tracking branch 'origin/release' into release

src/components/WarehouseAreaSelect/index.vue

@@ -191,7 +191,7 @@ export default {
         this.$emit('input', data)
         this.dialogVisible = false
 
-        if (this.isEditing || this.warehouseInId) {
+        if ((this.isEditing || this.warehouseInId) && this.warehouseInId) {
             updateWarehouseInLocation({
               "orderId": this.orderId,
               "orderItemId": this.orderItemId,

src/views/ecw/box/shippingAir/nodePage/subMaterial.vue

@@ -140,7 +140,7 @@ export default {
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookAirInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookAirInfo?.blNo||undefined)
       this.$set(this.subMaterialObj,'markNo',"N/M")
-      this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookAirInfo?.bigPortId||undefined)
+      this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookAirInfo?.departurePortId||undefined)
       this.$set(this.subMaterialObj,'shipCompanyId',Number(this.shipmentObj.bookAirInfo?.shipCompanyType)||undefined)
       this.$set(this.subMaterialObj,'destPortId',this.shipmentObj.bookAirInfo?.destPortId||undefined)
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)