diff --git a/src/pagesApp/receiveSpl.vue b/src/pagesApp/receiveSpl.vue index c2f2ccc..27366f1 100644 --- a/src/pagesApp/receiveSpl.vue +++ b/src/pagesApp/receiveSpl.vue @@ -33,7 +33,7 @@ border="none" :disabled="item.disabled || item.type === 'select'" :disabledColor=" - ['补单时间', '站点磅秤', '供应商', '收货产品'].indexOf(item.name) > + ['补单时间', '站点磅秤', '供应商', '收货产品', '车牌号'].indexOf(item.name) > -1 ? '#ffffff' : '#f5f7fa' @@ -443,20 +443,19 @@ watch( 预估总价: 结算单价*结算重量 实际收入:实际结算金额-运费-杂费 */ - model1.order.netWeight = num_subtract((parseFloat(grossWeightNew) || 0), (parseFloat(tareNew) || 0)) + model1.order.netWeight = num_subtract((parseFloat(grossWeightNew) || 0), (parseFloat(tareNew) || 0)).toFixed(2) if (model1.order.buttonType === 0) { if (model1.order.subtractNum) { - model1.order.netWeight = num_subtract(model1.order.netWeight, model1.order.subtractNum) + model1.order.netWeight = num_subtract(model1.order.netWeight, model1.order.subtractNum).toFixed(2) } } else if (model1.order.buttonType === 1) { if (model1.order.subtractNum) { - model1.order.netWeight = num_multiply(model1.order.netWeight, ((100 - model1.order.subtractNum) / 100)) + model1.order.netWeight = num_multiply(model1.order.netWeight, ((100 - model1.order.subtractNum) / 100)).toFixed(2) } } - model1.order.totalPrice = Math.floor( - (model1.order.price || 0) * (model1.order.netWeight || 0) - ); + model1.order.totalPrice = num_multiply((model1.order.price || 0), (model1.order.netWeight || 0)).toFixed(2) + // 实际付款默认=预估总价,当系统自动算出预估总价时,值需同步 model1.order.balanceTotalPrice = model1.order.totalPrice; } diff --git a/src/pagesApp/shipmentSpl.vue b/src/pagesApp/shipmentSpl.vue index 765c213..b12e806 100644 --- a/src/pagesApp/shipmentSpl.vue +++ b/src/pagesApp/shipmentSpl.vue @@ -33,7 +33,7 @@ border="none" :disabled="item.disabled || item.type === 'select'" :disabledColor=" - ['补单时间', '过磅设备', '客户', '出货产品'].indexOf(item.name) > -1 + ['补单时间', '过磅设备', '客户', '出货产品','车牌号'].indexOf(item.name) > -1 ? '#ffffff' : '#f5f7fa' " @@ -121,7 +121,7 @@