|
@@ -939,7 +939,7 @@ let initForm = (switchStatus = [] as any[], useOldFormData = false) => {
|
|
|
step3FormList.value = []
|
|
|
if (productInfo.value.number?.length) {
|
|
|
// 保存的数据库里面的中途配送数据
|
|
|
- const oldMidWayData = productInfo.value.save_cal.cal_shipment_method
|
|
|
+ const oldMidWayData = productInfo.value.save_cal.cal_shipment_method || {}
|
|
|
|
|
|
productInfo.value.number.forEach((item: any, index: number) => {
|
|
|
const t: any = {}
|
|
@@ -1011,7 +1011,7 @@ let initForm = (switchStatus = [] as any[], useOldFormData = false) => {
|
|
|
t.fclData = {}
|
|
|
t.lclData = {}
|
|
|
if (useOldFormData) {
|
|
|
- const oldData = productInfo.value.save_cal
|
|
|
+ const oldData = productInfo.value.save_cal || {}
|
|
|
if (oldData[`cal_fcl_${item}`]) {
|
|
|
t.fclData = oldData[`cal_fcl_${item}`]
|
|
|
t.freight_cost_3 = oldData[`cal_fcl_${item}`].total_fcl
|
|
@@ -1228,9 +1228,10 @@ let generateStep3Form = (withOldData = false) => {
|
|
|
// 设置 中途运费 及 国外当地运费
|
|
|
let setFreight = () => {
|
|
|
productInfo.value.number.forEach((item: any, index: number) => {
|
|
|
- if (index > 2) {
|
|
|
- return
|
|
|
- }
|
|
|
+ // 早起的需求限制3个, 现在暂定放开了. 限制的话, 超过3个的货物数量的运费直接就跳过不计算了.
|
|
|
+ // if (index > 2) {
|
|
|
+ // return
|
|
|
+ // }
|
|
|
const cityPrice = calcCityPrice(
|
|
|
computedTotalWeight.value[index],
|
|
|
computedTotalBulk.value[index],
|