|
@@ -320,6 +320,7 @@ import {
|
|
|
return {};
|
|
return {};
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ // 是否是退货单创建发货单
|
|
|
isReturnGoodsCreate: {
|
|
isReturnGoodsCreate: {
|
|
|
type: Boolean,
|
|
type: Boolean,
|
|
|
default: false
|
|
default: false
|
|
@@ -378,6 +379,9 @@ import {
|
|
|
linkName: [
|
|
linkName: [
|
|
|
{ required: true, message: '请输入', trigger: ['blur', 'change'] }
|
|
{ required: true, message: '请输入', trigger: ['blur', 'change'] }
|
|
|
],
|
|
],
|
|
|
|
|
+ linkPhone: [
|
|
|
|
|
+ { required: true, message: '请输入', trigger: 'change' }
|
|
|
|
|
+ ],
|
|
|
orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
|
|
orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
|
|
|
receiveAddress: [
|
|
receiveAddress: [
|
|
|
{ required: true, message: '请输入', trigger: 'change' }
|
|
{ required: true, message: '请输入', trigger: 'change' }
|
|
@@ -1072,10 +1076,14 @@ import {
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
async sendSubmit(res) {
|
|
async sendSubmit(res) {
|
|
|
|
|
+ console.log('res~~~~~~', res, this.businessId);
|
|
|
|
|
+ let paramsId = this.isReturnGoodsCreate ? res : this.businessId || res;
|
|
|
|
|
+ console.log('paramsId~~~', paramsId)
|
|
|
const data = await getSendSaleOrderrecordDetailSplit(
|
|
const data = await getSendSaleOrderrecordDetailSplit(
|
|
|
- this.businessId || res
|
|
|
|
|
|
|
+ paramsId
|
|
|
);
|
|
);
|
|
|
let storemanIds = '';
|
|
let storemanIds = '';
|
|
|
|
|
+ console.log('data~~~~~~', data);
|
|
|
let ids = data.productList.map((item) => item.warehouseId);
|
|
let ids = data.productList.map((item) => item.warehouseId);
|
|
|
if (ids?.length) {
|
|
if (ids?.length) {
|
|
|
let warehouseList = await getWarehouseListByIds(ids || []);
|
|
let warehouseList = await getWarehouseListByIds(ids || []);
|
|
@@ -1086,7 +1094,7 @@ import {
|
|
|
|
|
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
let params = {
|
|
let params = {
|
|
|
- businessId: this.businessId || res,
|
|
|
|
|
|
|
+ businessId: paramsId,
|
|
|
businessKey:
|
|
businessKey:
|
|
|
data.saleTypeName.indexOf('技改') != '-1'
|
|
data.saleTypeName.indexOf('技改') != '-1'
|
|
|
? 'sele_order_send_correction'
|
|
? 'sele_order_send_correction'
|