税率重新计算

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -194,11 +194,11 @@
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
                     <span v-else>{{ row.remarks }}</span>
                 </template>
-                <template slot="usdAmountNet" slot-scope="{ row }">
+                <template slot="usdAmount" slot-scope="{ row }">
                     <span v-if="row.isTax">{{ taxAmount(row, 2) }}</span>
                     <span v-else>{{ row.usdAmount }}</span>
                 </template>
-                <template slot="rmbAmountNet" slot-scope="{ row }">
+                <template slot="rmbAmount" slot-scope="{ row }">
                     <span v-if="row.isTax">{{ taxAmount(row, 1) }}</span>
                     <span v-else>{{ row.rmbAmount }}</span>
                 </template>
@@ -1041,26 +1041,26 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "CNY(含税)",
-                        prop: "rmbAmount",
+                        label: "CNY(净额)",
+                        prop: "rmbAmountNet",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "USD(含税)",
-                        prop: "usdAmount",
+                        label: "USD(净额)",
+                        prop: "usdAmountNet",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "CNY(净额)",
-                        prop: "rmbAmountNet",
+                        label: "CNY(含税)",
+                        prop: "rmbAmount",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "USD(净额)",
-                        prop: "usdAmountNet",
+                        label: "USD(含税)",
+                        prop: "usdAmount",
                         width: "100",
                         overHidden: true,
                     },
@@ -1537,11 +1537,11 @@ export default {
                 let nowTaxRate = Number(row.taxRate)
                 let nowSurchargeRate = Number(row.surchargeRate)
                 console.info(nowTaxRate, nowSurchargeRate)
-                if (nowTaxRate < 1 || nowSurchargeRate < 1) {
+                if (nowTaxRate < 1 && nowSurchargeRate < 1) {
                     // 输入的小数税率
-                    return type === 1 ? row.rmbAmount ? row.rmbAmount * (1 + nowTaxRate + nowSurchargeRate) : row.rmbAmount : row.usdAmount ? row.usdAmount * (1 + nowTaxRate + nowSurchargeRate) : row.usdAmount
+                    return type === 1 ? row.rmbAmountNet ? row.rmbAmountNet * (1 + nowTaxRate + nowSurchargeRate) : row.rmbAmountNet : row.usdAmountNet ? row.usdAmountNet * (1 + nowTaxRate + nowSurchargeRate) : row.usdAmountNet
                 }
-                return type === 1 ? row.rmbAmount ? row.rmbAmount * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.rmbAmount : row.usdAmount ? row.usdAmount * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.usdAmount
+                return type === 1 ? row.rmbAmountNet ? row.rmbAmountNet * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.rmbAmountNet : row.usdAmountNet ? row.usdAmountNet * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.usdAmountNet
             }
         },
         getSum() {
@@ -2574,13 +2574,13 @@ export default {
                 }
             }
             if (row.curCode == 'CNY') {
-                this.$set(row, 'rmbAmount', row.amount.toFixed(2))
-                this.$set(row, 'usdAmount', '')
+                // this.$set(row, 'rmbAmount', row.amount.toFixed(2))
+                // this.$set(row, 'usdAmount', '')
                 this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
                 this.$set(row, 'usdAmountNet', '')
             } else {
-                this.$set(row, 'usdAmount', row.amount.toFixed(2))
-                this.$set(row, 'rmbAmount', '')
+                // this.$set(row, 'usdAmount', row.amount.toFixed(2))
+                // this.$set(row, 'rmbAmount', '')
                 this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
                 this.$set(row, 'rmbAmountNet', '')
             }
@@ -2637,11 +2637,11 @@ export default {
                 }
             }
             if (row.curCode == 'CNY') {
-                this.$set(row, 'rmbAmount', row.amount.toFixed(2))
-                this.$set(row, 'usdAmount', '')
+                this.$set(row, 'rmbAmountNet', row.amount.toFixed(2))
+                this.$set(row, 'usdAmountNet', '')
             } else {
-                this.$set(row, 'usdAmount', row.amount.toFixed(2))
-                this.$set(row, 'rmbAmount', '')
+                this.$set(row, 'usdAmountNet', row.amount.toFixed(2))
+                this.$set(row, 'rmbAmountNet', '')
             }
         },
         // 保存接口