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

src/views/ecw/order/edit.vue

@@ -952,7 +952,7 @@ export default {
           // 更新目的城市备选
           await this.getTradeCity()
           // 如果已选择城市，在切换后不可用则重置
-          if(this.form.objectiveId && !this.importList.find(item => item.id == this.form.objectiveId)){
+          if(this.form.objectiveId && !this.importCityList.find(item => item.id == this.form.objectiveId)){
               this.$set(this.form, 'objectiveId', null)
           }
           // 更新线路备选

src/views/ecw/productPrice/batchIncreaseAir.vue

@@ -275,10 +275,13 @@ export default {
         // 检查被忽略的阶梯价
         let msgArr = [];
         if(data.priceType){
-          const ignoreAll = data.fullPriceStepList.length != this.form.fullPriceStepList.length
+          const ignoreAll =  this.form.fullPriceStepList.length - data.fullPriceStepList.length
           if(ignoreAll){
             msgArr.push(this.$t("{n}个全包阶梯价", {n: ignoreAll}))
           }
+          if(!data.fullPriceStepList?.length){
+            return this.$message.error(this.$t('请设置全包价'))
+          }
         }else{
           const ignoreFreight = this.form.freightPriceStepList.length - data.freightPriceStepList.length
           const ignoreClearance = this.form.clearancePriceStepList.length - data.clearancePriceStepList.length
@@ -289,6 +292,10 @@ export default {
           if(ignoreClearance){
             msgArr.push(this.$t("{n}个清关费阶梯价", {n: ignoreClearance}))
           }
+
+          if(!data.freightPriceStepList?.length && !data.clearancePriceStepList?.length){
+            return this.$message.error(this.$t('请设置运费或清关费'))
+          }
         }
         let msg = this.$t('已选择{route}条路线，{product}个商品', {
           route: data.lineChannelList.length,