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

src/components/RoutersSelector/index.vue

 <template>
     <div>
         <div class="filters mb-10" v-if="showFilter">
-            {{$t('运输方式')}}
-            <dict-selector :type='DICT_TYPE.ECW_TRANSPORT_TYPE' v-model="transportType" :placeholder="$t('请选择运输方式')" :filter="transportFilter" style="width:150px" />
-
+            <template v-if="!type">
+                {{$t('运输方式')}}
+                <dict-selector :type='DICT_TYPE.ECW_TRANSPORT_TYPE' v-model="transportType" :placeholder="$t('请选择运输方式')" :filter="transportFilter" style="width:150px" />
+            </template>
             {{$t('始发地')}}：
             <el-select :placeholder="$t('请选择始发地')" v-model="exportCity" clearable>
                 <el-option v-for="item in exportCityList" :key="item.id" :label="item.titleZh" :value="item.id" />
@@ -14,7 +15,7 @@
                 <el-option v-for="item in importCityList" :key="item.id" :label="item.titleZh" :value="item.id" />
             </el-select>
 
-            <template v-if="type == 'air'">
+            <template v-if="type != 'sea'">
               {{$t('出货渠道')}}:
               <el-select :placeholder="$t('请选择目渠道')" v-model="channelId" clearable>
                 <el-option v-for="item in channelList" :key="item.channelId" :label="item.nameZh" :value="item.channelId" />

src/styles/index.scss

@@ -129,7 +129,7 @@ input, textarea{
 }
 
 .el-scrollbar__view{
-  overflow-x: hidden;
+  /*overflow-x: hidden;*/
 }
 
 .el-rate{

src/views/ecw/order/pending.vue

@@ -292,10 +292,10 @@ export default {
                     product_id: productData.prodId,
                     product_type: res.data.typeId,
                     transportId: this.orderData.transportId,
-                    exportCity: this.orderData.logisticsInfoDto.startCityId,
-                    importCity: this.orderData.logisticsInfoDto.destCityId,
-                    startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
-                    destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
+                    importCity: this.orderData.objectiveVO.objectiveId,
+                    exportCity: this.orderData.departureVO.departureId,
+                    startWarehouseId: this.orderData.departureVO.id,
+                    destWarehouseId: this.orderData.objectiveVO.id,
                     lineId: this.orderData.logisticsInfoDto.lineId,
                     channelId: this.orderData.logisticsInfoDto.channelId
                   }

src/views/ecw/productPrice/batchEdit.vue

@@ -22,7 +22,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item :label="$t('单价模式')" prop="priceType">
-              <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" />
+              <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter='number' />
             </el-form-item>
 
             <!--阶梯订单-->
@@ -210,6 +210,7 @@ export default {
         specialList: [],
         priceStepList: [],
         stepPrice: 0,
+        priceType: null
         // advanceStatus: 0,
         // needBook: 0,
         // dayLimit: 10000
@@ -234,7 +235,9 @@ export default {
   computed: {
     // 类型，默认海运sea,air表示空运
     type(){
-      return this.$route.path.split(/[-_]/).pop()
+      let type = this.$route.path.split(/[-_]/).pop()
+      if(type == 'air' || type == 'sea') return type
+      return null
     },
     // 默认运费的货币和体积单位
     currencyAndUnit(){

src/views/ecw/productPrice/batchIncrease.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <products-selector ref="productSelector" v-model="form.productIdList" show-all @setall="isAllProduct=$event" :default-ids="form.productIdList" class="mb-20" />
 
-      <routers-selector v-model="selectedRoutes" :type="type" :show-filter="false" />
+      <routers-selector v-model="selectedRoutes" :type="type" />
 
       <el-card style="margin-bottom: 10px">
         <div slot="header" style="font-size:20px;">

src/views/ecw/productPrice/index.vue

@@ -196,7 +196,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="advanceStatus" :label="$t('単询')" align="center" width="80">
+      <el-table-column prop="advanceStatus" :label="$t('单询')" align="center" width="80">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.NEED_ORDER_INQUIRY" :value="scope.row.needOrderInquiry"></dict-tag>
         </template>
@@ -406,7 +406,8 @@ export default {
       AuditStatusEnum: AuditStatusEnum,
       locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
       // 查看更多阶梯价
-      showMoreStepPriceItem: null
+      showMoreStepPriceItem: null,
+      entryPath: null
     };
   },
 
@@ -545,6 +546,10 @@ export default {
       // if(!this.$route.query.product_id){
       //   return this.product = null
       // }
+      // 价格列表 跟 商品的价格列表，有时候商品价格列表的路由变动会导致价格列表也执行此处代码，所以做一个判断排除
+      // https://zentao.test.jdshangmen.com/bug-view-4928.html
+      if(this.$route.path != this.entryPath) return 
+
       let productId = this.product?.id
       if(this.$route.name === 'ProductPrice'){
         if(this.$route.query.product_id != productId){
@@ -562,6 +567,7 @@ export default {
     }
   },
   created() {
+    this.entryPath = this.$route.path
     if(this.$route.query.product_type){
       this.$set(this.queryParams, 'typeId', +this.$route.query.product_type);
     }