feat: add separate price vat calc
This commit is contained in:
parent
ef81a93690
commit
310464f834
7 changed files with 344 additions and 280 deletions
|
|
@ -1014,6 +1014,10 @@ const currentNoAction = ref(false);
|
|||
const prevProduct = ref<ProductCreate>({
|
||||
expenseType: '',
|
||||
vatIncluded: true,
|
||||
agentPriceVatIncluded: true,
|
||||
agentPriceCalcVat: true,
|
||||
serviceChargeVatIncluded: true,
|
||||
serviceChargeCalcVat: true,
|
||||
productGroupId: '',
|
||||
remark: '',
|
||||
serviceCharge: 0,
|
||||
|
|
@ -1050,6 +1054,10 @@ async function assignFormDataProduct(data: Product) {
|
|||
status: data.status,
|
||||
expenseType: data.expenseType,
|
||||
vatIncluded: data.vatIncluded,
|
||||
serviceChargeCalcVat: data.serviceChargeCalcVat,
|
||||
serviceChargeVatIncluded: data.serviceChargeVatIncluded,
|
||||
agentPriceCalcVat: data.agentPriceCalcVat,
|
||||
agentPriceVatIncluded: data.agentPriceVatIncluded,
|
||||
selectedImage: data.selectedImage,
|
||||
document: data.document,
|
||||
shared: data.shared,
|
||||
|
|
@ -1086,6 +1094,10 @@ function clearFormProduct() {
|
|||
expenseType: '',
|
||||
calcVat: true,
|
||||
vatIncluded: true,
|
||||
agentPriceCalcVat: true,
|
||||
agentPriceVatIncluded: true,
|
||||
serviceChargeCalcVat: true,
|
||||
serviceChargeVatIncluded: true,
|
||||
shared: false,
|
||||
};
|
||||
imageProduct.value = undefined;
|
||||
|
|
@ -3900,7 +3912,12 @@ watch(
|
|||
v-model:service-charge="formProduct.serviceCharge"
|
||||
v-model:vat-included="formProduct.vatIncluded"
|
||||
v-model:calc-vat="formProduct.calcVat"
|
||||
dense
|
||||
v-model:agent-price-vat-included="formProduct.agentPriceVatIncluded"
|
||||
v-model:agent-price-calc-vat="formProduct.agentPriceCalcVat"
|
||||
v-model:service-charge-vat-included="
|
||||
formProduct.serviceChargeVatIncluded
|
||||
"
|
||||
v-model:service-charge-calc-vat="formProduct.serviceChargeCalcVat"
|
||||
/>
|
||||
<FormDocument
|
||||
v-if="productTab === 3"
|
||||
|
|
@ -4109,7 +4126,12 @@ watch(
|
|||
v-model:service-charge="formProduct.serviceCharge"
|
||||
v-model:vat-included="formProduct.vatIncluded"
|
||||
v-model:calc-vat="formProduct.calcVat"
|
||||
dense
|
||||
v-model:agent-price-vat-included="formProduct.agentPriceVatIncluded"
|
||||
v-model:agent-price-calc-vat="formProduct.agentPriceCalcVat"
|
||||
v-model:service-charge-vat-included="
|
||||
formProduct.serviceChargeVatIncluded
|
||||
"
|
||||
v-model:service-charge-calc-vat="formProduct.serviceChargeCalcVat"
|
||||
:priceDisplay="priceDisplay"
|
||||
/>
|
||||
<FormDocument
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue