|
@@ -344,7 +344,7 @@ export default {
|
|
|
|
|
|
|
|
requiredFormingNum = Number(requiredFormingNum) + Number(item.requiredFormingNum);
|
|
requiredFormingNum = Number(requiredFormingNum) + Number(item.requiredFormingNum);
|
|
|
|
|
|
|
|
- if(this.form.weightUnit == 'G' || this.form.weightUnit == 'g') {
|
|
|
|
|
|
|
+ if(this.form.weightUnit == 'G' || this.form.weightUnit == 'g' || this.form.weightUnit == '克') {
|
|
|
this.form.newWeightUnit = 'kg'
|
|
this.form.newWeightUnit = 'kg'
|
|
|
_sumOrderWeight = (this.form.sumOrderWeight * Number(this.form.marginCoefficient || 1))/ 1000
|
|
_sumOrderWeight = (this.form.sumOrderWeight * Number(this.form.marginCoefficient || 1))/ 1000
|
|
|
} else {
|
|
} else {
|
|
@@ -506,7 +506,10 @@ export default {
|
|
|
brandNo: params.brandNo,
|
|
brandNo: params.brandNo,
|
|
|
categoryId: params.categoryId,
|
|
categoryId: params.categoryId,
|
|
|
productCode: params.productCode,
|
|
productCode: params.productCode,
|
|
|
- productName: params.productName
|
|
|
|
|
|
|
+ productName: params.productName,
|
|
|
|
|
+
|
|
|
|
|
+ newWeightUnit: this.form.newWeightUnit,
|
|
|
|
|
+ newSumOrderWeight: this.form.newSumOrderWeight
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
if (this.$route.query.type == 'edit') {
|
|
if (this.$route.query.type == 'edit') {
|