|
@@ -1082,6 +1082,11 @@
|
|
|
type: Boolean,
|
|
type: Boolean,
|
|
|
default: true
|
|
default: true
|
|
|
},
|
|
},
|
|
|
|
|
+ // 是否合同
|
|
|
|
|
+ isContractBook: {
|
|
|
|
|
+ type: Boolean,
|
|
|
|
|
+ default: false
|
|
|
|
|
+ },
|
|
|
contractBookType: {
|
|
contractBookType: {
|
|
|
//合同类型 1销售 2采购
|
|
//合同类型 1销售 2采购
|
|
|
type: [String, Number],
|
|
type: [String, Number],
|
|
@@ -2201,7 +2206,7 @@
|
|
|
item['customerMark'] = item.customerMark || this.customerMark;
|
|
item['customerMark'] = item.customerMark || this.customerMark;
|
|
|
item['arrivalWay'] = item.arrivalWay || 1;
|
|
item['arrivalWay'] = item.arrivalWay || 1;
|
|
|
item.discountRatio = Number(item.discountRatio) || 100;
|
|
item.discountRatio = Number(item.discountRatio) || 100;
|
|
|
- item.taxRate = item.taxRate || this.defTaxRate;
|
|
|
|
|
|
|
+ item.taxRate = item.taxRate ? item.taxRate : this.isContractBook ? this.defTaxRate : this.isTaxRate == 1 ? this.defTaxRate : undefined;
|
|
|
item.quoteWay = item.quoteWay || 1;
|
|
item.quoteWay = item.quoteWay || 1;
|
|
|
});
|
|
});
|
|
|
this.form.datasource = productList;
|
|
this.form.datasource = productList;
|
|
@@ -2305,7 +2310,7 @@
|
|
|
this.$set(parasm, 'colorKey', item.colorKey.split(','));
|
|
this.$set(parasm, 'colorKey', item.colorKey.split(','));
|
|
|
}
|
|
}
|
|
|
if (this.defTaxRate) {
|
|
if (this.defTaxRate) {
|
|
|
- this.$set(parasm, 'taxRate', parasm.taxRate || this.defTaxRate);
|
|
|
|
|
|
|
+ this.$set(parasm, 'taxRate', parasm.taxRate ? parasm.taxRate : this.isContractBook ? this.defTaxRate : this.isTaxRate == 1 ? this.defTaxRate : undefined);
|
|
|
}
|
|
}
|
|
|
this.$set(
|
|
this.$set(
|
|
|
parasm,
|
|
parasm,
|