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

src/views/ecw/productPrice/edit.vue

@@ -561,7 +561,12 @@ export default {
         item[data.field] = data.value
         if(item.packagingList?.length){
           item.packagingList.forEach(p => {
-            p[data.field] = data.value
+            if(data.field.indexOf("PriceUnit") > -1){
+              p['packagingPriceUnit'] = data.value
+            }
+            if(data.field.indexOf("VolumeUnit") > -1){
+              p['packagingVolumeUnit'] = data.value
+            }
           })
         }
         if(item.specialList?.length){

src/views/ecw/productPrice/editAir.vue

@@ -527,7 +527,12 @@ export default {
         item[data.field] = data.value
         if(item.packagingList?.length){
           item.packagingList.forEach(p => {
-            p[data.field] = data.value
+            if(data.field.indexOf("PriceUnit") > -1){
+              p['packagingPriceUnit'] = data.value
+            }
+            if(data.field.indexOf("VolumeUnit") > -1){
+              p['packagingVolumeUnit'] = data.value
+            }
           })
         }
         if(item.specialList?.length){
@@ -584,7 +589,7 @@ export default {
         }else{
           data.clearancePriceStepList = this.getPriceList(this.form.clearancePriceStepList)
           data.freightPriceStepList = this.getPriceList(this.form.freightPriceStepList)
-          delete data.freightPriceStepList
+          delete data.fullPriceStepList
         }
 
         // 设置了有效期，且已过期则给提示

src/views/ecw/productPrice/index.vue

@@ -167,44 +167,40 @@
 
       <el-table-column prop="price" :label="$t('价格')" align="center">
           <template slot-scope="scope">
-            <template v-if="scope.row.stepPrice == 1 && scope.row.priceStepList && scope.row.priceStepList.length">
+            <template v-if="scope.row.stepPrice == 1">
+              <!--全包价-->
+              <div v-if="scope.row.priceType">
+                <div v-if="!scope.row.fullPriceStepList || !scope.row.fullPriceStepList.length">{{$t('未设置全包价阶梯价')}}</div>
+                <div v-else>
                   {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
                     no: 1,
-                start: scope.row.priceStepList[0].startNum,
-                end: scope.row.priceStepList[0].endNum,
-                weightUnit:  getUnitTitle(scope.row.priceStepList[0].weightUnit),
+                    start: scope.row.fullPriceStepList[0].startNum,
+                    end: scope.row.fullPriceStepList[0].endNum,
+                    weightUnit:  getUnitTitle(scope.row.fullPriceStepList[0].weightUnit),
                   })}}<br/>
-
-              <div v-if="scope.row.priceType == 0">
-                {{$t('运费')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].transportPriceUnit) + scope.row.priceStepList[0].transportPrice}}&nbsp;
-                {{ getCurrencyTitle(scope.row.priceStepList[0].transportPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].transportVolumeUnit)}}
-                <br />
-                <template v-if="[3,4].indexOf(+scope.row.warehouseLineDO.transportType) > -1">
-                  <!--
-                  空运的清关费
-                  根据要求隐藏列表的空运清关费 https://zentao.test.jdshangmen.com/bug-view-5298.html
-                  -->
-                  <!--<template v-if="scope.row.clearPriceStepList.length">
-                    {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearPriceStepList[0].clearancePriceUnit) + scope.row.clearPriceStepList[0].clearancePrice}}&nbsp;
-                    {{ getCurrencyTitle(scope.row.clearPriceStepList[0].clearancePriceUnit) + '/' + getUnitTitle(scope.row.clearPriceStepList[0].clearanceVolumeUnit)}}
-                  </template>
-                  <template v-else>{{$t('暂无清关费设置')}}</template>-->
-                </template>
+                  {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.fullPriceStepList[0].allPriceUnit) + scope.row.fullPriceStepList[0].allPrice}}&nbsp;
+                  {{ getCurrencyTitle(scope.row.fullPriceStepList[0].allPriceUnit) + '/' + getUnitTitle(scope.row.fullPriceStepList[0].allVolumeUnit)}}
+                </div>
+              </div>
               <template v-else>
-                  <!--海运的清关费-->
-                  {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].clearancePriceUnit) + scope.row.priceStepList[0].clearancePrice}}&nbsp;
-                  {{ getCurrencyTitle(scope.row.priceStepList[0].clearancePriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].clearanceVolumeUnit)}}
-                </template>
+                <div v-if="!scope.row.freightPriceStepList || !scope.row.freightPriceStepList.length">{{$t('未设置运费阶梯价')}}</div>
+                <div v-else>
+                  {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+                    no: 1,
+                    start: scope.row.freightPriceStepList[0].startNum,
+                    end: scope.row.freightPriceStepList[0].endNum,
+                    weightUnit:  getUnitTitle(scope.row.freightPriceStepList[0].weightUnit),
+                  })}}<br/>
+
+                  <div>
+                    {{$t('运费')}}:{{ getCurrencySymbol(scope.row.freightPriceStepList[0].transportPriceUnit) + scope.row.freightPriceStepList[0].transportPrice}}&nbsp;
+                    {{ getCurrencyTitle(scope.row.freightPriceStepList[0].transportPriceUnit) + '/' + getUnitTitle(scope.row.freightPriceStepList[0].transportVolumeUnit)}}
                   </div>
-              <div v-if="scope.row.priceType == 1">
-                {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].allPriceUnit) + scope.row.priceStepList[0].allPrice}}&nbsp;
-                {{ getCurrencyTitle(scope.row.priceStepList[0].allPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].allVolumeUnit)}}
                 </div>
-              <el-button type="text" @click="showMoreStepPriceItem=scope.row">{{$t('查看更多')}}</el-button>
               </template>
-            <template v-else-if="scope.row.stepPrice">
-              {{$t('缺少阶梯价格设置')}}
+              <el-button type="text" @click="showMoreStepPriceItem=scope.row">{{$t('查看更多')}}</el-button>
             </template>
+
             <template v-else>
               <div v-if="scope.row.priceType == 0">
                 {{$t('运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp;