Commit 85b4ffc1 authored by honghy's avatar honghy Committed by wux

需求95 报价单页面和列表调整

parent 99ca96cc
...@@ -1268,50 +1268,76 @@ export default { ...@@ -1268,50 +1268,76 @@ export default {
formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter((item) => item && item != "") formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter((item) => item && item != "")
} }
if (res.data.offerProdRespVOList) { if (res.data.offerProdRespVOList) {
if (this.$route.query.id) {
res.data.offerProdRespVOList.forEach((item) => { res.data.offerProdRespVOList.forEach((item) => {
formData.prodCreateReqVOList.push({ formData.prodCreateReqVOList.push({
goodsType: item.goodsType, goodsType: item.goodsType,
brand: item.brand, brand: item.brand,
unit: item.unit, unit: item.unit,
channelId: item.channelId, channelId: item.channelId,
lineId: item.lineId, lineId: item.lineId,
prodId: item.prodId, prodId: item.prodId,
num: item.num, num: item.num,
quantity: item.quantity, quantity: item.quantity,
boxGauge: item.boxGauge, boxGauge: item.boxGauge,
volume: item.volume, volume: item.volume,
transportId: item.transportId, transportId: item.transportId,
weight: item.weight, weight: item.weight,
worth: item.worth, worth: item.worth,
specialPriceType: item.specialPriceType, specialPriceType: item.specialPriceType,
oneSeaFreight: item.oneSeaFreight, oneSeaFreight: item.oneSeaFreight,
orgFreightPrice: item.originalSeaFreight, orgFreightPrice: item.originalSeaFreight,
originalSeaFreight: item.originalSeaFreight, originalSeaFreight: item.originalSeaFreight,
oneClearanceFee: item.oneClearanceFreight, oneClearanceFee: item.oneClearanceFreight,
oneClearanceFreight: item.oneClearanceFreight, oneClearanceFreight: item.oneClearanceFreight,
orgClearanceFeePrice: item.originalClearanceFreight, orgClearanceFeePrice: item.originalClearanceFreight,
originalClearanceFreight: item.originalClearanceFreight, originalClearanceFreight: item.originalClearanceFreight,
freightVolume: item.seaFreightVolume, freightVolume: item.seaFreightVolume,
seaFreightVolume: item.seaFreightVolume, seaFreightVolume: item.seaFreightVolume,
clearanceFeeVolume: item.clearanceFreightVolume, clearanceFeeVolume: item.clearanceFreightVolume,
clearanceFreightVolume: item.clearanceFreightVolume, clearanceFreightVolume: item.clearanceFreightVolume,
charging: item.charging, charging: item.charging,
freightCurrency: item.seaFreightCurrency, freightCurrency: item.seaFreightCurrency,
seaFreightCurrency: item.seaFreightCurrency, seaFreightCurrency: item.seaFreightCurrency,
freight: item.seaFreight, freight: item.seaFreight,
clearanceFeeCurrency: item.clearanceFreightCurrency, clearanceFeeCurrency: item.clearanceFreightCurrency,
clearanceFreightCurrency: item.clearanceFreightCurrency, clearanceFreightCurrency: item.clearanceFreightCurrency,
clearanceFee: item.clearanceFreight, clearanceFee: item.clearanceFreight,
prodAttrArr: prodAttrArr:
item.prodAttrIds && item.prodAttrIds != "" item.prodAttrIds && item.prodAttrIds != ""
? item.prodAttrIds ? item.prodAttrIds
.split(",") .split(",")
.filter((item) => item != "") .filter((item) => item != "")
.map((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) { if (this.$route.query.copyId) {
...@@ -1573,7 +1599,11 @@ export default { ...@@ -1573,7 +1599,11 @@ export default {
var a = null var a = null
if(res.data.prodCostDtoList[index]) { if(res.data.prodCostDtoList[index]) {
a = 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) this.$set(item, "fee", a)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment