Merge remote-tracking branch 'origin/dev' into dev

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

@@ -195,11 +195,11 @@
                     <span v-else>{{ row.remarks }}</span>
                 </template>
                 <template slot="usdAmountNet" slot-scope="{ row }">
-                    <span v-if="row.isTax">{{taxAmount(row, 2)}}</span>
+                    <span v-if="row.isTax">{{ taxAmount(row, 2) }}</span>
                     <span v-else>{{ row.usdAmount }}</span>
                 </template>
                 <template slot="rmbAmountNet" slot-scope="{ row }">
-                    <span v-if="row.isTax">{{taxAmount(row, 1)}}</span>
+                    <span v-if="row.isTax">{{ taxAmount(row, 1) }}</span>
                     <span v-else>{{ row.rmbAmount }}</span>
                 </template>
                 <template slot-scope="scope" slot="menu">
@@ -1532,15 +1532,17 @@ export default {
         this.paymodeWorkDictsfun() // 获取预付/到付数据
     },
     methods: {
-        taxAmount (row, type) {
-            let nowTaxRate = Number(row.taxRate)
-            let nowSurchargeRate = Number(row.surchargeRate)
-            console.info(nowTaxRate, nowSurchargeRate)
-            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.rmbAmount ? row.rmbAmount * (100 + nowTaxRate + nowSurchargeRate)/100 : row.rmbAmount : row.usdAmount ? row.usdAmount * (100 + nowTaxRate + nowSurchargeRate) /100  : row.usdAmount
+        taxAmount(row, type) {
+            if (this.business == 1) {
+                let nowTaxRate = Number(row.taxRate)
+                let nowSurchargeRate = Number(row.surchargeRate)
+                console.info(nowTaxRate, nowSurchargeRate)
+                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.rmbAmount ? row.rmbAmount * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.rmbAmount : row.usdAmount ? row.usdAmount * (100 + nowTaxRate + nowSurchargeRate) / 100 : row.usdAmount
+            }
         },
         getSum() {
             let sumArr = []