diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e76e5fa2..63c98c54 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2540,6 +2540,7 @@ const handleChooseConsigner = (column, prop, order) => {
if (column.destinationWarehouseId) {
details.query.destinationWarehouseId = column.destinationWarehouseId;
details.query.destinationWarehouseName = column.destinationWarehouseName;
+ details.query.queryDestinationWarehouseName = column.destinationWarehouseName;
}
// 送货方式
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 1018238a..46fcf7b8 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -137,6 +137,32 @@
+
+ {
+ destinationWarehouseNameChange(val);
+ handleFindPrice();
+ }
+ "
+ :remote-method="value => debounce(remoteMethod(value), 500)"
+ :loading="details.loadingObj.loading"
+ >
+
+
+
+
@@ -1150,6 +1176,7 @@ const details = reactive({
destinationWarehouseName: '',
/** 目的仓Id */
destinationWarehouseId: '',
+ queryDestinationWarehouseName: '',
/** 货物号 */
goodsCode: '',
/** 发货单位id */
@@ -1355,11 +1382,11 @@ const details = reactive({
},
],
/** 目的站名称 */
- destinationWarehouseName: [
+ queryDestinationWarehouseName: [
{
required: true,
message: '请选择目的仓',
- trigger: ['change', 'blur'],
+ trigger: ['blur', 'change'],
},
],
/** 发货单位 */
@@ -1823,7 +1850,7 @@ const onLoad = async () => {
}
// 初始化选择支付方式
if (details.info.defaultPayWay) {
- details.info.payWay = details.info.defaultPayWay;
+ details.query.payWay = details.info.defaultPayWay;
} else {
details.query.payWay =
details.info.payWayList.find(val => val.dictValue === '到付').dictKey || '2';
@@ -1954,9 +1981,10 @@ remoteMethod('');
/** 目的仓选择时给目的仓名称赋值 */
const destinationWarehouseNameChange = val => {
- details.query.destinationWarehouseName = details.options.find(
- value => value.warehouseId === val
- ).warehouseName;
+ const _item = details.options.find(value => value.warehouseId === val);
+ details.query.destinationWarehouseName = _item.warehouseName;
+ details.query.destinationWarehouseId = _item.warehouseId;
+ details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
};
/** 查询货物 */
@@ -2089,6 +2117,7 @@ const handleChooseConsigner = (column, prop, order) => {
if (column.destinationWarehouseId) {
details.query.destinationWarehouseId = column.destinationWarehouseId;
details.query.destinationWarehouseName = column.destinationWarehouseName;
+ details.query.queryDestinationWarehouseName = column.destinationWarehouseName;
}
// 送货方式