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

src/components/ProductsSelector/index.vue

@@ -261,6 +261,7 @@ export default {
     async clearAll() {
       await this.$confirm(this.$t('确定要全部清除么？'))
       this.choosedList = []
+      this.isCheckedAll = false
     }
   }
 }

src/views/ecw/productPrice/batchEdit.vue

@@ -584,6 +584,7 @@ export default {
           product: this.isAllProduct ? this.$refs.productSelector.allTotal : data.productIdList.length
         }))
         this.loading = true
+        console.log('提交批量修改', data)
         batchUpdateProductPrice(data).then(response => {
           this.$modal.msgSuccess(this.$t("修改成功"));
           this.$router.replace('/lineProject/product-price?' + (new URLSearchParams(this.$route.query)).toString())

src/views/ecw/productPrice/batchEditAir.vue

@@ -377,9 +377,12 @@ export default {
         // 全包价
         if(this.form.priceType == 1) {
           data.fullPriceStepList = this.getPriceList(this.form.fullPriceStepList)
+          delete data.clearancePriceStepList
+          delete data.freightPriceStepList
         }else{
           data.clearancePriceStepList = this.getPriceList(this.form.clearancePriceStepList)
           data.freightPriceStepList = this.getPriceList(this.form.freightPriceStepList)
+          delete data.fullPriceStepList
         }
 
         if(data.lineChannelList.length < 1){