|
|
@@ -173,23 +173,29 @@ async function getSupplier(params: any) {
|
|
|
}
|
|
|
function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
|
|
|
let filterSupplierArr = supplierArr.value.filter((item: any) => item.id === e);
|
|
|
+console.log(filterSupplierArr,"filterSupplierArr");
|
|
|
+console.log(newType,"newType");
|
|
|
|
|
|
if (filterSupplierArr.length > 0) {
|
|
|
isShowOnline.value = filterSupplierArr.every((items: any) => {
|
|
|
if (newType.length > 0) {
|
|
|
+ // 如果供应商支持线上和线下,则显示线上和线下选项 让用户去选择是否线上或者线下
|
|
|
if (items.offlineCPTypes?.includes(newType[0]) && items.onlineCPTypes?.includes(newType[0])) {
|
|
|
return true;
|
|
|
} else {
|
|
|
+ // 如果线下项目包含当前方案类型,则默认线下选项
|
|
|
if (items.offlineCPTypes?.includes(newType[0])) {
|
|
|
form.isOffline = 'Y';
|
|
|
|
|
|
return false;
|
|
|
} else if (items.onlineCPTypes?.includes(newType[0])) {
|
|
|
+ // 如果线上项目包含当前方案类型,则默认线上选项
|
|
|
form.isOffline = 'N';
|
|
|
// 线上项目 显示配送选项
|
|
|
isShowDelivery.value = true;
|
|
|
return false;
|
|
|
} else {
|
|
|
+ // 如果供应商不支持当前方案类型,则默认不显示线上项目选项
|
|
|
form.isOffline = null;
|
|
|
return false;
|
|
|
}
|
|
|
@@ -198,8 +204,9 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
+ //如果显示了线上项目选项
|
|
|
if (isShowOnline.value) {
|
|
|
- if (newOffline) {
|
|
|
+ if (newOffline) {
|
|
|
onlineArr.value = [newOffline];
|
|
|
if (onlineArr.value.length > 1) {
|
|
|
onlineArr.value = [onlineArr.value[onlineArr.value.length - 1]];
|
|
|
@@ -211,6 +218,7 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
|
|
|
form.isDelivery = null;
|
|
|
isShowDelivery.value = false;
|
|
|
} else {
|
|
|
+ // newOffline ==N 线上项目 显示配送选项 出来是否配送选项 让用户去选是否支持配送
|
|
|
isShowDelivery.value = true;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -227,6 +235,7 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
|
|
|
} else {
|
|
|
// 线上项目 显示配送选项
|
|
|
if (newOffline === 'N') {
|
|
|
+ // 如果已经能够确定是线上项目就直接显示配送选项 出来是否配送选项 让用户去选是否支持配送
|
|
|
isShowDelivery.value = true;
|
|
|
deliverArr.value = [newDelivery];
|
|
|
if (deliverArr.value.length > 1) {
|