|
@@ -93,6 +93,17 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col> -->
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="税点:" prop="tax_rate" :rules="rules.tax_rate">
|
|
|
+ {{ OrderForm.tax_rate }}
|
|
|
+ <!-- <el-select v-model="OrderForm.tax_rate" clearable :disabled="type == 'pone'">
|
|
|
+ <el-option label="0" :value="0" />
|
|
|
+ <el-option label="1%" :value="1" />
|
|
|
+ <el-option label="6%" :value="6" />
|
|
|
+ <el-option label="13%" :value="13" />
|
|
|
+ </el-select> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="24">
|
|
|
<div class="redClass">
|
|
|
<el-form-item label="备注:" prop="remark">
|
|
@@ -135,7 +146,7 @@
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column label="商品编号">
|
|
|
+ <!-- <el-table-column label="商品编号">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.goods_vo.sn }}
|
|
|
</template>
|
|
@@ -174,7 +185,7 @@
|
|
|
{{ scope.row.num }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column label="库存数量">
|
|
|
+ <!-- <el-table-column label="库存数量">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.usable_stock }}
|
|
|
</template>
|
|
@@ -196,7 +207,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="折扣">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.reduction}}
|
|
|
+ {{ scope.row.reduction }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="总价" v-if="OrderForm.type == 'TO_C'">
|
|
@@ -1339,7 +1350,7 @@ export default {
|
|
|
moneyToc += el.money
|
|
|
})
|
|
|
this.TO_Cmoney = moneyToc
|
|
|
- this.totalAmount = moneyToc + response.real_price
|
|
|
+ //this.totalAmount = moneyToc + response.real_price
|
|
|
}
|
|
|
this.OrderForm = response;
|
|
|
if (response.type == "TO_C") {
|
|
@@ -1430,8 +1441,21 @@ export default {
|
|
|
"OrderForm.product_list": {
|
|
|
deep: true,
|
|
|
handler(newVal) {
|
|
|
- newVal.forEach((item) => {
|
|
|
- });
|
|
|
+ /* let totalItemMoney = 0;
|
|
|
+ newVal.forEach(item => {
|
|
|
+ if (this.OrderForm.type == "TO_C") {
|
|
|
+ item.item_money = item.product_vo.day_price * item.num * item.day_num * (item.reduction / 10);
|
|
|
+ } else {
|
|
|
+ item.item_money = item.product_vo.price * item.num * (item.reduction / 10);
|
|
|
+ }
|
|
|
+ totalItemMoney += item.item_money;
|
|
|
+ });
|
|
|
+ //this.OrderForm.real_price = totalItemMoney;*/
|
|
|
+ if (this.OrderForm.tax_rate !== 0) {
|
|
|
+ this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price * (1 + this.OrderForm.tax_rate / 100)
|
|
|
+ } else {
|
|
|
+ this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price
|
|
|
+ }
|
|
|
},
|
|
|
},
|
|
|
$route: {
|