diff --git a/src/views/ecw/offer/edit.vue b/src/views/ecw/offer/edit.vue index c9da7fa95b10a906e8a87c3628340816f54e5f7b..048f45b194871bd413ee7152b847e38c792e669f 100644 --- a/src/views/ecw/offer/edit.vue +++ b/src/views/ecw/offer/edit.vue @@ -1268,50 +1268,76 @@ export default { formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter((item) => item && item != "") } if (res.data.offerProdRespVOList) { - - res.data.offerProdRespVOList.forEach((item) => { - formData.prodCreateReqVOList.push({ - goodsType: item.goodsType, - brand: item.brand, - unit: item.unit, - channelId: item.channelId, - lineId: item.lineId, - prodId: item.prodId, - num: item.num, - quantity: item.quantity, - boxGauge: item.boxGauge, - volume: item.volume, - transportId: item.transportId, - weight: item.weight, - worth: item.worth, - specialPriceType: item.specialPriceType, - oneSeaFreight: item.oneSeaFreight, - orgFreightPrice: item.originalSeaFreight, - originalSeaFreight: item.originalSeaFreight, - oneClearanceFee: item.oneClearanceFreight, - oneClearanceFreight: item.oneClearanceFreight, - orgClearanceFeePrice: item.originalClearanceFreight, - originalClearanceFreight: item.originalClearanceFreight, - freightVolume: item.seaFreightVolume, - seaFreightVolume: item.seaFreightVolume, - clearanceFeeVolume: item.clearanceFreightVolume, - clearanceFreightVolume: item.clearanceFreightVolume, - charging: item.charging, - freightCurrency: item.seaFreightCurrency, - seaFreightCurrency: item.seaFreightCurrency, - freight: item.seaFreight, - clearanceFeeCurrency: item.clearanceFreightCurrency, - clearanceFreightCurrency: item.clearanceFreightCurrency, - clearanceFee: item.clearanceFreight, - prodAttrArr: - item.prodAttrIds && item.prodAttrIds != "" - ? item.prodAttrIds + if (this.$route.query.id) { + res.data.offerProdRespVOList.forEach((item) => { + formData.prodCreateReqVOList.push({ + goodsType: item.goodsType, + brand: item.brand, + unit: item.unit, + channelId: item.channelId, + lineId: item.lineId, + prodId: item.prodId, + num: item.num, + quantity: item.quantity, + boxGauge: item.boxGauge, + volume: item.volume, + transportId: item.transportId, + weight: item.weight, + worth: item.worth, + specialPriceType: item.specialPriceType, + oneSeaFreight: item.oneSeaFreight, + orgFreightPrice: item.originalSeaFreight, + originalSeaFreight: item.originalSeaFreight, + oneClearanceFee: item.oneClearanceFreight, + oneClearanceFreight: item.oneClearanceFreight, + orgClearanceFeePrice: item.originalClearanceFreight, + originalClearanceFreight: item.originalClearanceFreight, + freightVolume: item.seaFreightVolume, + seaFreightVolume: item.seaFreightVolume, + clearanceFeeVolume: item.clearanceFreightVolume, + clearanceFreightVolume: item.clearanceFreightVolume, + charging: item.charging, + freightCurrency: item.seaFreightCurrency, + seaFreightCurrency: item.seaFreightCurrency, + freight: item.seaFreight, + clearanceFeeCurrency: item.clearanceFreightCurrency, + clearanceFreightCurrency: item.clearanceFreightCurrency, + clearanceFee: item.clearanceFreight, + prodAttrArr: + item.prodAttrIds && item.prodAttrIds != "" + ? item.prodAttrIds .split(",") .filter((item) => item != "") .map((item) => +item) - : [] + : [] + }) }) - }) + } else { + res.data.offerProdRespVOList.forEach((item) => { + formData.prodCreateReqVOList.push({ + goodsType: item.goodsType, + brand: item.brand, + unit: item.unit, + channelId: item.channelId, + lineId: item.lineId, + prodId: item.prodId, + num: item.num, + quantity: item.quantity, + boxGauge: item.boxGauge, + volume: item.volume, + transportId: item.transportId, + weight: item.weight, + worth: item.worth, + prodAttrArr: + item.prodAttrIds && item.prodAttrIds != "" + ? item.prodAttrIds + .split(",") + .filter((item) => item != "") + .map((item) => +item) + : [] + }) + }) + } } if (this.$route.query.copyId) { @@ -1573,7 +1599,11 @@ export default { var a = null if(res.data.prodCostDtoList[index]) { a = res.data.prodCostDtoList[index] - a['specialPriceType'] = item.specialPriceType + if(this.$route.query.copyId==undefined) { + a['specialPriceType'] = item.specialPriceType + } else { + a['specialPriceType'] = false + } } this.$set(item, "fee", a) })