测试报价单佣金规则数据

src/views/ecw/offer/components/Commossion.vue

@@ -160,10 +160,15 @@ export default {
       }
     },
     costPrice(){
-      return Decimal(this.form.seaFreight || 0).minus(this.form.orgShadeCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
+      return Decimal(this.form.orgSeaFreight || 0)
+        .minus(this.form.orgShadeCommissionAmount || 0)
+        .minus(this.form.orgLightCommissionAmount || 0)
+        .minus(this.form.shadeCommissionAmount || 0)
     },
     salePrice(){
-      return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
+      return Decimal(this.form.orgSeaFreight || 0)
+        .minus(this.form.orgLightCommissionAmount || 0)
+        .plus(this.form.lightCommissionAmount || 0)
     },
     currencyMap(){
       let map = {}

src/views/ecw/offer/components/SpecialDetail.vue

@@ -23,12 +23,15 @@
           newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, form.commissionType),
         })}}
       </div>
-      
+      <!---
+        http://zentao.jdshangmen.com/bug-view-1632.html
+        1.原运费改成原销售价，新运费改成新销售价，新增一个实际返佣金额
+        --->
       <div>
-        {{form.charging ? $t('原全包价') : $t('原运费')}}：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{form.charging ? $t('原全包价') : $t('原销售价')}}：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        {{form.charging ? $t('新全包价') : $t('新运费')}}：{{salePrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{form.charging ? $t('新全包价') : $t('新销售价')}}：{{salePrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
         {{$t('成本价')}}：{{costPrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
@@ -51,11 +54,11 @@
       </template>
       <template v-else>
         <div>
-          {{$t('原运费')}}：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency]}} /{{unitMap[form.seaFreightVolume]}}，
+          {{$t('原销售价')}}：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency]}} /{{unitMap[form.seaFreightVolume]}}，
           {{$t('原清关费')}}：{{form.orgClearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
         </div>
         <div>
-          {{$t('新运费')}}：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}，
+          {{$t('新销售价')}}：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}，
           {{$t('新清关费')}}：{{form.clearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
         </div>
       </template>
@@ -140,10 +143,13 @@ export default {
       return Decimal(this.form.seaFreight || 0).minus(this.form.lightCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
     } */
     costPrice(){
-      return Decimal(this.form.seaFreight || 0).minus(this.form.orgShadeCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
+      return Decimal(this.form.orgSeaFreight || 0)
+      .minus(this.form.orgShadeCommissionAmount || 0)
+      .minus(this.form.orgLightCommissionAmount || 0)
+      .minus(this.form.shadeCommissionAmount || 0)
     },
     salePrice(){
-      return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
+      return Decimal(this.form.orgSeaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
     },
   },
   methods: {

src/views/ecw/order/special/Discount.vue

@@ -169,7 +169,7 @@ export default {
     // 是否可以提交
     submitable(){
       let submitable = false;
-      if(!this.form.freight || !this.form.clearanceFreight){
+      if(!this.form.freight || (!this.form.clearanceFreight && !this.form.charging)){
         return false
       }
       [