|
|
@@ -896,6 +896,7 @@ export default {
|
|
|
this.$refs.form.validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.mapList();
|
|
|
+
|
|
|
this.$refs.submitRefs.open();
|
|
|
}
|
|
|
});
|
|
|
@@ -906,23 +907,14 @@ export default {
|
|
|
var requiredFormingNum = 0;
|
|
|
var productNum = 0;
|
|
|
this.form.salesOrders.map((item, index) => {
|
|
|
- requiredFormingNum =
|
|
|
- Number(requiredFormingNum) + Number(item.requiredFormingNum);
|
|
|
+ requiredFormingNum = Number(requiredFormingNum) + Number(item.requiredFormingNum);
|
|
|
|
|
|
- if (
|
|
|
- this.form.weightUnit == 'G' ||
|
|
|
- this.form.weightUnit == 'g' ||
|
|
|
- this.form.weightUnit == '克'
|
|
|
- ) {
|
|
|
+ if (this.form.weightUnit == 'G' ||this.form.weightUnit == 'g' ||this.form.weightUnit == '克') {
|
|
|
this.form.newWeightUnit = 'kg';
|
|
|
- _sumOrderWeight =
|
|
|
- (this.form.sumOrderWeight *
|
|
|
- Number(this.form.marginCoefficient || 1)) /
|
|
|
- 1000;
|
|
|
+ _sumOrderWeight =(this.form.salesOrders[0].requiredFormingNum *Number(this.form.salesOrders[0].productUnitWeight || 1)) /1000;
|
|
|
} else {
|
|
|
this.form.newWeightUnit = this.form.weightUnit;
|
|
|
- _sumOrderWeight =
|
|
|
- this.form.sumOrderWeight * Number(this.form.marginCoefficient || 1);
|
|
|
+ _sumOrderWeight =(this.form.salesOrders[0].requiredFormingNum *Number(this.form.salesOrders[0].productUnitWeight || 1));
|
|
|
}
|
|
|
|
|
|
productNum += Number(item.planProductNum);
|
|
|
@@ -946,6 +938,9 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.form.reqMoldTime = latestData.reqMoldTime;
|
|
|
+
|
|
|
+ console.log(this.form,'1111111111111');
|
|
|
+
|
|
|
},
|
|
|
|
|
|
sortTop(row) {
|