Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/offer/detail.vue

@@ -183,7 +183,7 @@
 
             <el-descriptions :column="5" border>
                 <el-descriptions-item :label="$t('保价费')">
-                    {{list.estCostVO?list.estCostVO.insuranceFee: 0}} {{$t('美元')}}
+                    {{list.estCostVO?list.estCostVO.insuranceFee: 0}} {{ selectedRouter ? currentcyMap[selectedRouter.currencyUnit || 1] : '' }}
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('总运费')">
                     <template v-if="freightFeeList.length>0" v-for="item in freightFeeList">
@@ -431,6 +431,11 @@
           return this.$l(row, 'prodTitle')
         }
       },
+      selectedRouter(){
+          // otherService 1 送货上门，2非控货订单代收货款
+          if(!this.list.lineId) return null
+          return this.routerList.find(item => item.id == this.list.lineId)
+      },
       currentcyMap(){
           let map = {}
           this.currencyList.forEach(item => {
@@ -491,32 +496,32 @@
       originalFeeList(){
           let arr = []
           this.clearanceFeeList.forEach(item => {
-              let it = {...item}
+              let it = {
+                  src: this.$t('清关费'),
+                  currencyId: item.currencyId,
+                  amount: Decimal(item.amount)
+              }
               let freight = this.freightFeeList.find(fee => fee.currencyId == item.currencyId)
               if(freight){
-                  it.amount += freight.amount
+                  it.amount = it.amount.plus(freight.amount)
               }
               arr.push(it)
           })
+          // 判断是否有运费单位不在清关费里的
           this.freightFeeList.forEach(item => {
-              if(!arr.find(items=>items.currencyId==item.currencyId)){
-                  let its = {...item}
-                  // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
-                  // if(freights){
-                  //     its.amount += freights.amount
-                  // }
-                  arr.push(its)
+              if(!arr.find(arrItem => arrItem.currencyId == item.currencyId)){
+                  arr.push({
+                      src: this.$t('未计算的运费'),
+                      currencyId: item.currencyId,
+                      amount: Decimal(item.amount)
+                  })
               }
-
           })
-
           return arr
       },
       // 预计费用(原价 - 优惠金额)
       estimatedCosts(){
           let arr = []
-          let withInsuranceFee = false
-          let withOtherFee = false
           this.originalFeeList.forEach(item => {
               let it = {
                   currencyId: item.currencyId,
@@ -526,56 +531,38 @@
               if(coupon){
                   it.amount = it.amount.minus(coupon.reduceAmount)
               }
-              // if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
-              //     it.amount = it.amount.plus(this.list.otherFee)
-              //     withOtherFee = true
-              // }
-              let otherFee = this.otherFeeList.find(fee => fee.currencyId == item.currencyId)
-              if(otherFee){
-                  it.amount = it.amount.plus(otherFee.amount || 0)
-                  withOtherFee = true
-              }
-              // 保价费（美元）
-              if(item.currencyId == 1 && this.fee && this.fee.insuranceFee){
-                  it.amount = it.amount.plus(this.fee.insuranceFee)
-                  withInsuranceFee = true
-              }
               arr.push(it)
           })
-
-          // 如果没有累加其他费用，则另外增加货币
-          if(!withOtherFee && this.list.otherFee){
-              let fee = {
-                  currencyId: this.list.otherFeeCurrencyId,
-                  amount: Decimal(this.list.otherFee)
+          // 累加保价费
+          const insuranceFeeIndex = arr.findIndex(item => item.currencyId == this.insuranceFeeCurrency)
+          const insuranceFee = this.list&&this.list.estCostVO&&this.list.estCostVO.insuranceFee
+          if(insuranceFeeIndex > -1){
+              arr[insuranceFeeIndex].amount = arr[insuranceFeeIndex].amount.plus(insuranceFee || 0)
+          }else{
+              arr.push({
+                  currencyId: this.insuranceFeeCurrency,
+                  amount: Decimal(insuranceFee || 0)
+              })
           }
 
-              // 如果保价费跟其他费用是同一种货币（都是美元）
-              if(!withInsuranceFee && this.fee && this.fee.insuranceFee && this.list.otherFeeCurrencyId == 1){
-                  fee.amount = fee.amount.plus(this.fee.insuranceFee)
-              }
-              arr.push(fee)
-            }
-            // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
-            if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
+          // 累加其他费用
+          const otherFeeIndex = arr.findIndex(item => item.currencyId == this.list.otherFeeCurrencyId)
+          if(otherFeeIndex > -1){
+              arr[otherFeeIndex].amount = arr[otherFeeIndex].amount.plus(this.list.otherFee || 0)
+          }else{
+              if(this.list.otherFee>0){
                 arr.push({
-                    currencyId: 1,
-                    amount: Decimal(this.fee.insuranceFee)
+                    currencyId: this.list.otherFeeCurrencyId,
+                    amount: Decimal(this.list.otherFee || 0)
                 })
               }
-            this.otherFeeList.forEach(item => {
-                if(!arr.find(items=>items.currencyId==item.currencyId)){
-                    let its = {...item}
-                    // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
-                    // if(freights){
-                    //     its.amount += freights.amount
-                    // }
-                    arr.push(its)
           }
-
-            })
           return arr
-      }
+      },
+      // 保价费单位（路线里设置，默认美元）
+      insuranceFeeCurrency() {
+          return this.selectedRouter?.currencyUnit || 1;
+      },
     },
     created() {
       getCurrencyList().then(res => this.currencyList = res.data)

src/views/ecw/offer/edit.vue

@@ -310,7 +310,7 @@
 
             <el-descriptions :column="5" border>
                 <el-descriptions-item :label="$t('保价费')">
-                    {{fee.insuranceFee || 0}} {{$t('美元')}}
+                    {{fee.insuranceFee || 0}} {{ selectedRouter ? currencyMap[selectedRouter.currencyUnit || 1] : '' }}
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('总运费')">
                     <template v-for="item in freightFeeList">
@@ -730,8 +730,6 @@ export default {
     // 预计费用(原价 - 优惠金额 + 其他费用 + 保价费)
     estimatedCosts(){
         let arr = []
-        let withInsuranceFee = false
-        let withOtherFee = false
         this.originalFeeList.forEach(item => {
             let it = {
                 currencyId: item.currencyId,
@@ -741,50 +739,33 @@ export default {
             if(coupon){
                 it.amount = it.amount.minus(coupon.reduceTotalAmount)
             }
-            if(this.form.otherFee && this.form.otherFeeCurrencyId == item.currencyId){
-                it.amount = it.amount.plus(this.form.otherFee)
-                withOtherFee = true
-            }
-            // 保价费（美元）
-            if(item.currencyId == 1 && this.fee && this.fee.insuranceFee){
-                it.amount = it.amount.plus(this.fee.insuranceFee)
-                withInsuranceFee = true
-            }
             arr.push(it)
         })
 
-        // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
-        if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
-            let fee = Decimal(this.fee.insuranceFee)
-            // 如果没有美元费用，且保价费和其他费用币种相同（都是美元）
-            if(this.form.otherFeeCurrencyId == 1 && this.form.otherFee){
-                withOtherFee = true
-                fee = fee.plus(new Decimal(this.form.otherFee || 0))
-            }
-
+        // 累加保价费
+        const insuranceFeeIndex = arr.findIndex(item => item.currencyId == this.insuranceFeeCurrency)
+        if(insuranceFeeIndex > -1){
+            arr[insuranceFeeIndex].amount = arr[insuranceFeeIndex].amount.plus(this.fee.insuranceFee || 0)
+        }else{
             arr.push({
-                currencyId: 1,
-                amount: fee
+                currencyId: this.insuranceFeeCurrency,
+                amount: Decimal(this.fee.insuranceFee || 0)
             })
         }
 
-        // 如果没有累加其他费用，则另外增加货币
-        if(!withOtherFee && this.form.otherFee){
-            let fee = {
+        // 累加其他费用
+        const otherFeeIndex = arr.findIndex(item => item.currencyId == this.form.otherFeeCurrencyId)
+        if(otherFeeIndex > -1){
+            arr[otherFeeIndex].amount = arr[otherFeeIndex].amount.plus(this.form.otherFee || 0)
+        }else{
+           if(this.form.otherFee>0){
+              arr.push({
                   currencyId: this.form.otherFeeCurrencyId,
-                amount: Decimal(this.form.otherFee)
-            }
-
-            // 如果保价费跟其他费用是同一种货币（都是美元）
-            if(!withInsuranceFee && this.fee && this.fee.insuranceFee && this.form.otherFeeCurrencyId == 1){
-                fee.amount = fee.amount.plus(this.fee.insuranceFee)
+                  amount: Decimal(this.form.otherFee || 0)
+              })
             }
-
-            arr.push(fee)
         }
 
-
-
         return arr
     },
     // 路线开通的服务
@@ -792,6 +773,10 @@ export default {
         if(!this.selectedRouter || !this.selectedRouter.otherService) return []
         return this.selectedRouter.otherService.split(',')
     },
+    // 保价费单位（路线里设置，默认美元）
+    insuranceFeeCurrency() {
+        return this.selectedRouter?.currencyUnit || 1;
+    },
     // 是否可以添加商品
     canAddProduct(){
         if(!this.form.lineId){