|
|
@@ -680,7 +680,6 @@
|
|
|
<el-form-item
|
|
|
style="margin-bottom: 20px"
|
|
|
:prop="'datasource.' + scope.$index + '.' + countObj.unitIdKey"
|
|
|
-
|
|
|
>
|
|
|
<el-select
|
|
|
v-model="scope.row[countObj.unitIdKey]"
|
|
|
@@ -892,6 +891,10 @@
|
|
|
type: Boolean,
|
|
|
default: false
|
|
|
},
|
|
|
+ defTaxRate: {
|
|
|
+ type: Number,
|
|
|
+ default: 0
|
|
|
+ },
|
|
|
countObj: {
|
|
|
type: Object,
|
|
|
default: () => {
|
|
|
@@ -913,7 +916,7 @@
|
|
|
workHour: '',
|
|
|
guaranteePeriodUnitCode: '',
|
|
|
technicalDrawings: [],
|
|
|
- arrivalWay:1
|
|
|
+ arrivalWay: 1
|
|
|
};
|
|
|
return {
|
|
|
levelList,
|
|
|
@@ -933,7 +936,7 @@
|
|
|
{ label: '一次性到货', value: 1 },
|
|
|
{ label: '分批到货', value: 2 }
|
|
|
],
|
|
|
- columnsVersion:1
|
|
|
+ columnsVersion: 1
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -941,7 +944,7 @@
|
|
|
return this.form.datasource.length;
|
|
|
},
|
|
|
columns() {
|
|
|
- let columnsVersion=this.columnsVersion
|
|
|
+ let columnsVersion = this.columnsVersion;
|
|
|
let orderColumn = {
|
|
|
width: 1,
|
|
|
show: false
|
|
|
@@ -1705,7 +1708,8 @@
|
|
|
let row = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
row.key = this.form.datasource.length + 1;
|
|
|
let parasm = idx == -1 ? row : this.form.datasource[i];
|
|
|
-
|
|
|
+ console.log(this.defTaxRate,'this.defTaxRate')
|
|
|
+ this.$set(parasm, 'taxRate', this.defTaxRate);
|
|
|
this.$set(parasm, 'productId', item.id);
|
|
|
this.$set(parasm, 'categoryName', item.name);
|
|
|
this.$set(parasm, 'productCategoryId', item.categoryLevelId);
|
|
|
@@ -1720,7 +1724,6 @@
|
|
|
this.$set(parasm, 'weightUnit', item.weightUnit);
|
|
|
this.$set(parasm, 'singleWeight', item.netWeight);
|
|
|
this.$set(parasm, 'pricingWay', 1);
|
|
|
- console.log(item.goodsLevel,'item.goodsLevel')
|
|
|
this.$set(parasm, 'goodsLevel', item.goodsLevel);
|
|
|
this.$set(
|
|
|
parasm,
|
|
|
@@ -1748,7 +1751,7 @@
|
|
|
this.$set(parasm, 'orderNo', this.orderOption[0]?.orderNo);
|
|
|
this.$set(parasm, 'orderId', this.orderOption[0]?.orderId);
|
|
|
}
|
|
|
- if (this.isGoods) {
|
|
|
+ if (this.isGoods&&item.goodsId) {
|
|
|
this.$set(parasm, 'goodsId', item.goodsId);
|
|
|
this.$set(parasm, 'goodsPriceId', item.goodsPriceId);
|
|
|
this.$set(parasm, 'goodsPriceType', item.goodsPriceType);
|