|
|
@@ -1139,7 +1139,13 @@ let generateStep3Form = (p = {}) => {
|
|
|
})
|
|
|
|
|
|
if (n <= 2) {
|
|
|
- temp.cn_freight_cost = savePrecision(i[`cn_price_${n}`]).toFixed(2)
|
|
|
+ temp.cn_freight_cost = savePrecision(
|
|
|
+ mathjs
|
|
|
+ .chain(i[`cn_price_${n}`])
|
|
|
+ .multiply(setting.value.rate_rmb_aud)
|
|
|
+ .done(),
|
|
|
+ )
|
|
|
+
|
|
|
temp.local_freight_cost = savePrecision(i[`city_price_${n}`]).toFixed(
|
|
|
2,
|
|
|
)
|
|
|
@@ -1149,12 +1155,7 @@ let generateStep3Form = (p = {}) => {
|
|
|
temp.freight_cost = mathjs
|
|
|
.chain(i[`midway_price_${n}`])
|
|
|
.add(i[`city_price_${n}`])
|
|
|
- .add(
|
|
|
- mathjs
|
|
|
- .chain(temp.cn_freight_cost)
|
|
|
- .divide(setting.value.rate_rmb_aud)
|
|
|
- .done(),
|
|
|
- )
|
|
|
+ .add(i[`cn_price_${n}`])
|
|
|
.done()
|
|
|
.toFixed(2)
|
|
|
// 用demo默认值是重新计算的数据. 如果是初始化时需要用保存到数据库的数据覆盖掉这个.
|
|
|
@@ -1355,6 +1356,7 @@ let generateStep3Form = (p = {}) => {
|
|
|
cloneData.freight_cost = cloneData.freight
|
|
|
delete cloneData.freight
|
|
|
temp = Object.assign(temp, cloneData)
|
|
|
+ calcTotalCost(temp) // 如果运费总成本被覆盖, 那总成本会产生误差, 最好是重算一遍.
|
|
|
}
|
|
|
exportForm.value[`zdy_date_${n}_${i.number}`] = oldData[
|
|
|
`zdy_date_${n}_${i.number}`
|
