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

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

 <template>
   <el-descriptions border :column="3" v-if="offer">
-    <el-descriptions-item label="报价单号">{{offer.number}}</el-descriptions-item>
-    <el-descriptions-item label="运输方式">
+    <el-descriptions-item :label="$t('报价单号')">{{offer.number}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('运输方式')">
         <dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="offer.transportId" />
     </el-descriptions-item>
-    <el-descriptions-item label="出货方式">
+    <el-descriptions-item :label="$t('出货方式')">
         {{ channel ? $l(channel, 'name') : '/' }}
     </el-descriptions-item>
-    <el-descriptions-item label="报价单状态">
+    <el-descriptions-item :label="$t('报价单状态')">
         <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="offer.status" />
     </el-descriptions-item>
-    <el-descriptions-item label="唛头">{{offer.marks}}</el-descriptions-item>
-    <el-descriptions-item label="始发仓">{{form.departureName}}</el-descriptions-item>
-    <el-descriptions-item label="目的仓">{{form.objectiveName}}</el-descriptions-item>
-    <el-descriptions-item label="申请原因" :span="3" v-if="type == 2">
+    <el-descriptions-item :label="$t('唛头')">{{offer.marks}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('始发仓')">{{form.departureName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('目的仓')">{{form.objectiveName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('申请原因')" :span="3" v-if="type == 2">
       <div class="item">
-        商品：{{$l(form, 'prodTitle')}}
+        {{$t('商品')}}：{{$l(form, 'prodTitle')}}
       </div>
       <div class="item">
-        佣金规则：{{$t('从【{oldType}】改为【{newType}】', {
+        {{$t('佣金规则')}}：{{$t('从【{oldType}】改为【{newType}】', {
           oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, offer.commissionType) ,
           newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, form.commissionType),
         })}}
       </div>
       
       <div>
-        原运费：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{form.charging ? $t('原全包价') : $t('原运费')}}：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        新运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{form.charging ? $t('新全包价') : $t('新运费')}}：{{salePrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        成本价：{{costPrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{$t('成本价')}}：{{costPrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        明佣：{{ form.lightCommissionAmount}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{$t('明佣')}}：{{ form.lightCommissionAmount}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        暗佣：{{form.shadeCommissionAmount }}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        {{$t('暗佣')}}：{{form.shadeCommissionAmount }}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
     </el-descriptions-item>
 
     <el-descriptions-item label="申请原因" :span="3" v-if="type == 1">
       <div class="item">
-        商品：{{$l(form, 'prodTitle')}}
+        {{$t('商品')}}：{{$l(form, 'prodTitle')}}
       </div>
-      <template v-if="form.charging">
-        原全包价：{{form.orgSeaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}, 
-        新全包价：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+      <template v-if="form.charging"> 
+        {{$t('原全包价')}}：{{form.orgSeaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}, 
+        {{$t('新全包价')}}：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </template>
       <template v-else>
         <div>
-          原运费：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency]}} /{{unitMap[form.seaFreightVolume]}}，
-          原清关费：{{form.orgClearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
+          {{$t('原运费')}}：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency]}} /{{unitMap[form.seaFreightVolume]}}，
+          {{$t('原清关费')}}：{{form.orgClearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
         </div>
         <div>
-          新运费：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}，
-          新清关费：{{form.clearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
+          {{$t('新运费')}}：{{form.seaFreight}} {{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}，
+          {{$t('新清关费')}}：{{form.clearanceFreight}} {{currencyMap[form.clearanceFreightCurrency]}} / {{unitMap[form.clearanceFreightVolume]}}
         </div>
       </template>
     </el-descriptions-item>
@@ -136,9 +136,15 @@ export default {
       return Decimal(this.form.seaFreight).plus(this.form.shadeCommissionAmount).plus(this.form.lightCommissionAmount)
     }, */
     // 成本价
-    costPrice(){
+    /* costPrice(){
       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)
+    },
+    salePrice(){
+      return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
+    },
   },
   methods: {
     getOfferSpecialByApproveId(){

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

@@ -47,7 +47,7 @@
       <el-form-item :label="$t('旧全包价')" v-if="form.charging">
         {{form.orgSeaFreight}} {{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
       </el-form-item>
-      <el-form-item :label="$t('新全包价')" style="width: 400px" prop="clearanceFreight"  v-if="form.charging">
+      <el-form-item :label="$t('新全包价')" style="width: 400px" prop="seaFreight"  v-if="form.charging">
         <el-input v-model="form.seaFreight" type="number" class="w-100" />
         {{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
       </el-form-item>