|
@@ -115,7 +115,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
|
|
|
"$1.$2")'
|
|
|
placeholder="请输入 毛利额"
|
|
|
- :disabled="detailData.status == 1"
|
|
|
+ disabled
|
|
|
/>
|
|
|
</template>
|
|
|
<template slot="grossProfitRate">
|
|
@@ -125,7 +125,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
|
|
|
@change="grossProfitRateChange"
|
|
|
placeholder="请输入 毛利率"
|
|
|
- :disabled="detailData.status == 1"
|
|
|
+ disabled
|
|
|
><template slot="append">%</template></el-input
|
|
|
>
|
|
|
</template>
|
|
@@ -1022,11 +1022,8 @@ export default {
|
|
|
//返回列表
|
|
|
backToList() {
|
|
|
let orderFeesList = this.$refs.feeInfo.submitData();
|
|
|
- let form = this.deepClone(this.form);
|
|
|
- if (
|
|
|
- form.orderStatus == "录入" &&
|
|
|
- this.oldform.orderStatus == "录入"
|
|
|
- ) {
|
|
|
+ let form = this.form
|
|
|
+ if (form.orderStatus == "录入" && this.oldform.orderStatus == "录入") {
|
|
|
delete form.orderStatus;
|
|
|
delete form.$orderStatus;
|
|
|
delete this.oldform.orderStatus;
|
|
@@ -1072,11 +1069,19 @@ export default {
|
|
|
let amountSum = 0;
|
|
|
let insuranceSum = 0;
|
|
|
let freightSum = 0;
|
|
|
+ let purchaseAmountSum = 0;
|
|
|
data.forEach(e => {
|
|
|
qtySum = _.add(qtySum, Number(e.orderQuantity));
|
|
|
amountSum = _.add(amountSum, Number(e.amount));
|
|
|
insuranceSum = _.add(insuranceSum, Number(e.insurance));
|
|
|
freightSum = _.add(freightSum, Number(e.freight));
|
|
|
+ purchaseAmountSum = _.add(
|
|
|
+ purchaseAmountSum,
|
|
|
+ Number(
|
|
|
+ _.multiply(Number(e.purchaseAmount?e.purchaseAmount:0), Number(e.orderQuantity))
|
|
|
+ )
|
|
|
+ );
|
|
|
+ // this.form.grossProfit=amountSum-purchaseAmountSum
|
|
|
});
|
|
|
//数量总计
|
|
|
if (item.property == "orderQuantity") {
|