diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 79430a62..8fa15685 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -2513,6 +2513,14 @@ const handleChooseShipper = (column, prop, order) => { details.query.shipperName = column.linkMan; details.query.shipperMobile = column.linkPhone; + // 发站 + const _departure = []; + if (column.provinceId) _departure[0] = column.provinceId; + if (column.cityId) _departure[1] = column.cityId; + if (column.areaId) _departure[2] = column.areaId; + + if (_departure.length > 0) details.query.departure = _departure; + handleFindClientInfo('shipper'); handleFindClientInfo('shipperName'); handleFindClientInfo('shipperMobile'); @@ -2528,6 +2536,23 @@ const handleChooseConsigner = (column, prop, order) => { details.query.consigneeName = column.linkMan; details.query.consigneeMobile = column.linkPhone; + // 仓库 + if (column.destinationWarehouseId) { + details.query.destinationWarehouseId = column.destinationWarehouseId; + details.query.destinationWarehouseName = column.destinationWarehouseName; + } + + // 送货方式 + if (column.defaultDeliveryWay) details.query.deliveryWay = column.defaultDeliveryWay; + + // 到站 + const _destination = []; + if (column.provinceId) _destination[0] = column.provinceId; + if (column.cityId) _destination[1] = column.cityId; + if (column.areaId) _destination[2] = column.areaId; + + if (_destination.length > 0) details.query.destination = _destination; + handleFindClientInfo('consignee'); handleFindClientInfo('consigneeName'); handleFindClientInfo('consigneeMobile'); diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index ad9254c0..80923f0f 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -288,7 +288,7 @@ { handleChooseConsigner(column, prop, order); } @@ -2062,6 +2062,14 @@ const handleChooseShipper = (column, prop, order) => { details.query.shipperName = column.linkMan; details.query.shipperMobile = column.linkPhone; + // 发站 + const _departure = []; + if (column.provinceId) _departure[0] = column.provinceId; + if (column.cityId) _departure[1] = column.cityId; + if (column.areaId) _departure[2] = column.areaId; + + if (_departure.length > 0) details.query.departure = _departure; + handleFindClientInfo('shipper'); handleFindClientInfo('shipperName'); handleFindClientInfo('shipperMobile'); @@ -2077,6 +2085,23 @@ const handleChooseConsigner = (column, prop, order) => { details.query.consigneeName = column.linkMan; details.query.consigneeMobile = column.linkPhone; + // 仓库 + if (column.destinationWarehouseId) { + details.query.destinationWarehouseId = column.destinationWarehouseId; + details.query.destinationWarehouseName = column.destinationWarehouseName; + } + + // 送货方式 + if (column.defaultDeliveryWay) details.query.deliveryWay = column.defaultDeliveryWay; + + // 到站 + const _destination = []; + if (column.provinceId) _destination[0] = column.provinceId; + if (column.cityId) _destination[1] = column.cityId; + if (column.areaId) _destination[2] = column.areaId; + + if (_destination.length > 0) details.query.destination = _destination; + handleFindClientInfo('consignee'); handleFindClientInfo('consigneeName'); handleFindClientInfo('consigneeMobile');