From 38c26c3049d55ffda598ce0263498448b7c60834 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:34:45 +0800
Subject: [PATCH] 增加增值税城建税
---
src/views/project/travelexpensedeal/index.vue | 15 +
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 15 +
src/views/project/tallage/index.vue | 9
src/views/project/fundcheck/officeExpenseCheck/index.vue | 15 +
src/views/project/fund/performancedetails/index.vue | 10
src/views/project/fund/applyDetail/index.vue | 16 +-
src/views/project/fund/expertFeeApply/index.vue | 14
src/views/project/donateconsolationfund/index.vue | 26 ++
src/views/project/fund/applyDetail0/index.vue | 30 +-
src/views/project/fund/ethicalExpertFeeApply/index.vue | 8
src/views/project/funddetail/index.vue | 7
src/views/project/fundcheck/medicalCostCheck/index.vue | 15 +
src/views/project/fundcheck/expertFeeCheck/index.vue | 15 +
src/views/project/fund/officeExpenseApply/index.vue | 12
src/views/project/tallage/computingBill/index.vue | 225 +++++++++++++++++++---------
src/views/project/distributedetail/index.vue | 15 +
16 files changed, 285 insertions(+), 162 deletions(-)
diff --git a/src/views/project/distributedetail/index.vue b/src/views/project/distributedetail/index.vue
index a488757..944caea 100644
--- a/src/views/project/distributedetail/index.vue
+++ b/src/views/project/distributedetail/index.vue
@@ -211,8 +211,11 @@
<el-table-column label="鏁伴噺" align="center" prop="quantity" />
<el-table-column label="浠锋牸" align="center" prop="price" />
<el-table-column label="鐢宠閲戦" align="center" prop="amount" />
- <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taxamount" />
- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" />
+ <el-table-column label="澧炲�肩◣" align="center" prop="vatAmount" />
+ <el-table-column label="鍩庡缓绋�" align="center" prop="cityTaxAmount" />
+ <el-table-column label="鍔冲姟绋庡墠" align="center" prop="laborPretaxAmount" />
+ <el-table-column label="鍔冲姟涓◣" align="center" prop="taxamount" />
+ <el-table-column label="鍔冲姟绋庡悗" align="center" prop="taxedamount" />
<el-table-column label="棰勬敮閲戦" align="center" prop="prepaidamount" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" />
@@ -348,11 +351,11 @@
<el-form-item label="鐢宠閲戦" prop="amount">
<el-input v-model="form.amount" placeholder="璇疯緭鍏ョ敵璇烽噾棰�" />
</el-form-item>
- <el-form-item label="鎵ｇ◣閲戦" prop="taxamount">
- <el-input v-model="form.taxamount" placeholder="璇疯緭鍏ユ墸绋庨噾棰�" />
+ <el-form-item label="鍔冲姟涓◣" prop="taxamount">
+ <el-input v-model="form.taxamount" placeholder="璇疯緭鍏ュ姵鍔′釜绋�" />
</el-form-item>
- <el-form-item label="绋庡悗閲戦" prop="taxedamount">
- <el-input v-model="form.taxedamount" placeholder="璇疯緭鍏ョ◣鍚庨噾棰�" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="taxedamount">
+ <el-input v-model="form.taxedamount" placeholder="璇疯緭鍏ュ姵鍔＄◣鍚�" />
</el-form-item>
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="璇疯緭鍏ラ鏀噾棰�" />
diff --git a/src/views/project/donateconsolationfund/index.vue b/src/views/project/donateconsolationfund/index.vue
index d9c91ff..e69329d 100644
--- a/src/views/project/donateconsolationfund/index.vue
+++ b/src/views/project/donateconsolationfund/index.vue
@@ -526,25 +526,43 @@
</template>
</el-table-column>
<el-table-column
+ prop="vatAmount"
+ align="center"
+ label="澧炲�肩◣"
+ width="120"
+ />
+ <el-table-column
+ prop="cityTaxAmount"
+ align="center"
+ label="鍩庡缓绋�"
+ width="120"
+ />
+ <el-table-column
+ prop="laborPretaxAmount"
+ align="center"
+ label="鍔冲姟绋庡墠"
+ width="130"
+ />
+ <el-table-column
prop="taxamount"
align="center"
- label="鎵ｇ◣"
+ label="鍔冲姟涓◣"
width="150"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" />
+ <el-input v-model="scope.row.taxamount" placeholder="鍔冲姟涓◣" />
</template>
</el-table-column>
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="150"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
/>
</template>
</el-table-column>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 715f80a..c83ab67 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -178,18 +178,18 @@
<el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="
+ <el-table-column prop="taxamount" align="center" label="鍔冲姟涓◣" width="120" v-if="
ismanager == true &&
(businessType == '1' || businessType == '2')
">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣閲戦" />
+ <el-input v-model="scope.row.taxamount" placeholder="鍔冲姟涓◣" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120"
+ <el-table-column prop="taxedamount" align="center" label="鍔冲姟绋庡悗" width="120"
v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ <el-input v-model="scope.row.taxedamount" placeholder="鍔冲姟绋庡悗" />
</template>
</el-table-column>
<el-table-column prop="beneficiaryname" column-key="sdad" align="center" :label="beneficiarylabel"
@@ -542,7 +542,7 @@
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountlabel">
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="
+ <el-table-column prop="taxedamount" align="center" label="鍔冲姟绋庡悗" v-if="
(this.ismanager == true) &
(form.applytype == '1' || form.applytype == '2')
">
@@ -1654,7 +1654,7 @@
}
this.rbDetails[i] = tempDetail;
}
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佸姵鍔′釜绋庯紙taxamount锛夈�佸姵鍔＄◣鍚庯紙taxedamount锛�
if (this.businessType == "2") {
for (let j = 0; j < this.rbDetails.length; j++) {
let tempDetail = this.rbDetails[j];
@@ -2257,7 +2257,7 @@
});
},
- //璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
+ //璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楀姵鍔＄◣鍚庯紱B锛氬凡鐭ュ姵鍔＄◣鍚庯紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
for (let i = 0; i < this.rbDetails.length; i++) {
if (!this.rbDetails[i].amount) {
@@ -2433,7 +2433,7 @@
}
this.rbDetails[i] = tempDetail;
}
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佸姵鍔′釜绋庯紙taxamount锛夈�佸姵鍔＄◣鍚庯紙taxedamount锛�
if (this.businessType == "2") {
for (let j = 0; j < this.rbDetails.length; j++) {
let tempDetail = this.rbDetails[j];
diff --git a/src/views/project/fund/applyDetail0/index.vue b/src/views/project/fund/applyDetail0/index.vue
index f770dec..2f9b599 100644
--- a/src/views/project/fund/applyDetail0/index.vue
+++ b/src/views/project/fund/applyDetail0/index.vue
@@ -119,13 +119,13 @@
<!--
<el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
- <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
+ <el-form-item label="鍔冲姟涓◣" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
+ <el-input v-model="form.taxcost" placeholder="鍔冲姟涓◣鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" :disabled="true" />
</el-form-item>
</el-col>-->
<el-col :span="10">
@@ -328,7 +328,7 @@
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="120"
v-if="
(this.ismanager == true) &
@@ -338,7 +338,7 @@
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
@blur="
val => {
calculateTax(scope.row, 'B');
@@ -1951,7 +1951,7 @@
//鑾峰彇鍙傛暟
this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
+ // 璁＄畻鍔冲姟绋庡悗
if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.amount.toString();
@@ -1967,7 +1967,7 @@
});
}
- // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
+ // 璁＄畻绋庡墠銆佺◣璐广�佸姵鍔＄◣鍚�
if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1984,7 +1984,7 @@
}
*/
}
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佸姵鍔′釜绋庯紙taxamount锛夈�佸姵鍔＄◣鍚庯紙taxedamount锛�
if (this.businessType == "2") {
for (let j = 0; j < this.rbDetails.length; j++) {
let tempDetail = this.rbDetails[j];
@@ -2317,7 +2317,7 @@
row.taxamount = 0.0;
row.taxedamount = 0.0;
- //璁＄畻绋庡悗閲戦
+ //璁＄畻鍔冲姟绋庡悗
// this.calculateTax(row, "A");
}
@@ -2427,7 +2427,7 @@
});
},
- //璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
+ //璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楀姵鍔＄◣鍚庯紱B锛氬凡鐭ュ姵鍔＄◣鍚庯紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
//if (isNaN(parseFloat(tempDetail.taxedamount)))
//鑾峰彇鍙傛暟
@@ -2435,7 +2435,7 @@
this.taxParam.startTime = this.form.createTime.substring(0, 10);
if (type == "A") {
- // 璁＄畻涓◣銆佺◣鍚庨噾棰�
+ // 璁＄畻涓◣銆佸姵鍔＄◣鍚�
this.taxParam.money = row.amount.toString();
getTaxByBeneFiciaryNo(this.taxParam).then(res => {
if (res.code == 200) {
@@ -2636,7 +2636,7 @@
//鑾峰彇鍙傛暟
this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
+ // 璁＄畻鍔冲姟绋庡悗
if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.amount.toString();
@@ -2652,7 +2652,7 @@
});
}
- // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
+ // 璁＄畻绋庡墠銆佺◣璐广�佸姵鍔＄◣鍚�
if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.taxedamount.toString();
@@ -2669,7 +2669,7 @@
}
*/
}
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佸姵鍔′釜绋庯紙taxamount锛夈�佸姵鍔＄◣鍚庯紙taxedamount锛�
if (this.businessType == "2") {
for (let j = 0; j < this.rbDetails.length; j++) {
let tempDetail = this.rbDetails[j];
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index 6e6576e..1348c13 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -432,10 +432,10 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
+ <el-form-item label="鍔冲姟绋庡悗" prop="pretaxcost">
<el-input
v-model="form.taxedcost"
- placeholder="绋庡悗閲戦鍚堣"
+ placeholder="鍔冲姟绋庡悗鍚堣"
:disabled="true"
/>
</el-form-item>
@@ -609,14 +609,14 @@
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="120"
v-if="form.applytype != '3'"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
@blur="
val => {
sumTotalFee();
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 1c0e30f..17f9915 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -469,17 +469,17 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost">
+ <el-form-item label="鍔冲姟涓◣" prop="taxcost">
<el-input
v-model="form.taxcost"
- placeholder="搴旂即绋庨噾棰濆悎璁�"
+ placeholder="鍔冲姟涓◣鍚堣"
:disabled="true"
/>
</el-form-item> </el-col
><!--
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" :disabled="true" />
</el-form-item>
</el-col>-->
<el-col :span="5">
@@ -643,7 +643,7 @@
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="120"
v-if="this.ismanager == true"
>
@@ -651,7 +651,7 @@
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
/>
</template>
</el-table-column>
@@ -1786,7 +1786,7 @@
//鑾峰彇鍙傛暟
this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
+ // 璁＄畻鍔冲姟绋庡悗
if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.amount.toString();
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 507427d..46a5c8f 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -311,8 +311,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -476,14 +476,14 @@
<el-table-column
prop="taxamount"
align="center"
- label="鎵ｇ◣"
+ label="鍔冲姟涓◣"
width="120"
v-if="form.applytype != '3'"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.taxamount"
- placeholder="鎵ｇ◣"
+ placeholder="鍔冲姟涓◣"
@blur="
val => {
sumTotalFee(scope.row);
@@ -495,14 +495,14 @@
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="120"
v-if="form.applytype != '3'"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
/>
</template>
</el-table-column>
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 14e574c..e9358a6 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -250,27 +250,27 @@
<el-table-column
prop="taxamount"
align="center"
- label="鎵ｇ◣閲戦"
+ label="鍔冲姟涓◣"
width="120"
>
<template slot-scope="scope">
<el-input
@blur="chargeSum"
v-model="scope.row.taxamount"
- placeholder="鎵ｇ◣閲戦"
+ placeholder="鍔冲姟涓◣"
/>
</template>
</el-table-column>
<el-table-column
prop="taxedamount"
align="center"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
width="120"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
@blur="queenchargeSum"
/>
</template>
@@ -1795,7 +1795,7 @@
}
this.rbDetails[i] = tempDetail;
}
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佸姵鍔′釜绋庯紙taxamount锛夈�佸姵鍔＄◣鍚庯紙taxedamount锛�
if (this.businessType == "2") {
for (let j = 0; j < this.rbDetails.length; j++) {
let tempDetail = this.rbDetails[j];
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 4b31bfd..42dc721 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -251,16 +251,19 @@
<!-- <el-table-column
prop="taxamount"
align="center"
- label="鎵ｇ◣"
+ label="鍔冲姟涓◣"
width="150"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" />
+ <el-input v-model="scope.row.taxamount" placeholder="鍔冲姟涓◣" />
</template>
</el-table-column> -->
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="150">
+ <el-table-column prop="vatAmount" align="center" label="澧炲�肩◣" width="120" />
+ <el-table-column prop="cityTaxAmount" align="center" label="鍩庡缓绋�" width="120" />
+ <el-table-column prop="laborPretaxAmount" align="center" label="鍔冲姟绋庡墠" width="130" />
+ <el-table-column prop="taxedamount" align="center" label="鍔冲姟绋庡悗" width="150">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="
+ <el-input v-model="scope.row.taxedamount" placeholder="鍔冲姟绋庡悗" @blur="
val => {
sumTotalFee();
}
@@ -323,8 +326,8 @@
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="绋庡悗閲戦鍚堣" prop="amountrequested">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ <el-form-item label="鍔冲姟绋庡悗鍚堣" prop="amountrequested">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" />
</el-form-item>
</el-col>
<el-col :span="7">
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 4bddc41..af38956 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -107,7 +107,7 @@
<el-table-column label="缁忓姙浜�" align="center" prop="username" width="90px" />
<!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> -->
<!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> -->
- <!-- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedcost" width="120px" />
+ <!-- <el-table-column label="鍔冲姟绋庡悗" align="center" prop="taxedcost" width="120px" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> -->
<el-table-column label="鏉愭枡棰勫鐘舵��" align="center" prop="checkstatus" width="140px">
@@ -223,7 +223,7 @@
</el-row>
<el-row>
<!-- <el-col :span="5">
- <el-form-item label="鎵ｇ◣閲戦" prop="amountrequested">
+ <el-form-item label="鍔冲姟涓◣" prop="amountrequested">
<el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
</el-form-item>
</el-col> -->
@@ -233,8 +233,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗鍚堣" prop="taxedcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ <el-form-item label="鍔冲姟绋庡悗鍚堣" prop="taxedcost">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" />
</el-form-item> </el-col><!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
@@ -309,9 +309,12 @@
" placeholder="绋庡墠閲戦" />
</template>
</el-table-column>
- <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="绋庡悗閲戦" width="100">
+ <el-table-column v-if="show === 1" prop="vatAmount" align="center" label="澧炲�肩◣" width="100" />
+ <el-table-column v-if="show === 1" prop="cityTaxAmount" align="center" label="鍩庡缓绋�" width="100" />
+ <el-table-column v-if="show === 1" prop="laborPretaxAmount" align="center" label="鍔冲姟绋庡墠" width="110" />
+ <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="鍔冲姟绋庡悗" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ <el-input v-model="scope.row.taxedamount" placeholder="鍔冲姟绋庡悗" />
</template>
</el-table-column>
<!--
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 25819e0..5a6469c 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -219,8 +219,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="amountrequested">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="amountrequested">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -286,14 +286,17 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
+ <el-table-column prop="vatAmount" align="center" label="澧炲�肩◣" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="cityTaxAmount" align="center" label="鍩庡缓绋�" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="laborPretaxAmount" align="center" label="鍔冲姟绋庡墠" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="taxamount" align="center" label="鍔冲姟涓◣" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" />
+ <el-input v-model="scope.row.taxamount" placeholder="鍔冲姟涓◣" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
+ <el-table-column prop="taxedamount" align="center" label="鍔冲姟绋庡悗" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ <el-input v-model="scope.row.taxedamount" placeholder="鍔冲姟绋庡悗" />
</template>
</el-table-column>
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index fdfd72b..6f33848 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -222,8 +222,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="amountrequested">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="amountrequested">
+ <el-input v-model="form.taxedcost" placeholder="鍔冲姟绋庡悗鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -289,14 +289,17 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
+ <el-table-column prop="vatAmount" align="center" label="澧炲�肩◣" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="cityTaxAmount" align="center" label="鍩庡缓绋�" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="laborPretaxAmount" align="center" label="鍔冲姟绋庡墠" width="120" v-if="form.applytype != '3'" />
+ <el-table-column prop="taxamount" align="center" label="鍔冲姟涓◣" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" />
+ <el-input v-model="scope.row.taxamount" placeholder="鍔冲姟涓◣" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
+ <el-table-column prop="taxedamount" align="center" label="鍔冲姟绋庡悗" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ <el-input v-model="scope.row.taxedamount" placeholder="鍔冲姟绋庡悗" />
</template>
</el-table-column>
diff --git a/src/views/project/funddetail/index.vue b/src/views/project/funddetail/index.vue
index bca48aa..9c377bc 100644
--- a/src/views/project/funddetail/index.vue
+++ b/src/views/project/funddetail/index.vue
@@ -71,8 +71,11 @@
<el-table-column label="椤圭洰绫诲埆" align="center" prop="itemtype" />
<el-table-column label="璐圭敤椤圭洰鍚嶇О" align="left" prop="itemname" />
<el-table-column label="璐圭敤閲戦" align="center" prop="amount" />
- <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taxamount" />
- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" />
+ <el-table-column label="澧炲�肩◣" align="center" prop="vatAmount" />
+ <el-table-column label="鍩庡缓绋�" align="center" prop="cityTaxAmount" />
+ <el-table-column label="鍔冲姟绋庡墠" align="center" prop="laborPretaxAmount" />
+ <el-table-column label="鍔冲姟涓◣" align="center" prop="taxamount" />
+ <el-table-column label="鍔冲姟绋庡悗" align="center" prop="taxedamount" />
<!--
<el-table-column label="涓撳鍗曚綅" align="center" prop="uintname" />
<el-table-column label="璇佷欢鍙风爜" align="center" prop="idcardno" />
diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index b1412ce..508a1cf 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -61,21 +61,50 @@
</el-form-item>
</el-col>
<el-col :span="6"
- ><el-form-item label="鎵ｇ◣閲戦" prop="donateno">
+ ><el-form-item label="澧炲�肩◣" prop="donateno">
+ <el-input
+ v-model="form.vatAmount"
+ :disabled="true"
+ placeholder="璇疯緭鍏ュ鍊肩◣"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6"
+ ><el-form-item label="鍩庡缓绋�" prop="donateno">
+ <el-input
+ v-model="form.cityTaxAmount"
+ :disabled="true"
+ placeholder="璇疯緭鍏ュ煄寤虹◣"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6"
+ ><el-form-item label="鍔冲姟绋庡墠" prop="donateno">
+ <el-input
+ v-model="form.laborPretaxAmount"
+ :disabled="true"
+ placeholder="璇疯緭鍏ュ姵鍔＄◣鍓�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6"
+ ><el-form-item label="鍔冲姟涓◣" prop="donateno">
<el-input
v-model="form.taxMoney"
:disabled="true"
- placeholder="璇疯緭鍏ユ墸绋庨噾棰�"
+ placeholder="璇疯緭鍏ュ姵鍔′釜绋�"
/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绋庡悗閲戦" prop="donationcategory">
+ <el-form-item label="鍔冲姟绋庡悗" prop="donationcategory">
<el-input
v-model="form.taxedamount"
:disabled="true"
- placeholder="璇疯緭鍏ユ敹娆捐鍙�"
+ placeholder="璇疯緭鍏ュ姵鍔＄◣鍚�"
/>
</el-form-item>
</el-col>
@@ -195,23 +224,50 @@
/>
</template>
</el-table-column>
- <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taXmoney">
+ <el-table-column prop="vatCost" align="center" label="澧炲�肩◣">
<template slot-scope="scope">
<el-input
- v-model="scope.row.taXmoney"
+ v-model="scope.row.vatCost"
:disabled="true"
- placeholder="鎵ｇ◣閲戦"
+ placeholder="澧炲�肩◣"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="cityTaxCost" align="center" label="鍩庡缓绋�">
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.cityTaxCost"
+ :disabled="true"
+ placeholder="鍩庡缓绋�"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="laborPretaxCost" align="center" label="鍔冲姟绋庡墠">
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.laborPretaxCost"
+ :disabled="true"
+ placeholder="鍔冲姟绋庡墠"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="鍔冲姟涓◣" align="center" prop="taxcost">
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.taxcost"
+ :disabled="true"
+ placeholder="鍔冲姟涓◣"
/>
</template>
</el-table-column>
- <el-table-column prop="taxedcost" align="center" label="绋庡悗閲戦">
+ <el-table-column prop="taxedcost" align="center" label="鍔冲姟绋庡悗">
<template slot-scope="scope">
<el-input
@blur="chargeSum"
:disabled="true"
v-model="scope.row.taxedcost"
- placeholder="绋庡悗閲戦"
+ placeholder="鍔冲姟绋庡悗"
/>
</template>
</el-table-column>
@@ -397,14 +453,32 @@
>
</el-table-column>
<el-table-column
- prop="taXmoney"
- label="鎵ｇ◣閲戦"
+ prop="vatCost"
+ label="澧炲�肩◣"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="cityTaxCost"
+ label="鍩庡缓绋�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="laborPretaxCost"
+ label="鍔冲姟绋庡墠"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="taxcost"
+ label="鍔冲姟涓◣"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="taxedcost"
- label="绋庡悗閲戦"
+ label="鍔冲姟绋庡悗"
show-overflow-tooltip
>
</el-table-column>
@@ -812,8 +886,6 @@
});
}
this.donorchargeorgans.forEach(item => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
this.accumulation();
});
if (this.form.id) {
@@ -828,47 +900,81 @@
this.dialogVisiblepatient = false;
},
- // 璁＄畻涓◣
+ // 璁＄畻涓◣锛堝厛淇濆瓨褰撳墠鍗曟嵁锛屼繚瀛樻垚鍔熷悗鍐嶇畻绋庯紱绠楃◣鎴愬姛鍚庝粠鍚庣閲嶆柊鍔犺浇锛屼笉鍐嶇敤椤甸潰鏃ч噾棰濆洖鍐欙級
calculateFn() {
if (this.form.id >= this.MaxFundTaxId) {
- this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
this.$modal
- .confirm("鍗冲皢杩涜绠楃◣鏄惁宸蹭繚瀛樺叏閮ㄦ暟鎹�?")
- .then(res => {
- listbxiaostatistics({
- fundTaxId: Number(this.form.id),
- addOrupdate: 1
- }).then(res1 => {
- if (res1.code == 200) {
- this.$modal.msgSuccess("璁＄畻鎴愬姛");
- this.$modal.closeLoading();
- this.form.istax = 1;
- this.form.taxedtime = this.$moment().format(
- "YYYY-MM-DD HH:mm:ss"
- );
- this.submitForm();
- } else {
- this.$modal.closeLoading();
- this.$modal.msgError(res1.msg);
+ .confirm("绠楃◣鍓嶄細鍏堜繚瀛樺綋鍓嶅崟鎹紝鏄惁缁х画?")
+ .then(() => {
+ this.form.serviceFunds = this.donorchargeorgans;
+ this.$refs["form"].validate(valid => {
+ if (!valid) {
+ this.$modal.msgError("鍗曟嵁鏍￠獙鏈�氳繃锛岃妫�鏌ュ悗閲嶈瘯");
+ return;
}
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+ updateFundtax(this.form).then(res0 => {
+ if (res0.code != 200) {
+ this.$modal.closeLoading();
+ this.$modal.msgError(res0.msg);
+ return;
+ }
+ listbxiaostatistics({
+ fundTaxId: Number(this.form.id),
+ addOrupdate: 1
+ }).then(res1 => {
+ if (res1.code == 200) {
+ // 鍚庣宸插洖鍐� service_fund / service_fundtax锛岃繖閲屽彧鍋氶噸鏂板姞杞�
+ this.refreshFundtax().then(() => {
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("璁＄畻鎴愬姛");
+ });
+ } else {
+ this.$modal.closeLoading();
+ this.$modal.msgError(res1.msg);
+ }
+ });
+ });
});
})
-
.catch(() => {});
} else {
this.$modal.msgError("褰撳墠鍗曟嵁涓嶄负鏈�鏂扮敵璇峰崟");
}
},
- // 閲戦鍚堣
+ // 浠庡悗绔噸鏂板姞杞芥眹鎬诲崟锛堝惈鏄庣粏鍗曟嵁琛岋級骞堕噸绠楀悎璁�
+ refreshFundtax() {
+ return getFundtax(this.form.id).then(response => {
+ this.form = response.data;
+ if (this.form.serviceFunds && this.form.serviceFunds[0]) {
+ this.donorchargeorgans = this.form.serviceFunds;
+ this.donorchargeorgans.forEach((item, index) => {
+ item.index = index + 1;
+ });
+ }
+ this.accumulation();
+ return response;
+ });
+ },
+ // 閲戦鍚堣锛�6 涓噾棰濆叏閮ㄥ彇鑷崟鎹笂鐨勫悗绔噾棰濓紝涓嶅啀鐢ㄢ�滅◣鍓�-绋庡悗鈥濆�掔畻锛�
accumulation() {
this.form.pretaxamount = this.donorchargeorgans
- .reduce((acc, obj) => acc + Number(obj.pretaxcost), 0)
+ .reduce((acc, obj) => acc + Number(obj.pretaxcost || 0), 0)
+ .toFixed(2);
+ this.form.vatAmount = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.vatCost || 0), 0)
+ .toFixed(2);
+ this.form.cityTaxAmount = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.cityTaxCost || 0), 0)
+ .toFixed(2);
+ this.form.laborPretaxAmount = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.laborPretaxCost || 0), 0)
.toFixed(2);
this.form.taxMoney = this.donorchargeorgans
- .reduce((acc, obj) => acc + Number(obj.taXmoney), 0)
+ .reduce((acc, obj) => acc + Number(obj.taxcost || 0), 0)
.toFixed(2);
this.form.taxedamount = this.donorchargeorgans
- .reduce((acc, obj) => acc + Number(obj.taxedcost), 0)
+ .reduce((acc, obj) => acc + Number(obj.taxedcost || 0), 0)
.toFixed(2);
},
// 澶氶�夋閫変腑鏁版嵁
@@ -1011,14 +1117,12 @@
this.title = "涓撳璐规眹鎬诲崟缂栬緫";
getFundtax(this.curId).then(response => {
this.form = response.data;
- if (this.form.serviceFunds[0]) {
+ if (this.form.serviceFunds && this.form.serviceFunds[0]) {
this.donorchargeorgans = this.form.serviceFunds;
this.donorchargeorgans.forEach((item, index) => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
item.index = index + 1;
- this.accumulation();
});
+ this.accumulation();
}
});
},
@@ -1028,14 +1132,12 @@
this.title = "鏌ョ湅涓撳璐规眹鎬诲崟";
getFundtax(this.curId).then(response => {
this.form = response.data;
- if (this.form.serviceFunds[0]) {
+ if (this.form.serviceFunds && this.form.serviceFunds[0]) {
this.donorchargeorgans = this.form.serviceFunds;
this.donorchargeorgans.forEach((item, index) => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
item.index = index + 1;
- this.accumulation();
});
+ this.accumulation();
}
});
},
@@ -1053,21 +1155,10 @@
if (this.form.id != null) {
updateFundtax(this.form).then(res1 => {
if (res1.code == 200) {
- console.log(3);
this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
- getFundtax(this.form.id).then(response => {
- this.form = response.data;
- if (this.form.serviceFunds[0]) {
- this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach((item, index) => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
- item.index = index + 1;
- this.accumulation();
- });
- }
+ this.refreshFundtax().then(() => {
+ this.$modal.closeLoading();
});
- this.$modal.closeLoading();
} else {
this.$modal.closeLoading();
this.$modal.msgError(res1.msg);
@@ -1077,20 +1168,10 @@
addFundtax(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("鏂板鎴愬姛锛�");
- getFundtax(response.data.fundTaxId).then(res => {
- this.form = res.data;
- if (this.form.serviceFunds[0]) {
- this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach((item, index) => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
- item.index = index + 1;
-
- this.accumulation();
- });
- }
+ this.form.id = response.data.fundTaxId;
+ this.refreshFundtax().then(() => {
+ this.$modal.closeLoading();
});
- this.$modal.closeLoading();
} else {
this.$modal.msgError(response.msg);
this.$modal.closeLoading();
diff --git a/src/views/project/tallage/index.vue b/src/views/project/tallage/index.vue
index 1d1c38c..3d14b11 100644
--- a/src/views/project/tallage/index.vue
+++ b/src/views/project/tallage/index.vue
@@ -97,10 +97,13 @@
prop="applyno"
/>
- <el-table-column label="绋庡墠閲戦" align="center" prop="pretaxamount" width="100" >
+ <el-table-column label="绋庡墠閲戦" align="center" prop="pretaxamount" width="110" >
</el-table-column>
- <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taxMoney" width="100" />
- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" width="100" />
+ <el-table-column label="澧炲�肩◣" align="center" prop="vatAmount" width="100" />
+ <el-table-column label="鍩庡缓绋�" align="center" prop="cityTaxAmount" width="100" />
+ <el-table-column label="鍔冲姟绋庡墠" align="center" prop="laborPretaxAmount" width="110" />
+ <el-table-column label="鍔冲姟涓◣" align="center" prop="taxMoney" width="100" />
+ <el-table-column label="鍔冲姟绋庡悗" align="center" prop="taxedamount" width="100" />
<el-table-column label="鏄惁绠楃◣" align="center" prop="istax" width="90" >
<template slot-scope="scope">
<dict-tag
diff --git a/src/views/project/travelexpensedeal/index.vue b/src/views/project/travelexpensedeal/index.vue
index 90705e9..8adedc2 100644
--- a/src/views/project/travelexpensedeal/index.vue
+++ b/src/views/project/travelexpensedeal/index.vue
@@ -163,10 +163,13 @@
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="itemname" />
<el-table-column label="椤圭洰绫诲埆" align="center" prop="itemtype" />
<el-table-column label="鐢宠閲戦" align="center" prop="amount" />
+ <el-table-column label="澧炲�肩◣" align="center" prop="vatAmount" />
+ <el-table-column label="鍩庡缓绋�" align="center" prop="cityTaxAmount" />
+ <el-table-column label="鍔冲姟绋庡墠" align="center" prop="laborPretaxAmount" />
<el-table-column label="棰勬敮閲戦" align="center" prop="prepaidamount" />
- <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taxamount" />
+ <el-table-column label="鍔冲姟涓◣" align="center" prop="taxamount" />
<el-table-column label="鍙戠エ寮犳暟" align="center" prop="invoicecount" />
- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" />
+ <el-table-column label="鍔冲姟绋庡悗" align="center" prop="taxedamount" />
<el-table-column label="闄勪欢寮犳暟" align="center" prop="attachcount" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" />
@@ -318,14 +321,14 @@
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="璇疯緭鍏ラ鏀噾棰�" />
</el-form-item>
- <el-form-item label="鎵ｇ◣閲戦" prop="taxamount">
- <el-input v-model="form.taxamount" placeholder="璇疯緭鍏ユ墸绋庨噾棰�" />
+ <el-form-item label="鍔冲姟涓◣" prop="taxamount">
+ <el-input v-model="form.taxamount" placeholder="璇疯緭鍏ュ姵鍔′釜绋�" />
</el-form-item>
<el-form-item label="鍙戠エ寮犳暟" prop="invoicecount">
<el-input v-model="form.invoicecount" placeholder="璇疯緭鍏ュ彂绁ㄥ紶鏁�" />
</el-form-item>
- <el-form-item label="绋庡悗閲戦" prop="taxedamount">
- <el-input v-model="form.taxedamount" placeholder="璇疯緭鍏ョ◣鍚庨噾棰�" />
+ <el-form-item label="鍔冲姟绋庡悗" prop="taxedamount">
+ <el-input v-model="form.taxedamount" placeholder="璇疯緭鍏ュ姵鍔＄◣鍚�" />
</el-form-item>
<el-form-item label="闄勪欢寮犳暟" prop="attachcount">
<el-input v-model="form.attachcount" placeholder="璇疯緭鍏ラ檮浠跺紶鏁�" />
--
Gitblit v1.9.3